From 6e77124fda10bab838c13b0ee174b3721cda75e7 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pjm@nac.net>
Date: Sat, 20 Apr 2013 17:56:53 -0400
Subject: Set toolexeclibdir and MULTIOSDIR.
---
diff --git a/build b/build
index 2431af3..5831920 100755
--- a/build
+++ b/build
@@ -63,7 +63,9 @@ install: build
# * GNU Make executes any commands that contain "$(MAKE)", even if -n
# is specified.
# See also: <http://gcc.gnu.org/ml/gcc/2013-04/msg00171.html>.
- oh-autoinstall -B gcc-build -T install
+ # TODO: Replace $(OPK_HOST_ARCH) with the target arch.
+ oh-autoinstall -B gcc-build -T install -- \
+ toolexeclibdir=/usr/lib/$(OPK_HOST_ARCH) MULTIOSDIR=
# POSIX.1-2008:
# If the pathname does not begin with a '/' it shall be treated as relative to
diff --git a/patches/01_pass-some-dirs-to-child-makes.patch b/patches/01_pass-some-dirs-to-child-makes.patch
new file mode 100644
index 0000000..4c629fc
--- /dev/null
+++ b/patches/01_pass-some-dirs-to-child-makes.patch
@@ -0,0 +1,117 @@
+Description: Pass some dir paths to child makes
+ toolexeclibdir is hardcoded in many makefiles, and 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 @@
+ "libdir=$(libdir)" \
+ "prefix=$(prefix)" \
+ "includedir=$(includedir)" \
++ "toolexeclibdir=$(toolexeclibdir)" \
+ "AR=$(AR)" \
+ "AS=$(AS)" \
+ "CC=$(CC)" \
+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 @@
+ "libdir=$(libdir)" \
+ "prefix=$(prefix)" \
+ "includedir=$(includedir)" \
++ "toolexeclibdir=$(toolexeclibdir)" \
+ "AR=$(AR)" \
+ "AS=$(AS)" \
+ "CC=$(CC)" \
+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 @@
+ "libdir=$(libdir)" \
+ "prefix=$(prefix)" \
+ "includedir=$(includedir)" \
++ "toolexeclibdir=$(toolexeclibdir)" \
+ "AR=$(AR)" \
+ "AS=$(AS)" \
+ "CC=$(CC)" \
+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 @@
+ @BUILD_LIBQUADMATH_TRUE@ "libdir=$(libdir)" \
+ @BUILD_LIBQUADMATH_TRUE@ "prefix=$(prefix)" \
+ @BUILD_LIBQUADMATH_TRUE@ "includedir=$(includedir)" \
++@BUILD_LIBQUADMATH_TRUE@ "toolexeclibdir=$(toolexeclibdir)" \
+ @BUILD_LIBQUADMATH_TRUE@ "AR=$(AR)" \
+ @BUILD_LIBQUADMATH_TRUE@ "AS=$(AS)" \
+ @BUILD_LIBQUADMATH_TRUE@ "CC=$(CC)" \
+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 @@
+ "libdir=$(libdir)" \
+ "prefix=$(prefix)" \
+ "includedir=$(includedir)" \
++ "toolexeclibdir=$(toolexeclibdir)" \
+ "AR=$(AR)" \
+ "AS=$(AS)" \
+ "CC=$(CC)" \
+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 @@
+ "libdir=$(libdir)" \
+ "prefix=$(prefix)" \
+ "includedir=$(includedir)" \
++ "toolexeclibdir=$(toolexeclibdir)" \
+ "AR=$(AR)" \
+ "AS=$(AS)" \
+ "CC=$(CC)" \
+diff -Naur src.orig/libstdc++-v3/Makefile.am src/libstdc++-v3/Makefile.am
+--- src.orig/libstdc++-v3/Makefile.am 2012-01-23 18:12:01.000000000 -0500
++++ src/libstdc++-v3/Makefile.am 2013-04-20 15:35:56.177410624 -0400
+@@ -163,6 +163,7 @@
+ "prefix=$(prefix)" \
+ "tooldir=$(tooldir)" \
+ "gxx_include_dir=$(gxx_include_dir)" \
++ "toolexeclibdir=$(toolexeclibdir)" \
+ "AR=$(AR)" \
+ "AS=$(AS)" \
+ "LD=$(LD)" \
+diff -Naur src.orig/libstdc++-v3/Makefile.in src/libstdc++-v3/Makefile.in
+--- src.orig/libstdc++-v3/Makefile.in 2012-02-17 15:26:32.000000000 -0500
++++ src/libstdc++-v3/Makefile.in 2013-04-20 15:36:11.077844405 -0400
+@@ -362,6 +362,7 @@
+ "prefix=$(prefix)" \
+ "tooldir=$(tooldir)" \
+ "gxx_include_dir=$(gxx_include_dir)" \
++ "toolexeclibdir=$(toolexeclibdir)" \
+ "AR=$(AR)" \
+ "AS=$(AS)" \
+ "LD=$(LD)" \
+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-20 17:04:58.238791783 -0400
+@@ -199,6 +199,8 @@
+ flags_to_pass = { flag= tooldir ; };
+ flags_to_pass = { flag= build_tooldir ; };
+ flags_to_pass = { flag= target_alias ; };
++flags_to_pass = { flag= toolexeclibdir ; };
++flags_to_pass = { flag= MULTIOSDIR ; };
+
+ // Build tools
+ flags_to_pass = { flag= AWK ; };
+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-20 17:02:07.889802316 -0400
+@@ -721,6 +721,8 @@
+ "tooldir=$(tooldir)" \
+ "build_tooldir=$(build_tooldir)" \
+ "target_alias=$(target_alias)" \
++ "toolexeclibdir=$(toolexeclibdir)" \
++ "MULTIOSDIR=$(MULTIOSDIR)" \
+ "AWK=$(AWK)" \
+ "BISON=$(BISON)" \
+ "CC_FOR_BUILD=$(CC_FOR_BUILD)" \
--
cgit v0.9.1