[yosys] 54/57: Using different separator in sed

Ruben Undheim rubund-guest at moszumanska.debian.org
Wed Sep 17 16:08:18 UTC 2014


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

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

commit 8c8aec1f2bc3b4d866b46f593bb7a7f312f9e3c7
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Sun Sep 14 13:10:57 2014 +0200

    Using different separator in sed
---
 debian/patches/06_cflags_ldflags.patch | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/patches/06_cflags_ldflags.patch b/debian/patches/06_cflags_ldflags.patch
index 46773c4..11cce0c 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	2014-09-14 12:45:33.658671118 +0200
-+++ yosys/Makefile	2014-09-14 12:46:06.098671466 +0200
+--- yosys.orig/Makefile	2014-09-14 13:03:35.882682725 +0200
++++ yosys/Makefile	2014-09-14 13:09:24.306686462 +0200
 @@ -27,8 +27,8 @@
  
  all: top-all
@@ -30,12 +30,14 @@ Index: yosys/Makefile
  
  kernel/version_$(GIT_REV).cc: Makefile
  	$(P) rm -f kernel/version_*.o kernel/version_*.d kernel/version_*.cc
-@@ -206,7 +206,7 @@
+@@ -206,8 +206,8 @@
  			$(CXX) --version | tr ' ()' '\n' | grep '^[0-9]' | head -n1` $(filter -f% -m% -O% -DNDEBUG,$(CXXFLAGS)))\";" > kernel/version_$(GIT_REV).cc
  
  yosys-config: yosys-config.in
 -	$(P) $(SED) -e 's, at CXX@,$(CXX),;' -e 's, at CXXFLAGS@,$(CXXFLAGS),;' -e 's, at LDFLAGS@,$(LDFLAGS),;' -e 's, at LDLIBS@,$(LDLIBS),;' \
-+	$(P) $(SED) -e 's, at CXX@,$(CXX),;' -e 's/@CXXFLAGS@/$(CXXFLAGS)/;' -e 's/@LDFLAGS@/$(LDFLAGS)/;' -e 's, at LDLIBS@,$(LDLIBS),;' \
- 			-e 's, at BINDIR@,$(DESTDIR)/bin,;' -e 's, at DATDIR@,$(DESTDIR)/share/yosys,;' < yosys-config.in > yosys-config
+-			-e 's, at BINDIR@,$(DESTDIR)/bin,;' -e 's, at DATDIR@,$(DESTDIR)/share/yosys,;' < yosys-config.in > yosys-config
++	$(P) $(SED) -e 's#@CXX@#$(CXX)#;' -e 's#@CXXFLAGS@#$(CXXFLAGS)#;' -e 's#@LDFLAGS@#$(LDFLAGS)#;' -e 's#@LDLIBS@#$(LDLIBS)#;' \
++			-e 's#@BINDIR@#$(DESTDIR)/bin#;' -e 's#@DATDIR@#$(DESTDIR)/share/yosys#;' < yosys-config.in > yosys-config
  	$(Q) chmod +x yosys-config
  
+ abc/abc-$(ABCREV):

-- 
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