videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

contrib: Do not pass debug/optim flags to meson 

This fixes the meson underscore prefix test, which misbehaves
when -g is passed, as it would detect the debug string without
underscore first and incorrectly report that no underscore
prefix for symbols is used.

Fixes build issues with dav1d, which relies on the underscore
prefix check.

See: https://github.com/mesonbuild/meson/issues/5482
Signed-off-by: Hugo Beauzée-Luyssen <hugo@beauzee.fr>
This commit is contained in:
Marvin Scholz 2019-06-19 13:32:58 +02:00 committed by Steve Lhomme
parent 94707552e9
commit 3426d7bcf9
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
contrib/src/main.mak
View File

@ -182,8 +182,8 @@ cppcheck = $(shell $(CC) $(CFLAGS) -E -dM - < /dev/null | grep -E $(1))
EXTRA_CFLAGS += -I$(PREFIX)/include
CPPFLAGS := $(CPPFLAGS) $(EXTRA_CFLAGS)
CFLAGS := $(CFLAGS) $(EXTRA_CFLAGS) -g
CXXFLAGS := $(CXXFLAGS) $(EXTRA_CFLAGS) $(EXTRA_CXXFLAGS) -g
CFLAGS := $(CFLAGS) $(EXTRA_CFLAGS)
CXXFLAGS := $(CXXFLAGS) $(EXTRA_CFLAGS) $(EXTRA_CXXFLAGS)
LDFLAGS := $(LDFLAGS) -L$(PREFIX)/lib $(EXTRA_LDFLAGS)
ifdef ENABLE_PDB
@ -192,11 +192,9 @@ CXXFLAGS := $(CXXFLAGS) -gcodeview
endif
ifndef WITH_OPTIMIZATION
CFLAGS := $(CFLAGS) -O0
CXXFLAGS := $(CXXFLAGS) -O0
DBGOPTIMFLAGS = -g -O0
else
CFLAGS := $(CFLAGS) -O2
CXXFLAGS := $(CXXFLAGS) -O2
DBGOPTIMFLAGS = -g -O2
endif
# Do not export those! Use HOSTVARS.
@ -319,13 +317,13 @@ HOSTTOOLS := \
PATH="$(PREFIX)/bin:$(PATH)"
HOSTVARS := $(HOSTTOOLS) \
CPPFLAGS="$(CPPFLAGS)" \
CFLAGS="$(CFLAGS)" \
CXXFLAGS="$(CXXFLAGS)" \
CFLAGS="$(CFLAGS) $(DBGOPTIMFLAGS)" \
CXXFLAGS="$(CXXFLAGS) $(DBGOPTIMFLAGS)" \
LDFLAGS="$(LDFLAGS)"
HOSTVARS_PIC := $(HOSTTOOLS) \
CPPFLAGS="$(CPPFLAGS) $(PIC)" \
CFLAGS="$(CFLAGS) $(PIC)" \
CXXFLAGS="$(CXXFLAGS) $(PIC)" \
CFLAGS="$(CFLAGS) $(DBGOPTIMFLAGS) $(PIC)" \
CXXFLAGS="$(CXXFLAGS) $(DBGOPTIMFLAGS) $(PIC)" \
LDFLAGS="$(LDFLAGS)"
# For cross-compilation with meson, do not set compiler and flags
@ -333,7 +331,11 @@ HOSTVARS_PIC := $(HOSTTOOLS) \
ifdef HAVE_CROSS_COMPILE
HOSTVARS_MESON := PATH="$(PREFIX)/bin:$(PATH)"
else
HOSTVARS_MESON := $(HOSTVARS)
HOSTVARS_MESON := $(HOSTTOOLS) \
CPPFLAGS="$(CPPFLAGS)" \
CFLAGS="$(CFLAGS)" \
CXXFLAGS="$(CXXFLAGS)" \
LDFLAGS="$(LDFLAGS)"
endif
download_git = \
@ -596,7 +598,11 @@ endif
endif
crossfile.meson:
$(HOSTVARS) \
$(HOSTTOOLS) \
CPPFLAGS="$(CPPFLAGS)" \
CFLAGS="$(CFLAGS)" \
CXXFLAGS="$(CXXFLAGS)" \
LDFLAGS="$(LDFLAGS)" \
WINDRES="$(WINDRES)" \
PKG_CONFIG="$(PKG_CONFIG)" \
HOST_SYSTEM="$(MESON_SYSTEM_NAME)" \