[yosys] 01/01: Correctly refresh 06_cflags_ldflags.patch

Ruben Undheim rubund-guest at moszumanska.debian.org
Wed Oct 7 20:18:47 UTC 2015


This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository yosys.

commit e6dadd939b16062896cf72de5b2b9ab8a8d88c3d
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Wed Oct 7 22:18:27 2015 +0200

    Correctly refresh 06_cflags_ldflags.patch
---
 debian/patches/06_cflags_ldflags.patch | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/debian/patches/06_cflags_ldflags.patch b/debian/patches/06_cflags_ldflags.patch
index 7a77556..4e5b60c 100644
--- a/debian/patches/06_cflags_ldflags.patch
+++ b/debian/patches/06_cflags_ldflags.patch
@@ -4,8 +4,8 @@ Forwarded: will do
 Author: Ruben Undheim <ruben.undheim at gmail.com>
 Index: yosys/Makefile
 ===================================================================
---- yosys.orig/Makefile	2015-10-07 23:56:09.422434236 +0400
-+++ yosys/Makefile	2015-10-07 23:57:01.005214928 +0400
+--- yosys.orig/Makefile	2015-10-07 22:15:11.177383326 +0200
++++ yosys/Makefile	2015-10-07 22:18:16.680295247 +0200
 @@ -39,8 +39,8 @@
  YOSYS_SRC := $(dir $(firstword $(MAKEFILE_LIST)))
  VPATH := $(YOSYS_SRC)
@@ -31,3 +31,16 @@ Index: yosys/Makefile
  
  kernel/version_$(GIT_REV).cc: $(YOSYS_SRC)/Makefile
  	$(P) rm -f kernel/version_*.o kernel/version_*.d kernel/version_*.cc
+@@ -319,9 +319,9 @@
+ 			$(CXX) --version | tr ' ()' '\n' | grep '^[0-9]' | head -n1` $(filter -f% -m% -O% -DNDEBUG,$(CXXFLAGS)))\"; }" > kernel/version_$(GIT_REV).cc
+ 
+ yosys-config: misc/yosys-config.in
+-	$(P) $(SED) -e 's, at CXXFLAGS@,$(subst -I. -I"$(YOSYS_SRC)",-I"$(TARGET_DATDIR)/include",$(CXXFLAGS)),;' \
+-			-e 's, at CXX@,$(CXX),;' -e 's, at LDFLAGS@,$(LDFLAGS),;' -e 's, at LDLIBS@,$(LDLIBS),;' \
+-			-e 's, at BINDIR@,$(TARGET_BINDIR),;' -e 's, at DATDIR@,$(TARGET_DATDIR),;' < $< > yosys-config
++	$(P) $(SED) -e 's#@CXXFLAGS@#$(subst -I. -I"$(YOSYS_SRC)",-I"$(TARGET_DATDIR)/include",$(CXXFLAGS))#;' \
++			-e 's#@CXX@#$(CXX)#;' -e 's#@LDFLAGS@#$(LDFLAGS)#;' -e 's#@LDLIBS@#$(LDLIBS)#;' \
++			-e 's#@BINDIR@#$(TARGET_BINDIR)#;' -e 's#@DATDIR@#$(TARGET_DATDIR)#;' < $< > yosys-config
+ 	$(Q) chmod +x yosys-config
+ 
+ abc/abc-$(ABCREV)$(EXE):

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/yosys.git



More information about the debian-science-commits mailing list