From bef1ef4b2516e428b530b0ccce452fdd97999a50 Mon Sep 17 00:00:00 2001 From: Ruben Undheim Date: Tue, 21 Aug 2018 19:54:11 +0200 Subject: Also remove -fdebug-prefix= from yosys-config --- ...011-Do-not-show-g-build-flags-in-Version-string.patch | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/patches/0011-Do-not-show-g-build-flags-in-Version-string.patch b/debian/patches/0011-Do-not-show-g-build-flags-in-Version-string.patch index 10ceec2c..adcc4482 100644 --- a/debian/patches/0011-Do-not-show-g-build-flags-in-Version-string.patch +++ b/debian/patches/0011-Do-not-show-g-build-flags-in-Version-string.patch @@ -3,14 +3,14 @@ Date: Sun, 19 Aug 2018 23:03:51 +0200 Subject: Do not show g++ build flags in Version string --- - Makefile | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) + Makefile | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile -index aa66a54..8613943 100644 +index aa66a54..118fd37 100644 --- a/Makefile +++ b/Makefile -@@ -370,8 +370,7 @@ libyosys.so: $(filter-out kernel/driver.o,$(OBJS)) +@@ -370,15 +370,14 @@ libyosys.so: $(filter-out kernel/driver.o,$(OBJS)) $(Q) mkdir -p $(dir $@) $(P) $(CXX) -o $@ -c $(CPPFLAGS) $(CXXFLAGS) $< @@ -20,3 +20,11 @@ index aa66a54..8613943 100644 kernel/version_$(GIT_REV).cc: $(YOSYS_SRC)/Makefile $(P) rm -f kernel/version_*.o kernel/version_*.d kernel/version_*.cc + $(Q) mkdir -p kernel && echo "namespace Yosys { extern const char *yosys_version_str; const char *yosys_version_str=\"$(YOSYS_VER_STR)\"; }" > kernel/version_$(GIT_REV).cc + + yosys-config: misc/yosys-config.in +- $(P) $(SED) -e 's#@CXXFLAGS@#$(subst -I. -I"$(YOSYS_SRC)",-I"$(DATDIR)/include",$(CXXFLAGS))#;' \ ++ NEWCXXFLAGS=`echo $(subst -I. -I"$(YOSYS_SRC)",-I"$(DATDIR)/include",$(CXXFLAGS)) | sed 's/-fdebug-prefix[^ ]\+ //'` $(P) $(SED) -e 's#@CXXFLAGS@#'${NEWCXXFLAGS}'#;' \ + -e 's#@CXX@#$(CXX)#;' -e 's#@LDFLAGS@#$(LDFLAGS)#;' -e 's#@LDLIBS@#$(LDLIBS)#;' \ + -e 's#@BINDIR@#$(BINDIR)#;' -e 's#@DATDIR@#$(DATDIR)#;' < $< > yosys-config + $(Q) chmod +x yosys-config -- cgit v1.2.3