[vlc-commits] [Git][videolan/vlc][master] 2 commits: src/Makefile.am: forward libvlccore CPPFLAGS

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC


Commits:
c358620b by Alexandre Janniaux at 2021-12-08T10:16:23+00:00
src/Makefile.am: forward libvlccore CPPFLAGS

Some flags were defined in configure.ac but were not used in the
Makefile.am. No issue raised from this oversight since the test was
actually always disabled.

- - - - -
34d0186e by Alexandre Janniaux at 2021-12-08T10:16:23+00:00
configure.ac: fix dynamic_lookup support detection

The AX_APPEND_FLAG arguments were reversed, the program was not escaped
from m4 macros, and the function was declared in the body of the main
function, so it just couldn't work.

After fixing this, static module bank is back working normally on
MacOSX.

- - - - -


2 changed files:

- configure.ac
- src/Makefile.am


Changes:

=====================================
configure.ac
=====================================
@@ -211,12 +211,12 @@ case "${host_os}" in
     dnl to disable the static bank loader.
     AC_MSG_CHECKING([if -Wl,-U is allowed])
     VLC_SAVE_FLAGS
-    AX_APPEND_FLAG([LDFLAGS],[-Wl,-U,_my_array -no-undefined])
+    AX_APPEND_FLAG([-Wl,-U,_my_array],[LDFLAGS])
     AC_LINK_IFELSE(
-       [AC_LANG_PROGRAM([], [dnl
+       [AC_LANG_PROGRAM([[
 __attribute__((visibility("default"))) extern int my_array[];
-__attribute__((visibility("default"))) int foo() { return my_array[0]; }
-])],
+int foo() { return my_array[0]; }
+]],[[return foo();]])],
        [
         VLC_ADD_LDFLAGS([libvlccore],[-Wl,-U,_vlc_static_modules])
         VLC_ADD_LDFLAGS([libvlc vlc],[-Wl,-undefined,dynamic_lookup])


=====================================
src/Makefile.am
=====================================
@@ -405,6 +405,8 @@ libvlccore_la_LIBADD = $(LIBS_libvlccore) \
 	$(LTLIBINTL) $(LTLIBICONV) \
 	$(IDN_LIBS) $(SOCKET_LIBS) $(ATOMIC_LIB) $(LIBRT) $(LIBDL) $(LIBM)
 
+libvlccore_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_libvlccore)
+
 if HAVE_WIN32
 libvlccore_la_SOURCES += \
 	win32/error.c \



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/07f6be926c94d46fa8cc6f1d988c2c0a0dd74044...34d0186ecd6a1506e1f2cd65023c78f123ea4462

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/07f6be926c94d46fa8cc6f1d988c2c0a0dd74044...34d0186ecd6a1506e1f2cd65023c78f123ea4462
You're receiving this email because of your account on code.videolan.org.