[yosys] 12/15: add a patch to install the headers in the normal place

[Sebastian Kuzminsky]

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

seb_kuzminsky-guest pushed a commit to branch doc-dev-debs
in repository yosys.

commit 2bf3943c1a3ab04cfaecbe1621918ea71a9be940
Author: Sebastian Kuzminsky <seb at highlab.com>
Date:   Wed Mar 23 14:42:06 2016 -0600

    add a patch to install the headers in the normal place
---
 debian/patches/header-install-dir.patch | 54 +++++++++++++++++++++++++++++++++
 debian/patches/series                   |  1 +
 2 files changed, 55 insertions(+)

diff --git a/debian/patches/header-install-dir.patch b/debian/patches/header-install-dir.patch
new file mode 100644
index 0000000..ecca35d
--- /dev/null
+++ b/debian/patches/header-install-dir.patch
@@ -0,0 +1,54 @@
+Description: Install the headers in the normal include path, not under
+ share/.
+Author: Sebastian Kuzminsky <seb at highlab.com>
+Index: yosys/Makefile
+===================================================================
+--- yosys.orig/Makefile	2016-03-23 16:14:52.383668301 -0600
++++ yosys/Makefile	2016-03-23 16:14:52.379668342 -0600
+@@ -31,6 +31,7 @@
+ 
+ TARGET_BINDIR := $(DESTDIR)$(PREFIX)/bin
+ TARGET_DATDIR := $(DESTDIR)$(PREFIX)/share/yosys
++TARGET_INCDIR := $(DESTDIR)$(PREFIX)/include/yosys
+ 
+ EXE =
+ OBJS =
+@@ -233,7 +234,7 @@
+ endef
+ 
+ define add_include_file
+-$(eval $(call add_share_file,$(dir share/include/$(1)),$(1)))
++$(eval $(call add_share_file,$(dir include/$(1)),$(1)))
+ endef
+ 
+ ifeq ($(PRETTY), 1)
+@@ -349,7 +350,7 @@
+ 			$(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#@CXXFLAGS@#$(subst -I. -I"$(YOSYS_SRC)",-I"$(TARGET_DATDIR)/include",$(CXXFLAGS))#;' \
++	$(P) $(SED) -e 's#@CXXFLAGS@#$(subst -I. -I"$(YOSYS_SRC)",-I"$(TARGET_INCDIR)",$(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
+@@ -412,6 +413,8 @@
+ 	$(INSTALL_SUDO) install $(TARGETS) $(DESTDIR)$(PREFIX)/bin/
+ 	$(INSTALL_SUDO) mkdir -p $(DESTDIR)$(PREFIX)/share/yosys
+ 	$(INSTALL_SUDO) cp -r share/. $(DESTDIR)$(PREFIX)/share/yosys/.
++	$(INSTALL_SUDO) mkdir -p $(TARGET_INCDIR)
++	$(INSTALL_SUDO) cp -r include/. $(TARGET_INCDIR)/.
+ ifeq ($(ENABLE_LIBYOSYS),1)
+ 	$(INSTALL_SUDO) cp libyosys.so $(DESTDIR)$(PREFIX)/lib/
+ 	$(INSTALL_SUDO) ldconfig
+Index: yosys/.gitignore
+===================================================================
+--- yosys.orig/.gitignore	2016-03-03 17:33:57.281492166 -0700
++++ yosys/.gitignore	2016-03-23 16:15:23.635346198 -0600
+@@ -23,6 +23,7 @@
+ /yosys-filterlib.exe
+ /kernel/version_*.cc
+ /share
++/include
+ /yosys-win32-mxebin-*
+ /yosys-win32-vcxsrc-*
+ /yosysjs-*
diff --git a/debian/patches/series b/debian/patches/series
index 9650677..7dbfea8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 spelling-fixes.patch
 switch-to-free-font.patch
 manual-build.patch
+header-install-dir.patch

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