diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/0011-Do-not-show-g-build-flags-in-Version-string.patch | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index e49843c0..b62cf98f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +yosys (0.7-7) UNRELEASED; urgency=medium + + * debian/patches/0011-Do-not-show-g-build-flags-in-Version-string.patch: + - Do not quote CXXFLAGS_FOR_YOSYS_CONFIG (fixes build on all) + + -- Ruben Undheim <ruben.undheim@gmail.com> Wed, 22 Aug 2018 07:17:20 +0200 + yosys (0.7-6) unstable; urgency=medium * debian/compat: level 11 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 4bc67764..92bde35e 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 @@ -7,7 +7,7 @@ Subject: Do not show g++ build flags in Version string 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile -index aa66a54..fe746f5 100644 +index aa66a54..2d4a1ff 100644 --- a/Makefile +++ b/Makefile @@ -370,15 +370,16 @@ libyosys.so: $(filter-out kernel/driver.o,$(OBJS)) @@ -22,7 +22,7 @@ index aa66a54..fe746f5 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[^ ]\+ //')" ++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))#;' \ |