From: Markham Date: Fri, 29 Sep 2017 06:17:56 +0000 (+0200) Subject: move -D_GLIBCXX_USE_CXX11_ABI to CPPFLAGS X-Git-Url: https://git.webhop.me/?a=commitdiff_plain;h=0a445f85ebfab09afcc903e76b70adc006c6c77b;p=bs-cst-neutrino-hd.git move -D_GLIBCXX_USE_CXX11_ABI to CPPFLAGS --- diff --git a/make/environment.mk b/make/environment.mk index 742982a..c4bc4da 100755 --- a/make/environment.mk +++ b/make/environment.mk @@ -80,7 +80,6 @@ endif TARGETLIB = $(TARGETPREFIX)/lib #TARGET_CFLAGS = -pipe -O2 -g -I$(TARGETPREFIX)/include TARGET_CFLAGS = -pipe -O2 -I$(TARGETPREFIX)/include -TARGET_CFLAGS += -D_GLIBCXX_USE_CXX11_ABI=0 TARGET_CPPFLAGS = $(TARGET_CFLAGS) TARGET_CXXFLAGS = $(TARGET_CFLAGS) TARGET_LDFLAGS = -Wl,-O1 -L$(TARGETLIB) -Wl,-rpath-link,$(TARGETLIB) diff --git a/make/libraries.mk b/make/libraries.mk index 762f844..bcf7363 100755 --- a/make/libraries.mk +++ b/make/libraries.mk @@ -588,7 +588,7 @@ $(D)/libdvbsi++: $(ARCHIVE)/libdvbsi++-$(LIBDVBSI_GIT).tar.bz2 | $(TARGETPREFIX) $(PATCH)/libdvbsi++-src-time_date_section.cpp-fix-sectionLength-check.patch; \ $(PATCH)/libdvbsi++-fix-unaligned-access-on-SuperH.patch; \ $(PATCH)/libdvbsi++-content_identifier_descriptor.patch; \ - $(CONFIGURE) \ + $(CONFIGURE) CPPFLAGS="-D_GLIBCXX_USE_CXX11_ABI=0" \ --prefix=$(TARGETPREFIX) \ --build=$(BUILD) \ --host=$(TARGET); \ diff --git a/make/neutrino.mk b/make/neutrino.mk index 3b48819..6893948 100755 --- a/make/neutrino.mk +++ b/make/neutrino.mk @@ -32,7 +32,6 @@ else HW_TYPE = --with-boxmodel=$(PLATFORM) endif -N_CFLAGS += -D_GLIBCXX_USE_CXX11_ABI=0 #N_CFLAGS += -I$(TARGETPREFIX)/include #N_CFLAGS += -I$(TARGETPREFIX)/include/freetype2 N_CFLAGS += -I$(NEUTRINO_OBJDIR) @@ -40,7 +39,7 @@ N_CFLAGS += -I$(NEUTRINO_OBJDIR)/src/gui N_CPPFLAGS = -I$(TARGETPREFIX)/include N_CPPFLAGS += -Werror -Wsign-compare -#N_CPPFLAGS += -D_GLIBCXX_USE_CXX11_ABI=0 +N_CPPFLAGS += -D_GLIBCXX_USE_CXX11_ABI=0 # the original build script links against openssl. # N_LDFLAGS = -L$(TARGETPREFIX)/lib -lcurl -lssl -lcrypto -ldl