vlc | branch: master | Filip Roséen <[email protected]> | Mon Jul 16 05:29:06 2018 +0200| [9517e00234afb03a134c61cbf9108cca14a438bd] | committer: Konstantin Pavlov
contrib: live555: prevent inclusion of xlocale.h on linux https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27 Also, as stated in the above notes, xlocale.h was never meant to be included, so live555 is in the wrong for even trying. Signed-off-by: Konstantin Pavlov <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9517e00234afb03a134c61cbf9108cca14a438bd --- contrib/src/live555/rules.mak | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak index 3093dedec6..fa1868bb15 100644 --- a/contrib/src/live555/rules.mak +++ b/contrib/src/live555/rules.mak @@ -19,9 +19,12 @@ $(TARBALLS)/$(LIVE555_FILE): .sum-live555: $(LIVE555_FILE) +LIVE_EXTRA_CFLAGS := $(EXTRA_CFLAGS) -fexceptions $(CFLAGS) + LIVE_TARGET = $(error live555 target not defined!) ifdef HAVE_LINUX LIVE_TARGET := linux +LIVE_EXTRA_CFLAGS += -DXLOCALE_NOT_USED endif ifdef HAVE_WIN32 LIVE_TARGET := mingw @@ -41,8 +44,6 @@ LIVE_TARGET := solaris-32bit endif endif -LIVE_EXTRA_CFLAGS := $(EXTRA_CFLAGS) -fexceptions $(CFLAGS) - live555: $(LIVE555_FILE) .sum-live555 rm -Rf live && $(UNPACK) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
