[patch] includes.patch

includes.patch (text/plain), 972 bytes, created by Benda Xu on 2013-07-28 05:44:55 UTC

Index: tauon/toolchain.eclass
===================================================================
--- tauon.orig/toolchain.eclass	2013-07-28 14:27:59.505907346 +0900
+++ tauon/toolchain.eclass	2013-07-28 14:27:59.525907450 +0900
@@ -1565,6 +1565,8 @@
 	cd "${WORKDIR}"/build
 
 	# Do allow symlinks in private gcc include dir as this can break the build
+	# Keep them in prefix for things like 'machine->ia64' #gcc PR26189
+	use prefix ||
 	find gcc/include*/ -type l -delete
 
 	# Copy over the info pages.  We disabled their generation earlier, but the
@@ -1578,10 +1580,10 @@
 	done
 
 	# Remove generated headers, as they can cause things to break
-	# (ncurses, openssl, etc).
+	# (ncurses, openssl, etc), unless when in a prefix.
 	while read x ; do
 		grep -q 'It has been auto-edited by fixincludes from' "${x}" \
-			&& rm -f "${x}"
+			&& use !prefix && rm -f "${x}"
 	done < <(find gcc/include*/ -name '*.h')
 
 	# Do the 'make install' from the build directory