[vlc-commits] [Git][videolan/vlc][master] src/Makefile: fix emscripten library object conflict

[Jean-Baptiste Kempf (@jbk)]

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


Commits:
01162c3f by Khalid Masum at 2023-08-06T06:49:24+00:00
src/Makefile: fix emscripten library object conflict

Several posix related headers are added when they are compiled
for EMSCRIPTEN. However these headers are already served from
other parts of code, mainly with !HAVE_DARWIN and !OS2. Which
implies If it is not compiled for darwin (which is true for
emscripten) some posix libraries are added. And when the
emscripten section of the code adds them again, it creates a clash.

Fix this problem by removing such double addition of sources from
emscripten.

- - - - -


1 changed file:

- src/Makefile.am


Changes:

=====================================
src/Makefile.am
=====================================
@@ -456,13 +456,6 @@ endif
 
 if HAVE_EMSCRIPTEN
 libvlccore_la_SOURCES += \
-	posix/thread.c \
-	posix/getaddrinfo.c \
-	posix/error.c \
-	posix/dirs.c \
-	posix/filesystem.c \
-	posix/specific.c \
-	posix/timer.c \
 	emscripten/netconf.c \
 	emscripten/thread.c
 endif
@@ -518,10 +511,12 @@ libvlccore_la_SOURCES += \
 	posix/thread.c
 libvlccore_la_LIBADD += $(LIBEXECINFO)
 if !HAVE_DARWIN
+if !HAVE_EMSCRIPTEN
+libvlccore_la_SOURCES += posix/netconf.c
+endif
 libvlccore_la_SOURCES += \
 	posix/dirs.c \
 	posix/error.c \
-	posix/netconf.c \
 	posix/picture.c \
 	posix/spawn.c \
 	posix/specific.c



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/01162c3ffcc0d1786526f39a36ade85b75a6a9a8

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/01162c3ffcc0d1786526f39a36ade85b75a6a9a8
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance