[vlc-commits] contrib: move macOS compilation flags to the script where they belong and generalize Darwin OS environment manipulations
vlc/vlc-3.0 | branch: master | Felix Paul Kühne | Wed Jan 24 21:38:53 2018 +0100| [ff57ec088dd4873081d2fbf03c87bc99630a9596] | committer: Felix Paul Kühne contrib: move macOS compilation flags to the script where they belong and generalize Darwin OS environment manipulations (cherry picked from commit 6c6bc89cf0d8377532fa04394d23bc0cea4d9eab) > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=ff57ec088dd4873081d2fbf03c87bc99630a9596 --- contrib/src/main.mak | 13 + extras/package/macosx/build.sh | 14 ++ 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/contrib/src/main.mak b/contrib/src/main.mak index 4c29643f6c..48c54fb5d4 100644 --- a/contrib/src/main.mak +++ b/contrib/src/main.mak @@ -113,10 +113,7 @@ endif endif ifdef HAVE_MACOSX -MIN_OSX_VERSION=10.7 -EXTRA_CFLAGS += -isysroot $(MACOSX_SDK) -mmacosx-version-min=$(MIN_OSX_VERSION) -DMACOSX_DEPLOYMENT_TARGET=$(MIN_OSX_VERSION) EXTRA_CXXFLAGS += -stdlib=libc++ -EXTRA_LDFLAGS += -Wl,-syslibroot,$(MACOSX_SDK) -mmacosx-version-min=$(MIN_OSX_VERSION) -isysroot $(MACOSX_SDK) -DMACOSX_DEPLOYMENT_TARGET=$(MIN_OSX_VERSION) ifeq ($(ARCH),x86_64) EXTRA_CFLAGS += -m64 EXTRA_LDFLAGS += -m64 @@ -132,18 +129,10 @@ endif CCAS=$(CC) -c ifdef HAVE_IOS -CC=xcrun clang -CXX=xcrun clang++ ifdef HAVE_NEON AS=perl $(abspath ../../extras/tools/build/bin/gas-preprocessor.pl) $(CC) CCAS=gas-preprocessor.pl $(CC) -c -else -CCAS=$(CC) -c endif -AR=xcrun ar -LD=xcrun ld -STRIP=xcrun strip -RANLIB=xcrun ranlib EXTRA_CFLAGS += $(CFLAGS) endif @@ -346,7 +335,7 @@ UPDATE_AUTOCONFIG = for dir in $(AUTOMAKE_DATA_DIRS); do \ fi; \ done -ifdef HAVE_IOS +ifdef HAVE_DARWIN_OS AUTORECONF = AUTOPOINT=true autoreconf else AUTORECONF = autoreconf diff --git a/extras/package/macosx/build.sh b/extras/package/macosx/build.sh index 72c2320d73..146dd7aeb7 100755 --- a/extras/package/macosx/build.sh +++ b/extras/package/macosx/build.sh @@ -1,6 +1,5 @@ #!/bin/sh set -e -set -x info() { @@ -193,9 +192,16 @@ spopd # enabled. (e.g. ffmpeg) # - This will fail the build if a partially available symbol is added later on # in contribs and not mentioned in the list of symbols above. -export CFLAGS="-Werror=partial-availability" -export CXXFLAGS="-Werror=partial-availability" -export OBJCFLAGS="-Werror=partial-availability" +CFLAGS="-Werror=partial-availability " +CXXFLAGS="-Werror=partial-availability " +OBJCFLAGS="-Werror=partial-availability " + +CFLAGS+="-isysroot "$SDKROOT" -mmacosx-version-min="$MINIMAL_OSX_VERSION" -DMACOSX_DEPLOYMENT_TARGET="$MINIMAL_OSX_VERSION +LDFLAGS+="-Wl,-syslibroot,"$SDKROOT" -mmacosx-version-min="$MINIMAL_OSX_VERSION" -isysroot "$SDKROOT" -DMACOSX_DEPLOYMENT_TARGET="$MINIMAL_OSX_VERSION + +export CFLAGS=${CFLAGS} +export CXXFLAGS=${CXXFLAGS} +export LDFLAGS=${LDFLAGS} info "Building contribs" spushd "${vlcroot}/contrib" ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] contrib: move macOS compilation flags to the script where they belong and generalize Darwin OS environment manipulations
vlc/vlc-3.0 | branch: master | Felix Paul Kühne | Wed Jan 24 21:38:53 2018 +0100| [625bc3ced2120b50efa35fa8c2e4fac8270f85f2] | committer: Jean-Baptiste Kempf contrib: move macOS compilation flags to the script where they belong and generalize Darwin OS environment manipulations (cherry picked from commit 6c6bc89cf0d8377532fa04394d23bc0cea4d9eab) Signed-off-by: Jean-Baptiste Kempf > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=625bc3ced2120b50efa35fa8c2e4fac8270f85f2 --- contrib/src/main.mak | 13 + extras/package/macosx/build.sh | 14 ++ 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/contrib/src/main.mak b/contrib/src/main.mak index 0398a5ad1a..e6da70cc27 100644 --- a/contrib/src/main.mak +++ b/contrib/src/main.mak @@ -113,10 +113,7 @@ endif endif ifdef HAVE_MACOSX -MIN_OSX_VERSION=10.7 -EXTRA_CFLAGS += -isysroot $(MACOSX_SDK) -mmacosx-version-min=$(MIN_OSX_VERSION) -DMACOSX_DEPLOYMENT_TARGET=$(MIN_OSX_VERSION) EXTRA_CXXFLAGS += -stdlib=libc++ -EXTRA_LDFLAGS += -Wl,-syslibroot,$(MACOSX_SDK) -mmacosx-version-min=$(MIN_OSX_VERSION) -isysroot $(MACOSX_SDK) -DMACOSX_DEPLOYMENT_TARGET=$(MIN_OSX_VERSION) ifeq ($(ARCH),x86_64) EXTRA_CFLAGS += -m64 EXTRA_LDFLAGS += -m64 @@ -132,18 +129,10 @@ endif CCAS=$(CC) -c ifdef HAVE_IOS -CC=xcrun clang -CXX=xcrun clang++ ifdef HAVE_NEON AS=perl $(abspath ../../extras/tools/build/bin/gas-preprocessor.pl) $(CC) CCAS=gas-preprocessor.pl $(CC) -c -else -CCAS=$(CC) -c endif -AR=xcrun ar -LD=xcrun ld -STRIP=xcrun strip -RANLIB=xcrun ranlib EXTRA_CFLAGS += $(CFLAGS) endif @@ -346,7 +335,7 @@ UPDATE_AUTOCONFIG = for dir in $(AUTOMAKE_DATA_DIRS); do \ fi; \ done -ifdef HAVE_IOS +ifdef HAVE_DARWIN_OS AUTORECONF = AUTOPOINT=true autoreconf else AUTORECONF = autoreconf diff --git a/extras/package/macosx/build.sh b/extras/package/macosx/build.sh index 72c2320d73..146dd7aeb7 100755 --- a/extras/package/macosx/build.sh +++ b/extras/package/macosx/build.sh @@ -1,6 +1,5 @@ #!/bin/sh set -e -set -x info() { @@ -193,9 +192,16 @@ spopd # enabled. (e.g. ffmpeg) # - This will fail the build if a partially available symbol is added later on # in contribs and not mentioned in the list of symbols above. -export CFLAGS="-Werror=partial-availability" -export CXXFLAGS="-Werror=partial-availability" -export OBJCFLAGS="-Werror=partial-availability" +CFLAGS="-Werror=partial-availability " +CXXFLAGS="-Werror=partial-availability " +OBJCFLAGS="-Werror=partial-availability " + +CFLAGS+="-isysroot "$SDKROOT" -mmacosx-version-min="$MINIMAL_OSX_VERSION" -DMACOSX_DEPLOYMENT_TARGET="$MINIMAL_OSX_VERSION +LDFLAGS+="-Wl,-syslibroot,"$SDKROOT" -mmacosx-version-min="$MINIMAL_OSX_VERSION" -isysroot "$SDKROOT" -DMACOSX_DEPLOYMENT_TARGET="$MINIMAL_OSX_VERSION + +export CFLAGS=${CFLAGS} +export CXXFLAGS=${CXXFLAGS} +export LDFLAGS=${LDFLAGS} info "Building contribs" spushd "${vlcroot}/contrib" ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] contrib: move macOS compilation flags to the script where they belong and generalize Darwin OS environment manipulations
vlc | branch: master | Felix Paul Kühne | Wed Jan 24 21:38:53 2018 +0100| [6c6bc89cf0d8377532fa04394d23bc0cea4d9eab] | committer: Felix Paul Kühne contrib: move macOS compilation flags to the script where they belong and generalize Darwin OS environment manipulations > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6c6bc89cf0d8377532fa04394d23bc0cea4d9eab --- contrib/src/main.mak | 13 + extras/package/macosx/build.sh | 14 ++ 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/contrib/src/main.mak b/contrib/src/main.mak index 0398a5ad1a..e6da70cc27 100644 --- a/contrib/src/main.mak +++ b/contrib/src/main.mak @@ -113,10 +113,7 @@ endif endif ifdef HAVE_MACOSX -MIN_OSX_VERSION=10.7 -EXTRA_CFLAGS += -isysroot $(MACOSX_SDK) -mmacosx-version-min=$(MIN_OSX_VERSION) -DMACOSX_DEPLOYMENT_TARGET=$(MIN_OSX_VERSION) EXTRA_CXXFLAGS += -stdlib=libc++ -EXTRA_LDFLAGS += -Wl,-syslibroot,$(MACOSX_SDK) -mmacosx-version-min=$(MIN_OSX_VERSION) -isysroot $(MACOSX_SDK) -DMACOSX_DEPLOYMENT_TARGET=$(MIN_OSX_VERSION) ifeq ($(ARCH),x86_64) EXTRA_CFLAGS += -m64 EXTRA_LDFLAGS += -m64 @@ -132,18 +129,10 @@ endif CCAS=$(CC) -c ifdef HAVE_IOS -CC=xcrun clang -CXX=xcrun clang++ ifdef HAVE_NEON AS=perl $(abspath ../../extras/tools/build/bin/gas-preprocessor.pl) $(CC) CCAS=gas-preprocessor.pl $(CC) -c -else -CCAS=$(CC) -c endif -AR=xcrun ar -LD=xcrun ld -STRIP=xcrun strip -RANLIB=xcrun ranlib EXTRA_CFLAGS += $(CFLAGS) endif @@ -346,7 +335,7 @@ UPDATE_AUTOCONFIG = for dir in $(AUTOMAKE_DATA_DIRS); do \ fi; \ done -ifdef HAVE_IOS +ifdef HAVE_DARWIN_OS AUTORECONF = AUTOPOINT=true autoreconf else AUTORECONF = autoreconf diff --git a/extras/package/macosx/build.sh b/extras/package/macosx/build.sh index d996e1f94d..8158bc7bed 100755 --- a/extras/package/macosx/build.sh +++ b/extras/package/macosx/build.sh @@ -1,6 +1,5 @@ #!/bin/sh set -e -set -x info() { @@ -193,9 +192,16 @@ spopd # enabled. (e.g. ffmpeg) # - This will fail the build if a partially available symbol is added later on # in contribs and not mentioned in the list of symbols above. -export CFLAGS="-Werror=partial-availability" -export CXXFLAGS="-Werror=partial-availability" -export OBJCFLAGS="-Werror=partial-availability" +CFLAGS="-Werror=partial-availability " +CXXFLAGS="-Werror=partial-availability " +OBJCFLAGS="-Werror=partial-availability " + +CFLAGS+="-isysroot "$SDKROOT" -mmacosx-version-min="$MINIMAL_OSX_VERSION" -DMACOSX_DEPLOYMENT_TARGET="$MINIMAL_OSX_VERSION +LDFLAGS+="-Wl,-syslibroot,"$SDKROOT" -mmacosx-version-min="$MINIMAL_OSX_VERSION" -isysroot "$SDKROOT" -DMACOSX_DEPLOYMENT_TARGET="$MINIMAL_OSX_VERSION + +export CFLAGS=${CFLAGS} +export CXXFLAGS=${CXXFLAGS} +export LDFLAGS=${LDFLAGS} info "Building contribs" spushd "${vlcroot}/contrib" ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] contrib: move macOS compilation flags to the script where they belong and generalize Darwin OS environment manipulations
vlc | branch: master | Felix Paul Kühne | Wed Jan 24 21:38:53 2018 +0100| [9341582f488592430384006dc3f316ab3374b4bf] | committer: Felix Paul Kühne contrib: move macOS compilation flags to the script where they belong and generalize Darwin OS environment manipulations > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9341582f488592430384006dc3f316ab3374b4bf --- contrib/src/main.mak | 13 + extras/package/macosx/build.sh | 14 ++ 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/contrib/src/main.mak b/contrib/src/main.mak index 0398a5ad1a..e6da70cc27 100644 --- a/contrib/src/main.mak +++ b/contrib/src/main.mak @@ -113,10 +113,7 @@ endif endif ifdef HAVE_MACOSX -MIN_OSX_VERSION=10.7 -EXTRA_CFLAGS += -isysroot $(MACOSX_SDK) -mmacosx-version-min=$(MIN_OSX_VERSION) -DMACOSX_DEPLOYMENT_TARGET=$(MIN_OSX_VERSION) EXTRA_CXXFLAGS += -stdlib=libc++ -EXTRA_LDFLAGS += -Wl,-syslibroot,$(MACOSX_SDK) -mmacosx-version-min=$(MIN_OSX_VERSION) -isysroot $(MACOSX_SDK) -DMACOSX_DEPLOYMENT_TARGET=$(MIN_OSX_VERSION) ifeq ($(ARCH),x86_64) EXTRA_CFLAGS += -m64 EXTRA_LDFLAGS += -m64 @@ -132,18 +129,10 @@ endif CCAS=$(CC) -c ifdef HAVE_IOS -CC=xcrun clang -CXX=xcrun clang++ ifdef HAVE_NEON AS=perl $(abspath ../../extras/tools/build/bin/gas-preprocessor.pl) $(CC) CCAS=gas-preprocessor.pl $(CC) -c -else -CCAS=$(CC) -c endif -AR=xcrun ar -LD=xcrun ld -STRIP=xcrun strip -RANLIB=xcrun ranlib EXTRA_CFLAGS += $(CFLAGS) endif @@ -346,7 +335,7 @@ UPDATE_AUTOCONFIG = for dir in $(AUTOMAKE_DATA_DIRS); do \ fi; \ done -ifdef HAVE_IOS +ifdef HAVE_DARWIN_OS AUTORECONF = AUTOPOINT=true autoreconf else AUTORECONF = autoreconf diff --git a/extras/package/macosx/build.sh b/extras/package/macosx/build.sh index d996e1f94d..8158bc7bed 100755 --- a/extras/package/macosx/build.sh +++ b/extras/package/macosx/build.sh @@ -1,6 +1,5 @@ #!/bin/sh set -e -set -x info() { @@ -193,9 +192,16 @@ spopd # enabled. (e.g. ffmpeg) # - This will fail the build if a partially available symbol is added later on # in contribs and not mentioned in the list of symbols above. -export CFLAGS="-Werror=partial-availability" -export CXXFLAGS="-Werror=partial-availability" -export OBJCFLAGS="-Werror=partial-availability" +CFLAGS="-Werror=partial-availability " +CXXFLAGS="-Werror=partial-availability " +OBJCFLAGS="-Werror=partial-availability " + +CFLAGS+="-isysroot "$SDKROOT" -mmacosx-version-min="$MINIMAL_OSX_VERSION" -DMACOSX_DEPLOYMENT_TARGET="$MINIMAL_OSX_VERSION +LDFLAGS+="-Wl,-syslibroot,"$SDKROOT" -mmacosx-version-min="$MINIMAL_OSX_VERSION" -isysroot "$SDKROOT" -DMACOSX_DEPLOYMENT_TARGET="$MINIMAL_OSX_VERSION + +export CFLAGS=${CFLAGS} +export CXXFLAGS=${CXXFLAGS} +export LDFLAGS=${LDFLAGS} info "Building contribs" spushd "${vlcroot}/contrib" ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits