Openembedded Core Discussions
 help / color / mirror / Atom feed
From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: openembedded-core <openembedded-core@lists.openembedded.org>
Subject: [PATCH RFC] gcc-runtime: Hacks for libgfortran with gcc-4.8
Date: Thu, 05 Sep 2013 22:17:23 +0100	[thread overview]
Message-ID: <1378415843.32427.84.camel@ted> (raw)

These are the hacks I needed to make libgfortran build. This is ugly, no
argument from me. We could probably get better results if we patch
configure and libtool to stop doing nasty things. I've probably taken
this as far as I'd want to though, not being a particular fan of
fortran...

Khem: Any thoughts on this?

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc
index 2599760..395623f 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-runtime.inc
@@ -18,6 +18,9 @@ RUNTIMETARGET = "libssp libstdc++-v3 libgomp"
 # libmudflap
 # libgfortran
 
+DEPENDS_append = " chrpath-replacement-native"
+EXTRANATIVEPATH += "chrpath-native"
+
 do_configure () {
 	export CXX="${CXX} -nostdinc++ -nostdlib++"
 	mtarget=`echo ${MULTIMACH_TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##`
@@ -30,6 +33,11 @@ do_configure () {
 		cd ${B}/$target/$d/
 		chmod a+x ${S}/$d/configure
 		${S}/$d/configure ${CONFIGUREOPTS} ${EXTRA_OECONF}
+		# Ugly hack, libgfortran configure looks for ../libquadmath/libquadmath.la 
+		# so we need to compile it before configure
+		if [ "$d" = "libquadmath" ]; then
+			oe_runmake MULTIBUILDTOP=${B}/$target/$d/
+		fi
 	done
 }
 
@@ -38,6 +46,16 @@ do_compile () {
 	for d in libgcc ${RUNTIMETARGET}; do
 		cd ${B}/$target/$d/
 		oe_runmake MULTIBUILDTOP=${B}/$target/$d/
+		if [ "$d" = "libgfortran" ]; then
+			# libtool needs libdir to match the final installation directory which configure
+			# sets from output from this command (e.g. both set to /usr/lib/../lib
+			# It also adds bogus RPATHS which we have to delete
+			fulllibdir=`$CC -print-multi-os-directory`
+			if [ $fulllibdir != "." ]; then
+				sed -i -e "s#relink_command=.*#relink_command=#" ${B}/$target/$d/libgfortran.la
+				chrpath -d `readlink -f ${B}/$target/$d/.libs/libgfortran.so`
+			fi
+		fi
 	done
 }
 





             reply	other threads:[~2013-09-05 21:17 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-05 21:17 Richard Purdie [this message]
2013-09-06  7:08 ` [PATCH RFC] gcc-runtime: Hacks for libgfortran with gcc-4.8 Khem Raj
2013-09-06  9:34   ` Richard Purdie
2013-09-06 16:54     ` Khem Raj
2013-09-06 17:05       ` Richard Purdie
2013-09-06 21:06         ` Khem Raj
2013-09-06 21:09           ` Richard Purdie
2013-09-06 21:18             ` Khem Raj

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1378415843.32427.84.camel@ted \
    --to=richard.purdie@linuxfoundation.org \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox