summaryrefslogtreecommitdiff
path: root/debian/patches/0011-Do-not-show-g-build-flags-in-Version-string.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/0011-Do-not-show-g-build-flags-in-Version-string.patch')
-rw-r--r--debian/patches/0011-Do-not-show-g-build-flags-in-Version-string.patch12
1 files changed, 7 insertions, 5 deletions
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 9198b3be..4bc67764 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 | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
+ Makefile | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
-index aa66a54..69057c2 100644
+index aa66a54..fe746f5 100644
--- a/Makefile
+++ b/Makefile
-@@ -370,15 +370,14 @@ libyosys.so: $(filter-out kernel/driver.o,$(OBJS))
+@@ -370,15 +370,16 @@ libyosys.so: $(filter-out kernel/driver.o,$(OBJS))
$(Q) mkdir -p $(dir $@)
$(P) $(CXX) -o $@ -c $(CPPFLAGS) $(CXXFLAGS) $<
@@ -22,9 +22,11 @@ index aa66a54..69057c2 100644
$(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
++CXXFLAGS_FOR_YOSYS_CONFIG := "$(shell echo $(subst -I. -I"$(YOSYS_SRC)",-I"$(DATDIR)/include",$(CXXFLAGS)) | sed 's/-fdebug-prefix[^ ]\+ //' | sed 's/-ffile-prefix-map[^ ]\+ //')"
++
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[^ ]\+ //' | sed 's/-ffile-prefix-map[^ ]\+ //'`" ; $(P) $(SED) -e 's#@CXXFLAGS@#'${NEWCXXFLAGS}'#;' \
++ $(P) $(SED) -e 's#@CXXFLAGS@#$(CXXFLAGS_FOR_YOSYS_CONFIG)#;' \
-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