diff options
-rw-r--r-- | meta/packages/libtool/libtool-cross_2.2.10.bb | 4 | ||||
-rw-r--r-- | meta/packages/libtool/libtool-native_2.2.10.bb | 4 | ||||
-rw-r--r-- | meta/packages/libtool/libtool-nativesdk_2.2.10.bb | 8 | ||||
-rw-r--r-- | meta/packages/libtool/libtool.inc | 7 | ||||
-rw-r--r-- | meta/packages/libtool/libtool/prefix-manpage-fix.patch | 19 | ||||
-rw-r--r-- | meta/packages/libtool/libtool/prefix.patch | 18 |
6 files changed, 33 insertions, 27 deletions
diff --git a/meta/packages/libtool/libtool-cross_2.2.10.bb b/meta/packages/libtool/libtool-cross_2.2.10.bb index cc5604441..a1164c950 100644 --- a/meta/packages/libtool/libtool-cross_2.2.10.bb +++ b/meta/packages/libtool/libtool-cross_2.2.10.bb @@ -2,8 +2,8 @@ require libtool_${PV}.bb PR = "r0" PACKAGES = "" -SRC_URI_append = " file://cross_compile.patch " -SRC_URI_append = " file://prefix.patch " +SRC_URI_append = " file://cross_compile.patch \ + file://prefix.patch " DEPENDS += "libtool-native" diff --git a/meta/packages/libtool/libtool-native_2.2.10.bb b/meta/packages/libtool/libtool-native_2.2.10.bb index ababa93db..f10ea8836 100644 --- a/meta/packages/libtool/libtool-native_2.2.10.bb +++ b/meta/packages/libtool/libtool-native_2.2.10.bb @@ -3,8 +3,8 @@ require libtool_${PV}.bb DEPENDS = "" PR = "r0" -SRC_URI_append = " file://cross_compile.patch " -SRC_URI_append = " file://prefix.patch " +SRC_URI_append = " file://cross_compile.patch \ + file://prefix.patch " inherit native diff --git a/meta/packages/libtool/libtool-nativesdk_2.2.10.bb b/meta/packages/libtool/libtool-nativesdk_2.2.10.bb index db72dd922..c9f24a95b 100644 --- a/meta/packages/libtool/libtool-nativesdk_2.2.10.bb +++ b/meta/packages/libtool/libtool-nativesdk_2.2.10.bb @@ -1,8 +1,8 @@ require libtool_${PV}.bb PR = "r0" -SRC_URI_append = " file://cross_compile.patch" -SRC_URI_append = " file://prefix.patch " +SRC_URI_append = " file://cross_compile.patch \ + file://prefix.patch " inherit nativesdk @@ -16,12 +16,12 @@ do_configure_prepend () { do_install () { autotools_do_install install -d ${D}${bindir}/ - install -m 0755 libtool ${D}${bindir}/ + install -m 0755 ${HOST_SYS}-libtool ${D}${bindir}/ } SYSROOT_PREPROCESS_FUNCS += "libtoolnativesdk_sysroot_preprocess" libtoolnativesdk_sysroot_preprocess () { install -d ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/ - install -m 755 ${D}${bindir}/libtool ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool + install -m 755 ${D}${bindir}/${HOST_SYS}-libtool ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool } diff --git a/meta/packages/libtool/libtool.inc b/meta/packages/libtool/libtool.inc index 4ba60e06f..a14068f27 100644 --- a/meta/packages/libtool/libtool.inc +++ b/meta/packages/libtool/libtool.inc @@ -5,12 +5,11 @@ libraries) behind a consistent interface." HOMEPAGE = "http://www.gnu.org/software/libtool/libtool.html" SECTION = "devel" LICENSE = "GPLv2, LGPLv2.1" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ - file://libltdl/COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06 \ - " +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ + file://libltdl/COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06 " SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ file://trailingslash.patch \ + file://prefix-manpage-fix.patch \ file://dolt.m4 " diff --git a/meta/packages/libtool/libtool/prefix-manpage-fix.patch b/meta/packages/libtool/libtool/prefix-manpage-fix.patch new file mode 100644 index 000000000..47286699f --- /dev/null +++ b/meta/packages/libtool/libtool/prefix-manpage-fix.patch @@ -0,0 +1,19 @@ +For cross environment, it not possible to run the generated executable. +nstead use the build version of libtool to generate the man pages. + +Date: 2010/07/09 +Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> + +Index: libtool-2.2.10/Makefile.am +=================================================================== +--- libtool-2.2.10.orig/Makefile.am ++++ libtool-2.2.10/Makefile.am +@@ -337,7 +337,7 @@ update_mans = \ + PATH=.$(PATH_SEPARATOR)$$PATH; export PATH; \ + $(HELP2MAN) --output=$@ + $(srcdir)/doc/libtool.1: $(srcdir)/$(auxdir)/ltmain.sh +- $(update_mans) --help-option=--help-all libtool ++ $(update_mans) --help-option=--help-all ${build_alias}-libtool + $(srcdir)/doc/libtoolize.1: $(srcdir)/libtoolize.in + $(update_mans) libtoolize + diff --git a/meta/packages/libtool/libtool/prefix.patch b/meta/packages/libtool/libtool/prefix.patch index 895be1f9b..d008608a4 100644 --- a/meta/packages/libtool/libtool/prefix.patch +++ b/meta/packages/libtool/libtool/prefix.patch @@ -1,13 +1,10 @@ Renames "libtool" -> "${TARGET_PREFIX}libtool" which makes sure it can't be confused with the host libtool. +Originally by: RP -After discussions with RP Changed host_alias to build_alias -at one place as it was causing man page building issue while -cross compiling for different architectures. - -Date: 2010/06/28 -Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> +Updated: Date: 2010/06/28 +Nitin A Kamble <nitin.a.kamble@intel.com> Index: libtool-2.2.10/libltdl/m4/libtool.m4 @@ -86,15 +83,6 @@ Index: libtool-2.2.10/Makefile.am $(auxdir)/ltmain.tmp $(m4dir)/ltversion.tmp ## We build ltversion.m4 here, instead of from config.status, -@@ -337,7 +337,7 @@ update_mans = \ - PATH=.$(PATH_SEPARATOR)$$PATH; export PATH; \ - $(HELP2MAN) --output=$@ - $(srcdir)/doc/libtool.1: $(srcdir)/$(auxdir)/ltmain.sh -- $(update_mans) --help-option=--help-all libtool -+ $(update_mans) --help-option=--help-all ${build_alias}-libtool - $(srcdir)/doc/libtoolize.1: $(srcdir)/libtoolize.in - $(update_mans) libtoolize - @@ -523,12 +523,12 @@ TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$ BUILDCHECK_ENVIRONMENT = _lt_pkgdatadir="$(abs_top_srcdir)" \ |