[oe-commits] org.oe.dev merge of '0e55c1c0e1e6a5361923fc36b9af9f761d3f5b54'

[oe commit]

merge of '0e55c1c0e1e6a5361923fc36b9af9f761d3f5b54'
     and 'c0856cf5b6ece74a7274429e466e6b5c3672ab1d'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: f62bbe8d247ebb4026de300ee7b362e92d101100
ViewMTN: http://monotone.openembedded.org/revision/info/f62bbe8d247ebb4026de300ee7b362e92d101100
Files:
1
packages/gcc/gcc-4.2.2/fortran-libs-rpath-to-staging-hack.patch
packages/gcc/gcc-cross_4.2.2.bb
packages/ncurses/ncurses.inc
packages/ncurses/ncurses_5.3.bb
packages/ncurses/ncurses_5.4.bb
Diffs:

#
# mt diff -r0e55c1c0e1e6a5361923fc36b9af9f761d3f5b54 -rf62bbe8d247ebb4026de300ee7b362e92d101100
#
# 
# 
# add_file "packages/gcc/gcc-4.2.2/fortran-libs-rpath-to-staging-hack.patch"
#  content [96ee0c885c5757fde97f61188ec0c799ae5c7b18]
# 
# patch "packages/gcc/gcc-cross_4.2.2.bb"
#  from [db2829fa431c6b82c542cae426ddc639e77aa4db]
#    to [e477bab4feaed059762204e290267f58403bede7]
# 
============================================================
--- packages/gcc/gcc-4.2.2/fortran-libs-rpath-to-staging-hack.patch	96ee0c885c5757fde97f61188ec0c799ae5c7b18
+++ packages/gcc/gcc-4.2.2/fortran-libs-rpath-to-staging-hack.patch	96ee0c885c5757fde97f61188ec0c799ae5c7b18
@@ -0,0 +1,48 @@
+f951 (fortran) links to MPFR and GMP of our staging area but when executing
+the command the libs can not be found. Use rpath like all the other apps in
+our staging bin/ directory.
+
+Patch the configure to avoid the regeneration...
+
+Index: gcc-4.2.2/configure
+===================================================================
+--- gcc-4.2.2.orig/configure	2008-01-15 23:23:41.000000000 +0100
++++ gcc-4.2.2/configure	2008-01-15 23:25:20.000000000 +0100
+@@ -2278,14 +2278,14 @@
+ 
+ 
+ if test "x$with_mpfr" != x; then
+-  gmplibs="-L$with_mpfr/lib $gmplibs"
++  gmplibs="-Wl,-rpath,$with_mpfr/lib -L$with_mpfr/lib $gmplibs"
+   gmpinc="-I$with_mpfr/include"
+ fi
+ if test "x$with_mpfr_include" != x; then
+   gmpinc="-I$with_mpfr_include"
+ fi
+ if test "x$with_mpfr_lib" != x; then
+-  gmplibs="-L$with_mpfr_lib $gmplibs"
++  gmplibs="-Wl,-rpath,$with_mpfr_lib -L$with_mpfr_lib $gmplibs"
+ fi
+ 
+ # Specify a location for gmp
+Index: gcc-4.2.2/configure.in
+===================================================================
+--- gcc-4.2.2.orig/configure.in	2008-01-15 23:23:41.000000000 +0100
++++ gcc-4.2.2/configure.in	2008-01-15 23:24:36.000000000 +0100
+@@ -1066,14 +1066,14 @@
+ AC_ARG_WITH(mpfr_lib, [  --with-mpfr-lib=PATH    Specify the directory for the installed MPFR library])
+ 
+ if test "x$with_mpfr" != x; then
+-  gmplibs="-L$with_mpfr/lib $gmplibs"
++  gmplibs="-Wl,-rpath,$with_mpfr/lib -L$with_mpfr/lib $gmplibs"
+   gmpinc="-I$with_mpfr/include"
+ fi
+ if test "x$with_mpfr_include" != x; then
+   gmpinc="-I$with_mpfr_include"
+ fi
+ if test "x$with_mpfr_lib" != x; then
+-  gmplibs="-L$with_mpfr_lib $gmplibs"
++  gmplibs="-Wl,-rpath,$with_mpfr_lib -L$with_mpfr_lib $gmplibs"
+ fi
+ 
+ # Specify a location for gmp
============================================================
--- packages/gcc/gcc-cross_4.2.2.bb	db2829fa431c6b82c542cae426ddc639e77aa4db
+++ packages/gcc/gcc-cross_4.2.2.bb	e477bab4feaed059762204e290267f58403bede7
@@ -15,6 +15,7 @@ SRC_URI_append_fail-fast = " file://zeck
 # cross packaging
 require gcc-package-cross.inc
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
+SRC_URI_append = " file://fortran-libs-rpath-to-staging-hack.patch;patch=1 "
 # Do not build libssp libmudflap and libgomp
 # We might need them for some beefy targets 
 EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \


#
# mt diff -rc0856cf5b6ece74a7274429e466e6b5c3672ab1d -rf62bbe8d247ebb4026de300ee7b362e92d101100
#
# 
# 
# patch "packages/ncurses/ncurses.inc"
#  from [596e850f8a0d008dfb954fd473225fe0d33c8b81]
#    to [2be0776267994e0ee952b0f848192aeb2bea1cd3]
# 
# patch "packages/ncurses/ncurses_5.3.bb"
#  from [14508c719340e8abe5ecf6248de70aeb7ac036b3]
#    to [052fb93e19e1b24e9e78a03584a0bbb70ff3d822]
# 
# patch "packages/ncurses/ncurses_5.4.bb"
#  from [a2950eea2cdd28c32834e38f248e4bae8471d9c1]
#    to [d7a699b05dcac9fa77a97c45d770d8d95b25c805]
# 
============================================================
--- packages/ncurses/ncurses.inc	596e850f8a0d008dfb954fd473225fe0d33c8b81
+++ packages/ncurses/ncurses.inc	2be0776267994e0ee952b0f848192aeb2bea1cd3
@@ -5,7 +5,6 @@ RPROVIDES = "libncurses5"
 DEPENDS = "ncurses-native"
 RSUGGESTS_${PN} = "ncurses-terminfo"
 RPROVIDES = "libncurses5"
-PR = "r1"
 
 inherit autotools
 
@@ -88,4 +87,4 @@ FILES_ncurses-terminfo = "${datadir}/ter
 # clear/reset are in already busybox
 FILES_ncurses-tools = "${bindir}/tic ${bindir}/toe ${bindir}/infotocap ${bindir}/captoinfo ${bindir}/infocmp ${bindir}/clear.${PN} ${bindir}/reset.${PN} ${bindir}/tack "
 FILES_ncurses-terminfo = "${datadir}/terminfo"
+FILES_${PN} = "${bindir}/tput ${bindir}/tset ${libdir}/lib*.so.* §{datadir}/tabset ${sysconfdir}/terminfo"
-FILES_${PN} = "${bindir}/tput ${bindir}/tset ${libdir}/lib*.so.* §{datadir}/tabset ${sysconfdir/terminfo}"
============================================================
--- packages/ncurses/ncurses_5.3.bb	14508c719340e8abe5ecf6248de70aeb7ac036b3
+++ packages/ncurses/ncurses_5.3.bb	052fb93e19e1b24e9e78a03584a0bbb70ff3d822
@@ -1,7 +1,7 @@ PV = "${BaseV}.${SnapV}"
 BaseV := "${PV}"
 SnapV := "20030906"
 PV = "${BaseV}.${SnapV}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${BaseV}.tar.gz \
 	   file://${SnapV}.patch;patch=1 \
============================================================
--- packages/ncurses/ncurses_5.4.bb	a2950eea2cdd28c32834e38f248e4bae8471d9c1
+++ packages/ncurses/ncurses_5.4.bb	d7a699b05dcac9fa77a97c45d770d8d95b25c805
@@ -1,4 +1,4 @@
-PR = "r10"
+PR = "r11"
 
 SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \
 	   file://visibility.patch;patch=1"