[yosys] 03/05: Some patches fixed upstream. Removed

[Ruben Undheim]

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

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

commit 47c03e51d236302fd8c876068551bc9b668d6704
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Wed Oct 14 18:13:06 2015 +0200

    Some patches fixed upstream. Removed
---
 debian/patches/04_installpath.patch    | 47 ----------------------------------
 debian/patches/06_cflags_ldflags.patch | 46 ---------------------------------
 debian/patches/series                  |  2 --
 3 files changed, 95 deletions(-)

diff --git a/debian/patches/04_installpath.patch b/debian/patches/04_installpath.patch
deleted file mode 100644
index 85e8135..0000000
--- a/debian/patches/04_installpath.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Description: This makes sure that DESTDIR
-  is not overwritten in the Makefile.
-Forwarded: doesn't make sense upstream
-Author: Ruben Undheim <ruben.undheim at gmail.com>
-Index: yosys/Makefile
-===================================================================
---- yosys.orig/Makefile	2015-10-07 23:54:36.805441499 +0400
-+++ yosys/Makefile	2015-10-07 23:55:47.877272796 +0400
-@@ -18,11 +18,11 @@
- ENABLE_GPROF := 0
- ENABLE_NDEBUG := 0
- 
--DESTDIR := /usr/local
-+#DESTDIR := /usr/local
- INSTALL_SUDO :=
- 
--TARGET_BINDIR := $(DESTDIR)/bin
--TARGET_DATDIR := $(DESTDIR)/share/yosys
-+TARGET_BINDIR := $(DESTDIR)/usr/bin
-+TARGET_DATDIR := $(DESTDIR)/usr/share/yosys
- 
- EXE =
- OBJS =
-@@ -39,7 +39,7 @@
- YOSYS_SRC := $(dir $(firstword $(MAKEFILE_LIST)))
- VPATH := $(YOSYS_SRC)
- 
--CXXFLAGS = -Wall -Wextra -ggdb -I. -I"$(YOSYS_SRC)" -MD -D_YOSYS_ -fPIC -I$(DESTDIR)/include
-+CXXFLAGS = -Wall -Wextra -ggdb -I. -I"$(YOSYS_SRC)" -MD -D_YOSYS_ -fPIC -I$(DESTDIR)/usr/include
- LDFLAGS = -L$(DESTDIR)/lib
- LDLIBS = -lstdc++ -lm
- SED = sed
-@@ -378,10 +378,10 @@
- 	@echo ""
- 
- install: $(TARGETS) $(EXTRA_TARGETS)
--	$(INSTALL_SUDO) mkdir -p $(DESTDIR)/bin
--	$(INSTALL_SUDO) install $(TARGETS) $(DESTDIR)/bin/
--	$(INSTALL_SUDO) mkdir -p $(DESTDIR)/share/yosys
--	$(INSTALL_SUDO) cp -r share/. $(DESTDIR)/share/yosys/.
-+	$(INSTALL_SUDO) mkdir -p $(DESTDIR)/usr/bin
-+	$(INSTALL_SUDO) install $(TARGETS) $(DESTDIR)/usr/bin/
-+	$(INSTALL_SUDO) mkdir -p $(DESTDIR)/usr/share/yosys
-+	$(INSTALL_SUDO) cp -r share/. $(DESTDIR)/usr/share/yosys/.
- ifeq ($(ENABLE_LIBYOSYS),1)
- 	$(INSTALL_SUDO) cp libyosys.so $(DESTDIR)/lib/
- 	$(INSTALL_SUDO) ldconfig
diff --git a/debian/patches/06_cflags_ldflags.patch b/debian/patches/06_cflags_ldflags.patch
deleted file mode 100644
index 4e5b60c..0000000
--- a/debian/patches/06_cflags_ldflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Description: Patch to make CPPFLAGS, CXXFLAGS and LDFLAGS
-  from dpkg-buildflags be used.
-Forwarded: will do
-Author: Ruben Undheim <ruben.undheim at gmail.com>
-Index: yosys/Makefile
-===================================================================
---- 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)
- 
--CXXFLAGS = -Wall -Wextra -ggdb -I. -I"$(YOSYS_SRC)" -MD -D_YOSYS_ -fPIC -I$(DESTDIR)/usr/include
--LDFLAGS = -L$(DESTDIR)/lib
-+CXXFLAGS += -Wall -Wextra -ggdb -I. -I"$(YOSYS_SRC)" -MD -D_YOSYS_ -fPIC -I$(DESTDIR)/usr/include
-+LDFLAGS += -L$(DESTDIR)/lib
- LDLIBS = -lstdc++ -lm
- SED = sed
- BISON = bison
-@@ -307,11 +307,11 @@
- 
- %.o: %.cc
- 	$(Q) mkdir -p $(dir $@)
--	$(P) $(CXX) -o $@ -c $(CXXFLAGS) $<
-+	$(P) $(CXX) -o $@ -c $(CPPFLAGS) $(CXXFLAGS) $<
- 
- %.o: %.cpp
- 	$(Q) mkdir -p $(dir $@)
--	$(P) $(CXX) -o $@ -c $(CXXFLAGS) $<
-+	$(P) $(CXX) -o $@ -c $(CPPFLAGS) $(CXXFLAGS) $<
- 
- 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):
diff --git a/debian/patches/series b/debian/patches/series
index a91ae4f..11a03dc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
 01_gitrevision.patch
 02_removeabc.patch
 03_notruntests.patch
-04_installpath.patch
 05_abc_executable.patch
-06_cflags_ldflags.patch

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