diff options
| author |   Chris Larson <chris_larson@mentor.com> | 2011-01-18 12:30:47 -0500 |
|---|---|---|
| committer | Chris Larson <chris_larson@mentor.com> | 2011-01-21 13:39:29 -0500 |
| commit | af1046551ea0f73b8897dd8fb7008bafab66da7b (patch) | |
| tree | d5217763570274770887e4040fcdaa114b8bb060 /recipes/guile | |
| parent | 4880cfd0217466c737c14f5fe7687baa0a01c00d (diff) | |
| download | openembedded-af1046551ea0f73b8897dd8fb7008bafab66da7b.tar.gz | |
guile-native: apply relocation patch
This makes guile-tools find its datadir based upon the location of the script,
rather than the paths replaced by ./configure.
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Diffstat (limited to 'recipes/guile')
| -rw-r--r-- | recipes/guile/guile-native-1.8.7/reloc.patch | 22 | ||||
| -rw-r--r-- | recipes/guile/guile-native_1.8.7.bb | 3 |
2 files changed, 25 insertions, 0 deletions
diff --git a/recipes/guile/guile-native-1.8.7/reloc.patch b/recipes/guile/guile-native-1.8.7/reloc.patch new file mode 100644 index 0000000000..c061743ab7 --- /dev/null +++ b/recipes/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/recipes/guile/guile-native_1.8.7.bb b/recipes/guile/guile-native_1.8.7.bb index aa4fbb0394..f8fd4c7b71 100644 --- a/recipes/guile/guile-native_1.8.7.bb +++ b/recipes/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" |