diff options
| author |   Koen Kooi <koen@dominion.thruhere.net> | 2011-03-23 16:24:55 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-03-23 16:25:29 +0100 |
| commit | 073805a1cd1794d95c9dacea4e9c5be366530798 (patch) | |
| tree | ba25a676fc0245ce73d14b9692d6caa59f57da11 /meta-oe | |
| parent | 42fabd7d8c5cafe7045c853073d40d7545c324b9 (diff) | |
| download | meta-openembedded-contrib-073805a1cd1794d95c9dacea4e9c5be366530798.tar.gz | |
guile-native: sync with meta-shr
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/recipes-support/guile/guile-native-1.8.7/configure-fix.patch (renamed from meta-oe/recipes-support/guile/files/configure-fix.patch) | 0 | ||||
| -rw-r--r-- | meta-oe/recipes-support/guile/guile-native-1.8.7/cpp-linemarkers.patch (renamed from meta-oe/recipes-support/guile/files/cpp-linemarkers.patch) | 0 | ||||
| -rw-r--r-- | meta-oe/recipes-support/guile/guile-native-1.8.7/reloc.patch | 22 | ||||
| -rw-r--r-- | meta-oe/recipes-support/guile/guile-native_1.8.7.bb | 3 |
4 files changed, 25 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/guile/files/configure-fix.patch b/meta-oe/recipes-support/guile/guile-native-1.8.7/configure-fix.patch index c59798d9e9..c59798d9e9 100644 --- a/meta-oe/recipes-support/guile/files/configure-fix.patch +++ b/meta-oe/recipes-support/guile/guile-native-1.8.7/configure-fix.patch diff --git a/meta-oe/recipes-support/guile/files/cpp-linemarkers.patch b/meta-oe/recipes-support/guile/guile-native-1.8.7/cpp-linemarkers.patch index 3e48932a3c..3e48932a3c 100644 --- a/meta-oe/recipes-support/guile/files/cpp-linemarkers.patch +++ b/meta-oe/recipes-support/guile/guile-native-1.8.7/cpp-linemarkers.patch diff --git a/meta-oe/recipes-support/guile/guile-native-1.8.7/reloc.patch b/meta-oe/recipes-support/guile/guile-native-1.8.7/reloc.patch new file mode 100644 index 0000000000..c061743ab7 --- /dev/null +++ b/meta-oe/recipes-support/guile/guile-native-1.8.7/reloc.patch @@ -0,0 +1,22 @@ +--- guile-1.8.7.orig/guile-tools.in ++++ guile-1.8.7/guile-tools.in +@@ -42,14 +42,15 @@ Default scripts dir: $default_scriptsdir + EOF + } + +-prefix="@prefix@" +-datarootdir="@datarootdir@" +-pkgdatadir="@datadir@/@PACKAGE@" ++bindir=`dirname $0` ++bindir=`cd $bindir && pwd` ++prefix=`dirname $bindir` ++datarootdir=${prefix}/share ++pkgdatadir=${prefix}/share/guile + guileversion="@GUILE_EFFECTIVE_VERSION@" + default_scriptsdir=$pkgdatadir/$guileversion/scripts + + # pre-install invocation frob +-mydir=`dirname $0` + if [ -d "$mydir/scripts" -a -f "$mydir/scripts/Makefile.am" ] ; then + default_scriptsdir=`(cd $mydir/scripts ; pwd)` + fi diff --git a/meta-oe/recipes-support/guile/guile-native_1.8.7.bb b/meta-oe/recipes-support/guile/guile-native_1.8.7.bb index aa4fbb0394..f8fd4c7b71 100644 --- a/meta-oe/recipes-support/guile/guile-native_1.8.7.bb +++ b/meta-oe/recipes-support/guile/guile-native_1.8.7.bb @@ -1,7 +1,10 @@ require guile-native.inc + +PR = "r1" SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \ file://configure-fix.patch \ file://cpp-linemarkers.patch \ + file://reloc.patch \ " SRC_URI[md5sum] = "991b5b3efcbbc3f7507d05bc42f80a5e" |