diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-03 14:24:58 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-03 14:29:56 +0000 |
| commit | e48c06264f183c3d611a20a45914e9eeaa8f3736 (patch) | |
| tree | 79d0aa1b433b360ce89d5f63113104a060fcd1bf /meta | |
| parent | 787ffc5e12f1639aa5e0917bb23deced53a0478e (diff) | |
| download | openembedded-core-contrib-e48c06264f183c3d611a20a45914e9eeaa8f3736.tar.gz | |
libtool: Fix tools path issues
If for example you build on a machine with /bin/grep, then restore that sstate
onto a machine with /usr/bin/grep, things will fail. Simply don't bother
hardcoding paths.
This was lost during the libtool upgrade:
http://git.yoctoproject.org/cgit.cgi/poky/diff/meta/recipes-devtools/libtool/libtool/avoid_absolute_paths_for_general_utils.patch?id=d4e1862453b2a4c12400de0f43f08a9871a4de60
since the path to the files changed. This restores the previous behaviour.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-devtools/libtool/libtool-2.4.5.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-devtools/libtool/libtool/nohardcodepaths.patch | 27 |
2 files changed, 28 insertions, 0 deletions
diff --git a/meta/recipes-devtools/libtool/libtool-2.4.5.inc b/meta/recipes-devtools/libtool/libtool-2.4.5.inc index 603dc52595..5b222504af 100644 --- a/meta/recipes-devtools/libtool/libtool-2.4.5.inc +++ b/meta/recipes-devtools/libtool/libtool-2.4.5.inc @@ -17,6 +17,7 @@ SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ file://norm-rpath.patch \ file://dont-depend-on-help2man.patch \ file://fix-resolve-lt-sysroot.patch \ + file://nohardcodepaths.patch \ " SRC_URI[md5sum] = "7d30ed9fa6bb11270ebb31639a37bd54" diff --git a/meta/recipes-devtools/libtool/libtool/nohardcodepaths.patch b/meta/recipes-devtools/libtool/libtool/nohardcodepaths.patch new file mode 100644 index 0000000000..b2239fbade --- /dev/null +++ b/meta/recipes-devtools/libtool/libtool/nohardcodepaths.patch @@ -0,0 +1,27 @@ +If for example you build on a machine with /bin/grep, then restore that sstate +onto a machine with /usr/bin/grep, things will fail. Simply don't bother +hardcoding paths. + +RP 2015/2/3 + +Index: libtool-2.4.5/libtoolize.in +=================================================================== +--- libtool-2.4.5.orig/libtoolize.in ++++ libtool-2.4.5/libtoolize.in +@@ -40,11 +40,11 @@ + + : ${AUTOCONF="autoconf"} + : ${AUTOMAKE="automake"} +-: ${EGREP="@EGREP@"} +-: ${FGREP="@FGREP@"} +-: ${GREP="@GREP@"} +-: ${LN_S="@LN_S@"} +-: ${SED="@SED@"} ++: ${EGREP="egrep"} ++: ${FGREP="fgrep"} ++: ${GREP="grep"} ++: ${LN_S="ln -s"} ++: ${SED="sed"} + + + ## -------------------------- ## |