[vlc-commits] [Git][videolan/vlc][master] 9 commits: contrib: apple: show the contrib status before building
Jean-Baptiste Kempf (@jbk)
gitlab at videolan.org
Sat Sep 24 16:37:55 UTC 2022
Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC
Commits:
dd3070b6 by Steve Lhomme at 2022-09-24T15:26:44+00:00
contrib: apple: show the contrib status before building
- - - - -
cf349b29 by Steve Lhomme at 2022-09-24T15:26:44+00:00
contrib: macos: always shows the list of know contribs before building
We also want to know about native tools that may or may not be there.
- - - - -
aca40946 by Steve Lhomme at 2022-09-24T15:26:44+00:00
contrib: win32: always shows the list of know contribs before building
We also want to know about native tools that may or may not be there.
- - - - -
23709c57 by Steve Lhomme at 2022-09-24T15:26:44+00:00
contrib: apple: build contribs tools when using prebuilt
As done with other platforms
- - - - -
6a56e916 by Steve Lhomme at 2022-09-24T15:26:44+00:00
extras: wasm: build contribs tools when using prebuilt
As done with other platforms
- - - - -
f67d4998 by Steve Lhomme at 2022-09-24T15:26:44+00:00
configure: show the contrib selection result directly
So all AC_MSG_RESULT are grouped in the same block.
- - - - -
4a3f86f0 by Steve Lhomme at 2022-09-24T15:26:44+00:00
contrib: use the proper bindir for native tools
In case it was set by the environment.
- - - - -
74451723 by Steve Lhomme at 2022-09-24T15:26:44+00:00
contrib: use BUILDBINDIR in the PATH rather than $(BUILDPREFIX)/bin
If it's overriden we should use that one.
- - - - -
570ec04c by Steve Lhomme at 2022-09-24T15:26:44+00:00
contrib: use the default BUILDPREFIX as relative to PREFIX
It will be turned into an absolute path right after.
That's how the configure script of VLC determines the location of native tools
in the contribs.
When overriding PREFIX, the native location will still remain coherent with the
rest of the contribs.
- - - - -
6 changed files:
- configure.ac
- contrib/src/main.mak
- extras/package/apple/build.sh
- extras/package/macosx/build.sh
- extras/package/wasm-emscripten/build.sh
- extras/package/win32/build.sh
Changes:
=====================================
configure.ac
=====================================
@@ -519,6 +519,7 @@ AS_IF([test -z "${with_contrib}" || test "${with_contrib}" = "yes"], [
], [
AS_IF([test "${with_contrib}" != "no"], [
CONTRIB_DIR="${with_contrib}"
+ AC_MSG_RESULT([${CONTRIB_DIR}])
], [
CONTRIB_DIR=""
AC_MSG_RESULT([disabled])
@@ -526,7 +527,9 @@ AS_IF([test -z "${with_contrib}" || test "${with_contrib}" = "yes"], [
])
AS_IF([test -n "${CONTRIB_DIR}"], [
AS_IF([test -d "${CONTRIB_DIR}/lib"],[
- CONTRIB_DIR=`cd "${CONTRIB_DIR}" && pwd`
+ SRC_CONTRIB_DIR=$(CONTRIB_DIR)
+ CONTRIB_DIR=`cd "${CONTRIB_DIR}" && pwd -P`
+ AC_MSG_RESULT([${CONTRIB_DIR} from ${SRC_CONTRIB_DIR}])
], [
echo "${CONTRIB_DIR}/lib not found" >&AS_MESSAGE_LOG_FD
CONTRIB_DIR=""
@@ -535,7 +538,6 @@ AS_IF([test -n "${CONTRIB_DIR}"], [
])
AS_IF([test -n "${CONTRIB_DIR}"], [
- AC_MSG_RESULT([${CONTRIB_DIR}])
CPPFLAGS="${CPPFLAGS} -I${CONTRIB_DIR}/include"
CFLAGS="${CFLAGS} -I${CONTRIB_DIR}/include"
CXXFLAGS="${CXXFLAGS} -I${CONTRIB_DIR}/include"
=====================================
contrib/src/main.mak
=====================================
@@ -31,7 +31,7 @@ GOOGLE_CODE := https://storage.googleapis.com/google-code-archive-downloads/v2/c
PREFIX ?= $(TOPDST)/$(HOST)
PREFIX := $(abspath $(PREFIX))
-BUILDPREFIX ?= $(TOPDST)
+BUILDPREFIX ?= $(PREFIX)/..
BUILDPREFIX := $(abspath $(BUILDPREFIX))
BUILDBINDIR ?= $(BUILDPREFIX)/bin
ifneq ($(HOST),$(BUILD))
@@ -368,6 +368,7 @@ HOSTVARS_PIC := $(HOSTTOOLS) \
BUILDCOMMONCONF := --disable-dependency-tracking
BUILDCOMMONCONF += --prefix="$(BUILDPREFIX)"
+BUILDCOMMONCONF += --bindir="$(BUILDBINDIR)"
BUILDCOMMONCONF += --datarootdir="$(BUILDPREFIX)/share"
BUILDCOMMONCONF += --includedir="$(BUILDPREFIX)/include"
BUILDCOMMONCONF += --libdir="$(BUILDPREFIX)"
@@ -382,7 +383,7 @@ BUILDTOOLCONF := $(BUILDCOMMONCONF) \
BUILDTOOLS := \
CC="$(BUILDCC)" CXX="$(BUILDCXX)" LD="$(BUILDLD)" \
AR="$(BUILDAR)" NM="$(BUILDNM)" RANLIB="$(BUILDRANLIB)" \
- STRIP="$(BUILDSTRIP)" PATH="$(BUILDPREFIX)/bin:$(PATH)"
+ STRIP="$(BUILDSTRIP)" PATH="$(BUILDBINDIR):$(PATH)"
BUILDVARS := $(BUILDTOOLS) \
CPPFLAGS="$(BUILDCPPFLAGS)" \
=====================================
extras/package/apple/build.sh
=====================================
@@ -641,6 +641,9 @@ fi
"${VLC_CONTRIB_OPTIONS[@]}" \
|| abort_err "Bootstrapping contribs failed"
+# Print list of contribs that will be built
+$MAKE list
+
if [ "$VLC_USE_PREBUILT_CONTRIBS" -gt "0" ]; then
# Fetch prebuilt contribs
if [ -z "$VLC_PREBUILT_CONTRIBS_URL" ]; then
@@ -649,10 +652,8 @@ if [ "$VLC_USE_PREBUILT_CONTRIBS" -gt "0" ]; then
$MAKE prebuilt PREBUILT_URL="$VLC_PREBUILT_CONTRIBS_URL" \
|| abort_err "Fetching prebuilt contribs from ${VLC_PREBUILT_CONTRIBS_URL} failed"
fi
+ $MAKE tools
else
- # Print list of contribs that will be built
- $MAKE list
-
# Download source packages
$MAKE fetch
=====================================
extras/package/macosx/build.sh
=====================================
@@ -169,8 +169,8 @@ fi
mkdir -p contrib-$HOST_TRIPLET && cd contrib-$HOST_TRIPLET
../bootstrap --build=$BUILD_TRIPLET --host=$HOST_TRIPLET > $out
+make list
if [ "$CONTRIBFROMSOURCE" = "yes" ]; then
- make list
make fetch
make -j$JOBS .gettext
make -j$JOBS -k || make -j1
=====================================
extras/package/wasm-emscripten/build.sh
=====================================
@@ -138,6 +138,7 @@ if [ "$VLC_USE_PREBUILT_CONTRIBS" -eq "0" ]; then
else
diagnostic "vlc contribs: using prebuilt contribs"
emmake make prebuilt PREBUILT_URL="$VLC_PREBUILT_CONTRIBS_URL"
+ emmake make tools
fi
diagnostic "starting libvlc build"
=====================================
extras/package/win32/build.sh
=====================================
@@ -320,8 +320,8 @@ export CXXFLAGS
${VLC_ROOT_PATH}/contrib/bootstrap --host=$TRIPLET --prefix=../$CONTRIB_PREFIX $CONTRIBFLAGS
# Rebuild the contribs or use the prebuilt ones
+make list
if [ "$PREBUILT" != "yes" ]; then
- make list
make -j$JOBS fetch
make -j$JOBS -k || make -j1
if [ "$PACKAGE" = "yes" ]; then
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/54587061ce962bbb6936412ae991c8fd98460649...570ec04c66efc837d6008f579105f417e3618ab5
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/54587061ce962bbb6936412ae991c8fd98460649...570ec04c66efc837d6008f579105f417e3618ab5
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