From 5af6b24478fa6ddc683628609b670d078961725d Mon Sep 17 00:00:00 2001
From: Willer Moreira <willer.moreira@openbossa.org>
Date: Tue, 2 Feb 2010 15:40:20 -0400
Subject: [PATCH 091/118] gcc-package-noemu: adding mamona modifications

Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@openbossa.org>
Signed-off-by: Willer Moreira <willer.moreira@openbossa.org>
---
 recipes/mamona/gcc-package-noemu.inc |   66 +++++++++++++++++++++-------------
 1 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/recipes/mamona/gcc-package-noemu.inc b/recipes/mamona/gcc-package-noemu.inc
index 3288e60..dd439c3 100644
--- a/recipes/mamona/gcc-package-noemu.inc
+++ b/recipes/mamona/gcc-package-noemu.inc
@@ -5,27 +5,35 @@ PACKAGES = "${PN} ${PN}-symlinks \
             g++-noemu g++-noemu-symlinks \
 	    cpp-noemu cpp-noemu-symlinks"
 
-FILES_${PN} = "${bindir}/${TARGET_PREFIX}gcc \
-	       ${bindir}/${TARGET_PREFIX}gccbug \
-	       ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1 \
-	       ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2 \
-	       ${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \
-	       ${gcclibdir}/${TARGET_SYS}/${BINV}/specs \
-	       ${gcclibdir}/${TARGET_SYS}/${BINV}/lib* \
-	       ${gcclibdir}/${TARGET_SYS}/${BINV}/include \
-	       ${libdir}/gcc/${TARGET_SYS}/${BINV}/libgcc_s.so"
-FILES_${PN}-symlinks = "${bindir}/cc \
-			${bindir}/gcc \
-			${bindir}/gccbug"
-
-FILES_cpp-noemu = "${bindir}/${TARGET_PREFIX}cpp \
-	     ${base_libdir}/cpp"
+FILES_${PN} = "\
+  ${bindir}/${TARGET_PREFIX}gcc \
+  ${bindir}/${TARGET_PREFIX}gccbug \
+  ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2 \
+  ${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \
+  ${gcclibdir}/${TARGET_SYS}/${BINV}/specs \
+  ${gcclibdir}/${TARGET_SYS}/${BINV}/lib* \
+  ${gcclibdir}/${TARGET_SYS}/${BINV}/include* \
+"
+FILES_${PN}-symlinks = "\
+  ${bindir}/cc \
+  ${bindir}/gcc \
+  ${bindir}/gccbug \
+"
+
+FILES_cpp-noemu = "\
+  ${bindir}/${TARGET_PREFIX}cpp \
+  ${base_libdir}/cpp \
+  ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1"
 FILES_cpp-noemu-symlinks = "${bindir}/cpp"
 
-FILES_g++-noemu = "${bindir}/${TARGET_PREFIX}g++ \
-		   ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus"
-FILES_g++-noemu-symlinks = "${bindir}/c++ \
-			    ${bindir}/g++"
+FILES_g++-noemu = "\
+  ${bindir}/${TARGET_PREFIX}g++ \
+  ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus \
+"
+FILES_g++-noemu-symlinks = "\
+  ${bindir}/c++ \
+  ${bindir}/g++ \
+"
 
 do_install () {
 	autotools_do_install
@@ -37,11 +45,14 @@ do_install () {
 	# Hack around specs file assumptions
 	test -f ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/specs && sed -i -e '/^*cross_compile:$/ { n; s/1/0/; }' ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/specs
 
-	# Using --with-slibdir instead of this hack below..
 	# Move libgcc_s into /lib
-	#mkdir -p ${D}${base_libdir}
-	#mv ${D}${libdir}/libgcc_s.so.* ${D}${base_libdir}
-	rm -f ${D}${libdir}/libgcc_s.so
+	mkdir -p ${D}${base_libdir}
+	if [ -f ${D}${libdir}/nof/libgcc_s.so ]; then
+		mv ${D}${libdir}/nof/libgcc_s.so.* ${D}${base_libdir}
+	else
+		mv ${D}${libdir}/libgcc_s.so.* ${D}${base_libdir} || true
+	fi
+	rm -f ${D}${libdir}/libgcc_s.so || true 
 	ln -sf `echo ${libdir}/gcc/${TARGET_SYS}/${BINV} \
 		| tr -s / \
 		| sed -e 's,^/,,' -e 's,[^/]*,..,g'`/lib/libgcc_s.so.1 \
@@ -68,12 +79,17 @@ do_install () {
 	rm -f ${TARGET_ARCH}-*${TARGET_ARCH}-*
 
 	# Symlinks so we can use these trivially on the target
-#	ln -sf ${TARGET_SYS}-g77 g77
+	ln -sf ${TARGET_SYS}-g77 g77 || true
+	ln -sf ${TARGET_SYS}-gfortran gfortran || true
 	ln -sf ${TARGET_SYS}-g++ g++
 	ln -sf ${TARGET_SYS}-gcc gcc
-#	ln -sf g77 f77
+	ln -sf g77 f77 || true
+	ln -sf gfortran f95 || true
 	ln -sf g++ c++
 	ln -sf gcc cc
 	ln -sf ${bindir}/${TARGET_SYS}-cpp ${D}${base_libdir}/cpp
 	ln -sf ${bindir}/${TARGET_SYS}-cpp ${D}${bindir}/cpp
+
+	# Remove precompiled c++ headers as they are really big
+	rm -rf ${D}${includedir}/c++/${BINV}/${TARGET_SYS}/bits/*.gch
 }
-- 
1.6.3.3