[vlc-commits] [Git][videolan/vlc][master] 2 commits: contrib: factorize the Makefile flags common to all darwin targets

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
f80a95b3 by Steve Lhomme at 2024-07-20T06:12:44+00:00
contrib: factorize the Makefile flags common to all darwin targets

- - - - -
4bfdaf55 by Steve Lhomme at 2024-07-20T06:12:44+00:00
contrib: remove HAVE_BSD for darwin targets

HAVE_DARWIN_OS always has the priority over HAVE_BSD. We only need
one of them. HAVE_BSD will be for other BSD variants.

- - - - -


4 changed files:

- contrib/bootstrap
- contrib/src/basu/rules.mak
- contrib/src/gcrypt/rules.mak
- contrib/src/live555/rules.mak


Changes:

=====================================
contrib/bootstrap
=====================================
@@ -267,13 +267,14 @@ OS="${HOST#*-}" # strip architecture
 MAKE=make
 case "${OS}" in
 	*-darwin*)
+		add_make_enabled "HAVE_DARWIN_OS"
 		if test -z "$BUILDFORIOS"
 		then
 			check_macosx_sdk
-			add_make_enabled "HAVE_MACOSX" "HAVE_DARWIN_OS" "HAVE_BSD"
+			add_make_enabled "HAVE_MACOSX"
 		else
 			check_ios_sdk
-			add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" "HAVE_FPU"
+			add_make_enabled "HAVE_IOS" "HAVE_FPU"
 
 			case "${HOST}" in
 				*arm64*)


=====================================
contrib/src/basu/rules.mak
=====================================
@@ -13,10 +13,8 @@ endif
 endif
 
 ifdef HAVE_BSD
-ifndef HAVE_DARWIN_OS
 PKGS += basu
 endif
-endif
 
 endif # libsystemd
 endif # libelogind


=====================================
contrib/src/gcrypt/rules.mak
=====================================
@@ -54,11 +54,10 @@ endif
 ifeq ($(ARCH), x86_64)
 GCRYPT_CONF += ac_cv_sys_symbol_underscore=yes
 endif
-else
+endif
 ifdef HAVE_BSD
 GCRYPT_CONF += --disable-asm --disable-aesni-support
 endif
-endif
 ifdef HAVE_ANDROID
 ifeq ($(ANDROID_ABI), x86)
 GCRYPT_CONF += ac_cv_sys_symbol_underscore=no


=====================================
contrib/src/live555/rules.mak
=====================================
@@ -35,11 +35,10 @@ LIVE_EXTRA_CFLAGS += -DNO_GETIFADDRS=1
 endif
 ifdef HAVE_DARWIN_OS
 LIVE_TARGET := macosx-bigsur
-else
+endif
 ifdef HAVE_BSD
 LIVE_TARGET := freebsd
 endif
-endif
 ifdef HAVE_SOLARIS
 ifeq ($(ARCH),x86_64)
 LIVE_TARGET := solaris-64bit



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/903592a2b19303e4872a2273dcdc78ab9cc7b01e...4bfdaf555b842d4426daf7e2f048eaaaf1784f6b

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/903592a2b19303e4872a2273dcdc78ab9cc7b01e...4bfdaf555b842d4426daf7e2f048eaaaf1784f6b
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance