On Aug 24, 2012, at 7:12 AM, Richard Purdie <[email protected]> wrote:
> This avoids problems with libstdc++ having bad rpaths (/usr/lib/../.lib) > in its .la file. See the patch for more information. > > Signed-off-by: Richard Purdie <[email protected]> > --- > diff --git a/meta/recipes-devtools/gcc/gcc-4.7.inc > b/meta/recipes-devtools/gcc/gcc-4.7.inc > index 36ce1be..84c230c 100644 > --- a/meta/recipes-devtools/gcc/gcc-4.7.inc > +++ b/meta/recipes-devtools/gcc/gcc-4.7.inc > @@ -1,6 +1,6 @@ > require gcc-common.inc > > -PR = "r10" > +PR = "r11" > > # Third digit in PV should be incremented after a minor release > # happens from this branch on gcc e.g. currently its 4.7.1 > @@ -74,6 +74,7 @@ SRC_URI = > "git://github.com/mirrors/gcc.git;branch=${BRANCH};protocol=git \ > file://gcc-argument-list-too-long.patch \ > file://fix-g++-sysroot.patch \ > file://disablesdt.patch \ > + file://libtool.patch \ > " > > S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/git" > diff --git a/meta/recipes-devtools/gcc/gcc-4.7/libtool.patch > b/meta/recipes-devtools/gcc/gcc-4.7/libtool.patch > new file mode 100644 > index 0000000..9580b23 > --- a/dev/null > +++ b/meta/recipes-devtools/gcc/gcc-4.7/libtool.patch > @@ -0,0 +1,29 @@ > +libstdc++ from gcc-runtime gets created with -rpath=/usr/lib/../lib for > qemux86-64 > +when running on am x86_64 build host. > + > +This patch stops this speading to libdir in the libstdc++.la file within > libtool. > +Aguably, it shouldn't be passing this into libtool in the first place but > +for now this resolves the nastiest problems this causes. > + > +func_normal_abspath would resolve an empty path to `pwd` so we need > +to filter the zero case. > + > +RP 2012/8/24 > + > +Upstream-Status: Pending > + > +Index: git/ltmain.sh > +=================================================================== > +--- git.orig/ltmain.sh 2012-08-24 11:45:58.597087961 +0000 > ++++ git/ltmain.sh 2012-08-24 12:18:37.961042581 +0000 > +@@ -6359,6 +6359,10 @@ > + func_warning "ignoring multiple \`-rpath's for a libtool library" > + > + install_libdir="$1" > ++ if test -n "$install_libdir"; then > ++ func_normal_abspath "$install_libdir" > ++ install_libdir=$func_normal_abspath_result > ++ fi > + this looks ok to me. Did we post the libtool patch upstream ? > + oldlibs= > + if test -z "$rpath"; then > > > > _______________________________________________ > Openembedded-core mailing list > [email protected] > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core _______________________________________________ Openembedded-core mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
