libtool-cross: Unbreak and actually use more of it
We should be using libtool-cross for cross compiling but were not. This patch sets datadir so libtoolize ends up containing correct paths. It then installs libtoolize. The path ltmain.sh was installed to was incorrect and this is fixed. We also now install all the libtool m4 macros and config files. (From OE-Core rev: d52bdbee35bb6edc55eed613f869e46d0c0a2f31) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
0b640a419c
commit
5c64734012
|
@ -4,6 +4,8 @@ PR = "r4"
|
|||
PACKAGES = ""
|
||||
SRC_URI += "file://prefix.patch"
|
||||
|
||||
datadir = "${STAGING_DIR_TARGET}${target_datadir}"
|
||||
|
||||
do_configure_prepend () {
|
||||
# Remove any existing libtool m4 since old stale versions would break
|
||||
# any upgrade
|
||||
|
@ -12,20 +14,22 @@ do_configure_prepend () {
|
|||
}
|
||||
|
||||
do_install () {
|
||||
install -d ${D}${bindir}/
|
||||
install -m 0755 ${HOST_SYS}-libtool ${D}${bindir}/${HOST_SYS}-libtool
|
||||
install -d ${D}${datadir}/libtool/
|
||||
install -d ${D}${datadir}/aclocal/
|
||||
install -c ${S}/libltdl/config/config.guess ${D}${datadir}/libtool/
|
||||
install -c ${S}/libltdl/config/config.sub ${D}${datadir}/libtool/
|
||||
install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${D}${datadir}/libtool/
|
||||
install -c -m 0644 ${S}/libltdl/m4/libtool.m4 ${D}${datadir}/aclocal/
|
||||
install -c -m 0644 ${S}/libltdl/m4/ltdl.m4 ${D}${datadir}/aclocal/
|
||||
install -d ${D}${bindir_crossscripts}/
|
||||
install -m 0755 ${HOST_SYS}-libtool ${D}${bindir_crossscripts}/${HOST_SYS}-libtool
|
||||
install -d ${D}${bindir_crossscripts}/
|
||||
install -m 0755 libtoolize ${D}${bindir_crossscripts}/
|
||||
install -d ${D}${target_datadir}/libtool/config/
|
||||
install -d ${D}${target_datadir}/aclocal/
|
||||
install -c ${S}/libltdl/config/config.guess ${D}${target_datadir}/libtool/config/
|
||||
install -c ${S}/libltdl/config/config.sub ${D}${target_datadir}/libtool/config/
|
||||
install -c ${S}/libltdl/config/install-sh ${D}${target_datadir}/libtool/config/
|
||||
install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${D}${target_datadir}/libtool/config/
|
||||
install -c -m 0644 ${S}/libltdl/m4/*.m4 ${D}${target_datadir}/aclocal/
|
||||
}
|
||||
|
||||
SYSROOT_PREPROCESS_FUNCS += "libtoolcross_sysroot_preprocess"
|
||||
|
||||
libtoolcross_sysroot_preprocess () {
|
||||
install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}
|
||||
install -m 755 ${D}${bindir}/${HOST_SYS}-libtool ${SYSROOT_DESTDIR}${bindir_crossscripts}/${HOST_SYS}-libtool
|
||||
sysroot_stage_dir ${D}${bindir_crossscripts} ${SYSROOT_DESTDIR}${bindir_crossscripts}
|
||||
sysroot_stage_dir ${D}${target_datadir} ${SYSROOT_DESTDIR}${target_datadir}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue