[vlc-commits] [Git][videolan/vlc][master] 8 commits: contrib: aribb24: use the RECONF as everyone else
Jean-Baptiste Kempf (@jbk)
gitlab at videolan.org
Mon Aug 7 15:02:14 UTC 2023
Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC
Commits:
162bebd4 by Steve Lhomme at 2023-08-07T15:51:58+02:00
contrib: aribb24: use the RECONF as everyone else
The bootstrap script just does autoreconf --install. But we may need to
pass extra paths to autoreconf.
The configure.ac references a m4 folder that doesn't exist. So we create it.
- - - - -
797a6561 by Steve Lhomme at 2023-08-07T15:51:58+02:00
contrib: bluray: use the RECONF as everyone else
The bootstrap script just does autoreconf -vif. But we may need to
pass extra paths to autoreconf.
- - - - -
68febe7c by Steve Lhomme at 2023-08-07T15:51:58+02:00
contrib: smb2: use the RECONF as everyone else
The bootstrap script just does autoreconf -vif. But we may need to
pass extra paths to autoreconf.
The configure.ac references a m4 folder that doesn't exist. So we create it.
- - - - -
71d9d953 by Steve Lhomme at 2023-08-07T15:51:58+02:00
contrib: use ACLOCAL_PATH instead of ACLOCAL_AMFLAGS to set our pathes
ACLOCAL_PATH is the proper variable to export system-like pathes.
We should leave the priority handling of project directories alone.
- - - - -
33f91a5d by Steve Lhomme at 2023-08-07T15:51:58+02:00
contrib: sidplay2: remove forced empty ACLOCAL_AMFLAGS
We are using ACLOCAL_PATH via AUTORECONF or in the environment.
- - - - -
a942cecf by Steve Lhomme at 2023-08-07T15:51:58+02:00
contrib: export ACLOCAL_PATH in our makefile
So it works when calling autoreconf directly instead of RECONF
- - - - -
5c910f00 by Alexandre Janniaux at 2023-08-07T15:51:58+02:00
bootstrap: provide aclocal m4 from extras tools
The libtool.m4 file defining the LT_INIT macro is located in the share
directory of the built libtool prefix. This file can be present on the
host system but when it isn't, the bootstrap can fail during bootstrap
with the following error:
autoreconf: running: automake --add-missing --copy --force-missing
bin/Makefile.am:41: error: Libtool library used but 'LIBTOOL' is undefined
bin/Makefile.am:41: The usual way to define 'LIBTOOL' is to add 'LT_INIT'
bin/Makefile.am:41: to 'configure.ac' and run 'aclocal' and 'autoconf' again.
bin/Makefile.am:41: If 'LT_INIT' is in 'configure.ac', make sure
bin/Makefile.am:41: its definition is in aclocal's search path.
Indeed, when libtool.m4 is not installed with the same prefix as
autoconf/autom4te, and specificallly the share/ folder is not shared,
then autom4te will fail to detect LT_INIT, leading autoreconf to
disable the libtool support and discard the call to libtoolize.
Then, automake cannot find the aclocal m4 file since libtoolize didn't
install it, and the previous error is displayed before bootstrap exits.
This behaviour can be checked by uninstalling every libtool and trying
to run the following commands:
# Works
autom4te --verbose --language=Autoconf --output=- --trace=LT_INIT extras/tools/build/share/aclocal/libtool.m4 configure.ac
# Fails to find LT_INIT
autom4te --verbose --language=Autoconf --output=- --trace=LT_INIT configure.ac extras/tools/build/share/aclocal/libtool.m4
# Fails to find LT_INIT
autom4te --verbose --language=Autoconf --output=- --trace=LT_INIT configure.ac
This commit ensures that the libtool.m4 will be found at the aclocal
setup, to allow libtoolize to copy the libtool.m4 as aclocal.m4 for
automake.
- - - - -
8457d224 by Steve Lhomme at 2023-08-07T15:52:42+02:00
bootstrap: remove forced m4 directory
It's defined in configure.ac since e8df55c488938fa162c5074671a5262c694d23ca
which is more recent than 77e5b00d8518d55317fa26dc6f0aeb2e7bcf6241 and
2799d36bc8abdc28df29a202acdb27223b25a7a7.
- - - - -
7 changed files:
- Makefile.am
- bootstrap
- contrib/src/aribb24/rules.mak
- contrib/src/bluray/rules.mak
- contrib/src/main.mak
- contrib/src/sidplay2/rules.mak
- contrib/src/smb2/rules.mak
Changes:
=====================================
Makefile.am
=====================================
@@ -39,7 +39,6 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \
--disable-fribidi \
--with-kde-solid='$${datadir}/kde4/apps'
-ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = \
1.11 \
-Wall \
=====================================
bootstrap
=====================================
@@ -17,8 +17,6 @@ if test "$#" != "0"; then
exit 1
fi
-ACLOCAL_ARGS="-I m4 ${ACLOCAL_ARGS}"
-
# Check for tools directory
if test -z ${VLC_TOOLS}; then
VLC_TOOLS=extras/tools/build
@@ -27,6 +25,10 @@ if test -d ${VLC_TOOLS}/bin; then
VLC_TOOLS_PATH="$( cd "${VLC_TOOLS}/bin" ; pwd -P )"
PATH="$VLC_TOOLS_PATH:$PATH"
fi
+if test -d ${VLC_TOOLS}/share/aclocal; then
+ # https://www.gnu.org/software/automake/manual/html_node/Macro-Search-Path.html
+ ACLOCAL_ARGS="${ACLOCAL_ARGS} -I ${VLC_TOOLS}/share/aclocal/"
+fi
###
### Get a sane environment, just in case
=====================================
contrib/src/aribb24/rules.mak
=====================================
@@ -28,7 +28,8 @@ DEPS_aribb24 = png $(DEPS_png)
.aribb24: aribb24
$(REQUIRE_GPL)
$(REQUIRE_GNUV3)
- cd $< && $(SHELL) ./bootstrap
+ mkdir -p $</m4
+ $(RECONF)
$(MAKEBUILDDIR)
$(MAKECONFIGURE)
+$(MAKEBUILD)
=====================================
contrib/src/bluray/rules.mak
=====================================
@@ -54,7 +54,7 @@ bluray: libbluray-$(BLURAY_VERSION).tar.bz2 .sum-bluray
.bluray: bluray
rm -rf $(PREFIX)/share/java/libbluray*.jar
- cd $< && ./bootstrap
+ $(RECONF)
$(MAKEBUILDDIR)
$(MAKECONFIGURE) $(BLURAY_CONF)
+$(MAKEBUILD)
=====================================
contrib/src/main.mak
=====================================
@@ -219,11 +219,12 @@ else ifneq ($(call cppcheck, __mips_hard_float),)
HAVE_FPU = 1
endif
-ACLOCAL_AMFLAGS += -I$(PREFIX)/share/aclocal
ifneq ($(wildcard $(VLC_TOOLS)/share/aclocal/*),)
-ACLOCAL_AMFLAGS += -I$(abspath $(VLC_TOOLS)/share/aclocal)
+VLC_ACLOCAL_PATH := $(PREFIX)/share/aclocal:$(abspath $(VLC_TOOLS)/share/aclocal):${ACLOCAL_PATH}
+else
+VLC_ACLOCAL_PATH := $(PREFIX)/share/aclocal:${ACLOCAL_PATH}
endif
-export ACLOCAL_AMFLAGS
+export ACLOCAL_PATH=${VLC_ACLOCAL_PATH}
#########
# Tools #
@@ -427,7 +428,7 @@ UPDATE_AUTOCONFIG = for dir in $(AUTOMAKE_DATA_DIRS); do \
AUTORECONF = GTKDOCIZE=true autoreconf
RECONF = mkdir -p -- $(PREFIX)/share/aclocal && \
- cd $< && $(AUTORECONF) -fiv $(ACLOCAL_AMFLAGS)
+ cd $< && $(AUTORECONF) -fiv
BUILD_DIR = $</vlc_build
BUILD_SRC := ..
=====================================
contrib/src/sidplay2/rules.mak
=====================================
@@ -39,7 +39,7 @@ sidplay-libs: sidplay-libs-$(SID_VERSION).tar.gz .sum-sidplay2
for d in . libsidplay resid builders/resid-builder \
builders/hardsid-builder libsidutils ; \
do \
- (cd $</$$d && $(AUTORECONF) -fiv -I unix $(ACLOCAL_AMFLAGS)) || exit $$? ; \
+ (cd $</$$d && $(AUTORECONF) -fiv -I unix) || exit $$? ; \
done
cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
$(MAKE) -C $<
=====================================
contrib/src/smb2/rules.mak
=====================================
@@ -23,7 +23,8 @@ smb2: libsmb2-$(SMB2_VERSION).tar.gz .sum-smb2
SMB2_CONF := --disable-examples --disable-werror --without-libkrb5
.smb2: smb2
- cd $< && ./bootstrap
+ mkdir -p $</m4
+ $(RECONF)
$(MAKEBUILDDIR)
$(MAKECONFIGURE) $(SMB2_CONF)
+$(MAKEBUILD)
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/b79b76e10772569a1d9a9b264df2f796edfdb6a3...8457d2248fc0cb456f6684f112027cffa9f36114
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/b79b76e10772569a1d9a9b264df2f796edfdb6a3...8457d2248fc0cb456f6684f112027cffa9f36114
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list