Set libsubincludedir and fincludedir.

2 files changed, 25 insertions, 10 deletions

diff --git a/build b/build
index c56bebe..f0e2138 100755
--- a/build
+++ b/build
@@ -54,6 +54,8 @@ build: configure
 	oh-autobuild -B gcc-build -T bootstrap-lean -- -j $${JOBS:-1} \
 		libsubdir=/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION) \
 		libexecsubdir=/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION) \
+		libsubincludedir=/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION) \
+		fincludedir=/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION)/finclude \
 		toolexeclibdir=/usr/lib/$(OPK_HOST_ARCH) MULTIOSDIR=
 	touch $@
 
@@ -70,6 +72,8 @@ install: build
 	oh-autoinstall -B gcc-build -T install -- \
 		libsubdir=/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION) \
 		libexecsubdir=/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION) \
+		libsubincludedir=/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION) \
+		fincludedir=/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION)/finclude \
 		toolexeclibdir=/usr/lib/$(OPK_HOST_ARCH) MULTIOSDIR=
 	rm -f dest/usr/lib/$(OPK_HOST_ARCH)/libiberty.a
 
diff --git a/patches/01_pass-some-dirs-to-child-makes.patch b/patches/01_pass-some-dirs-to-child-makes.patch
index 3082994..533ef85 100644
--- a/patches/01_pass-some-dirs-to-child-makes.patch
+++ b/patches/01_pass-some-dirs-to-child-makes.patch
@@ -1,15 +1,17 @@
 Description: Pass some dir paths to child makes
- libsubdir, libexecsubdir, and toolexeclibdir are hardcoded in many makefiles.
- MULTIOSDIR is hardcoded in gcc/Makefile.in.  We want to change these values.
+ libsubdir, libexecsubdir, libsubincludedir, fincludedir, and toolexeclibdir are
+ hardcoded in many makefiles.  MULTIOSDIR is hardcoded in gcc/Makefile.in.  We
+ want to change these values.
 From: "P. J. McDermott" <pjm@nac.net>
 
 diff -Naur src.orig/libmudflap/Makefile.am src/libmudflap/Makefile.am
 --- src.orig/libmudflap/Makefile.am	2009-08-22 09:41:50.000000000 -0400
 +++ src/libmudflap/Makefile.am	2013-04-20 15:19:34.500991568 -0400
-@@ -81,6 +81,7 @@
+@@ -81,6 +81,8 @@
  	"libdir=$(libdir)" \
  	"prefix=$(prefix)" \
  	"includedir=$(includedir)" \
++	"libsubincludedir=$(libsubincludedir)" \
 +	"toolexeclibdir=$(toolexeclibdir)" \
  	"AR=$(AR)" \
  	"AS=$(AS)" \
@@ -17,10 +19,11 @@ diff -Naur src.orig/libmudflap/Makefile.am src/libmudflap/Makefile.am
 diff -Naur src.orig/libmudflap/Makefile.in src/libmudflap/Makefile.in
 --- src.orig/libmudflap/Makefile.in	2010-05-04 14:58:11.000000000 -0400
 +++ src/libmudflap/Makefile.in	2013-04-20 15:19:55.517600152 -0400
-@@ -324,6 +324,7 @@
+@@ -324,6 +324,8 @@
  	"libdir=$(libdir)" \
  	"prefix=$(prefix)" \
  	"includedir=$(includedir)" \
++	"libsubincludedir=$(libsubincludedir)" \
 +	"toolexeclibdir=$(toolexeclibdir)" \
  	"AR=$(AR)" \
  	"AS=$(AS)" \
@@ -28,10 +31,11 @@ diff -Naur src.orig/libmudflap/Makefile.in src/libmudflap/Makefile.in
 diff -Naur src.orig/libquadmath/Makefile.am src/libquadmath/Makefile.am
 --- src.orig/libquadmath/Makefile.am	2011-09-21 10:36:03.000000000 -0400
 +++ src/libquadmath/Makefile.am	2013-04-20 15:26:12.908521625 -0400
-@@ -96,6 +96,7 @@
+@@ -96,6 +96,8 @@
  	"libdir=$(libdir)" \
  	"prefix=$(prefix)" \
  	"includedir=$(includedir)" \
++	"libsubincludedir=$(libsubincludedir)" \
 +	"toolexeclibdir=$(toolexeclibdir)" \
  	"AR=$(AR)" \
  	"AS=$(AS)" \
@@ -39,10 +43,11 @@ diff -Naur src.orig/libquadmath/Makefile.am src/libquadmath/Makefile.am
 diff -Naur src.orig/libquadmath/Makefile.in src/libquadmath/Makefile.in
 --- src.orig/libquadmath/Makefile.in	2011-09-21 10:36:03.000000000 -0400
 +++ src/libquadmath/Makefile.in	2013-04-20 15:27:36.898950596 -0400
-@@ -374,6 +374,7 @@
+@@ -374,6 +374,8 @@
  @BUILD_LIBQUADMATH_TRUE@	"libdir=$(libdir)" \
  @BUILD_LIBQUADMATH_TRUE@	"prefix=$(prefix)" \
  @BUILD_LIBQUADMATH_TRUE@	"includedir=$(includedir)" \
++@BUILD_LIBQUADMATH_TRUE@	"libsubincludedir=$(libsubincludedir)" \
 +@BUILD_LIBQUADMATH_TRUE@	"toolexeclibdir=$(toolexeclibdir)" \
  @BUILD_LIBQUADMATH_TRUE@	"AR=$(AR)" \
  @BUILD_LIBQUADMATH_TRUE@	"AS=$(AS)" \
@@ -50,10 +55,11 @@ diff -Naur src.orig/libquadmath/Makefile.in src/libquadmath/Makefile.in
 diff -Naur src.orig/libssp/Makefile.am src/libssp/Makefile.am
 --- src.orig/libssp/Makefile.am	2010-12-05 19:50:04.000000000 -0500
 +++ src/libssp/Makefile.am	2013-04-20 15:32:51.356039523 -0400
-@@ -92,6 +92,7 @@
+@@ -92,6 +92,8 @@
  	"libdir=$(libdir)" \
  	"prefix=$(prefix)" \
  	"includedir=$(includedir)" \
++	"libsubincludedir=$(libsubincludedir)" \
 +	"toolexeclibdir=$(toolexeclibdir)" \
  	"AR=$(AR)" \
  	"AS=$(AS)" \
@@ -61,10 +67,11 @@ diff -Naur src.orig/libssp/Makefile.am src/libssp/Makefile.am
 diff -Naur src.orig/libssp/Makefile.in src/libssp/Makefile.in
 --- src.orig/libssp/Makefile.in	2011-02-13 06:45:53.000000000 -0500
 +++ src/libssp/Makefile.in	2013-04-20 15:33:02.536362532 -0400
-@@ -312,6 +312,7 @@
+@@ -312,6 +312,8 @@
  	"libdir=$(libdir)" \
  	"prefix=$(prefix)" \
  	"includedir=$(includedir)" \
++	"libsubincludedir=$(libsubincludedir)" \
 +	"toolexeclibdir=$(toolexeclibdir)" \
  	"AR=$(AR)" \
  	"AS=$(AS)" \
@@ -94,12 +101,14 @@ diff -Naur src.orig/libstdc++-v3/Makefile.in src/libstdc++-v3/Makefile.in
 diff -Naur src.orig/Makefile.def src/Makefile.def
 --- src.orig/Makefile.def	2013-04-20 14:46:22.918763972 -0400
 +++ src/Makefile.def	2013-04-21 10:37:16.013678375 -0400
-@@ -199,6 +199,8 @@
+@@ -199,6 +199,12 @@
  flags_to_pass = { flag= tooldir ; };
  flags_to_pass = { flag= build_tooldir ; };
  flags_to_pass = { flag= target_alias ; };
 +flags_to_pass = { flag= libsubdir ; };
 +flags_to_pass = { flag= libexecsubdir ; };
++flags_to_pass = { flag= libsubincludedir ; };
++flags_to_pass = { flag= fincludedir ; };
 +flags_to_pass = { flag= toolexeclibdir ; };
 +flags_to_pass = { flag= MULTIOSDIR ; };
  
@@ -108,12 +117,14 @@ diff -Naur src.orig/Makefile.def src/Makefile.def
 diff -Naur src.orig/Makefile.in src/Makefile.in
 --- src.orig/Makefile.in	2012-08-06 10:34:27.000000000 -0400
 +++ src/Makefile.in	2013-04-21 10:33:31.899390474 -0400
-@@ -721,6 +721,10 @@
+@@ -721,6 +721,12 @@
  	"tooldir=$(tooldir)" \
  	"build_tooldir=$(build_tooldir)" \
  	"target_alias=$(target_alias)" \
 +	"libsubdir=$(libsubdir)" \
 +	"libexecsubdir=$(libexecsubdir)" \
++	"libsubincludedir=$(libsubincludedir)" \
++	"fincludedir=$(fincludedir)" \
 +	"toolexeclibdir=$(toolexeclibdir)" \
 +	"MULTIOSDIR=$(MULTIOSDIR)" \
  	"AWK=$(AWK)" \