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/recipes-support | |
parent | 42fabd7d8c5cafe7045c853073d40d7545c324b9 (diff) | |
download | meta-openembedded-073805a1cd1794d95c9dacea4e9c5be366530798.tar.gz |
guile-native: sync with meta-shr
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-support')
-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 c59798d9e..c59798d9e 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 3e48932a3..3e48932a3 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 000000000..c061743ab --- /dev/null +++ b/meta-oe/recipes-support/guile/guile-native-1.8.7/reloc.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | --- guile-1.8.7.orig/guile-tools.in | ||
2 | +++ guile-1.8.7/guile-tools.in | ||
3 | @@ -42,14 +42,15 @@ Default scripts dir: $default_scriptsdir | ||
4 | EOF | ||
5 | } | ||
6 | |||
7 | -prefix="@prefix@" | ||
8 | -datarootdir="@datarootdir@" | ||
9 | -pkgdatadir="@datadir@/@PACKAGE@" | ||
10 | +bindir=`dirname $0` | ||
11 | +bindir=`cd $bindir && pwd` | ||
12 | +prefix=`dirname $bindir` | ||
13 | +datarootdir=${prefix}/share | ||
14 | +pkgdatadir=${prefix}/share/guile | ||
15 | guileversion="@GUILE_EFFECTIVE_VERSION@" | ||
16 | default_scriptsdir=$pkgdatadir/$guileversion/scripts | ||
17 | |||
18 | # pre-install invocation frob | ||
19 | -mydir=`dirname $0` | ||
20 | if [ -d "$mydir/scripts" -a -f "$mydir/scripts/Makefile.am" ] ; then | ||
21 | default_scriptsdir=`(cd $mydir/scripts ; pwd)` | ||
22 | 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 aa4fbb039..f8fd4c7b7 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 @@ | |||
1 | require guile-native.inc | 1 | require guile-native.inc |
2 | |||
3 | PR = "r1" | ||
2 | SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \ | 4 | SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \ |
3 | file://configure-fix.patch \ | 5 | file://configure-fix.patch \ |
4 | file://cpp-linemarkers.patch \ | 6 | file://cpp-linemarkers.patch \ |
7 | file://reloc.patch \ | ||
5 | " | 8 | " |
6 | 9 | ||
7 | SRC_URI[md5sum] = "991b5b3efcbbc3f7507d05bc42f80a5e" | 10 | SRC_URI[md5sum] = "991b5b3efcbbc3f7507d05bc42f80a5e" |