Felix Paul Kühne pushed to branch master at VideoLAN / VLC
Commits:
94281684 by Sean McGovern at 2022-06-24T12:42:01+00:00
bootstrap: use ${MAKE} as appropriate
- - - - -
5c35cf0d by Sean McGovern at 2022-06-24T12:42:01+00:00
contrib/nvcodec: use $(MAKE) as appropriate
- - - - -
82886b45 by Sean McGovern at 2022-06-24T12:42:01+00:00
contrib/ncurses: use $(MAKE) as appropriate
- - - - -
3 changed files:
- contrib/bootstrap
- contrib/src/ncurses/rules.mak
- contrib/src/nvcodec/rules.mak
Changes:
=====================================
contrib/bootstrap
=====================================
@@ -271,6 +271,7 @@ fi
# Checks
#
OS="${HOST#*-}" # strip architecture
+MAKE=make
case "${OS}" in
*-darwin*)
if test -z "$BUILDFORIOS"
@@ -317,6 +318,7 @@ case "${OS}" in
fi
;;
*bsd*)
+ MAKE=gmake
add_make_enabled "HAVE_BSD"
;;
*android*)
@@ -384,5 +386,5 @@ add_make "TOPDST = .."
add_make "-include config.mak"
add_make 'include $(TOPSRC)/src/main.mak'
echo "Bootstrap completed."
-make help
+${MAKE} help
mkdir -p $BOOTSTRAP_PATH/tarballs || exit $?
=====================================
contrib/src/ncurses/rules.mak
=====================================
@@ -22,7 +22,7 @@ ncurses: ncurses-$(NCURSES_VERSION).tar.gz .sum-ncurses
.ncurses: ncurses
cd $< && mkdir -p "$(PREFIX)/lib/pkgconfig" && $(HOSTVARS)
PKG_CONFIG_LIBDIR="$(PREFIX)/lib/pkgconfig" ./configure $(patsubst
--datarootdir=%,,$(HOSTCONF)) --without-debug --enable-widec --without-develop
--without-shared --with-terminfo-dirs=/usr/share/terminfo --with-pkg-config=yes
--enable-pc-files
- cd $< && make -C ncurses -j1 && make -C ncurses install
- cd $< && make -C include -j1 && make -C include install
- cd $< && make -C misc pc-files && cp misc/ncursesw.pc
"$(PREFIX)/lib/pkgconfig"
+ cd $< && $(MAKE) -C ncurses -j1 && $(MAKE) -C ncurses install
+ cd $< && $(MAKE) -C include -j1 && $(MAKE) -C include install
+ cd $< && $(MAKE) -C misc pc-files && cp misc/ncursesw.pc
"$(PREFIX)/lib/pkgconfig"
touch $@
=====================================
contrib/src/nvcodec/rules.mak
=====================================
@@ -17,5 +17,5 @@ nvcodec: nvcodec-$(NVCODEC_HASH).tar.xz .sum-nvcodec
$(MOVE)
.nvcodec: nvcodec-$(NVCODEC_HASH).tar.xz nvcodec
- cd nvcodec && make install PREFIX="$(PREFIX)"
+ cd nvcodec && $(MAKE) install PREFIX="$(PREFIX)"
touch $@
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/001498aa1e5eb85ba64e1637c7887b28f9039972...82886b4597230aa4e6911321ec4a2c2562e5288b
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/001498aa1e5eb85ba64e1637c7887b28f9039972...82886b4597230aa4e6911321ec4a2c2562e5288b
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
