mirror of
https://git.yoctoproject.org/poky
synced 2026-09-14 03:49:32 +02:00
Various libs: Convert to use STAGING_BINDIR_CROSS
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1038 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
@@ -17,7 +17,7 @@ EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities"
|
|||||||
do_stage() {
|
do_stage() {
|
||||||
oe_libinstall -so -C src libgcrypt ${STAGING_LIBDIR}
|
oe_libinstall -so -C src libgcrypt ${STAGING_LIBDIR}
|
||||||
oe_libinstall -so -C src libgcrypt-pthread ${STAGING_LIBDIR}
|
oe_libinstall -so -C src libgcrypt-pthread ${STAGING_LIBDIR}
|
||||||
install -m 0755 src/libgcrypt-config ${STAGING_BINDIR}/
|
install -m 0755 src/libgcrypt-config ${STAGING_BINDIR_CROSS}/
|
||||||
|
|
||||||
install -d ${STAGING_INCDIR}/
|
install -d ${STAGING_INCDIR}/
|
||||||
for X in gcrypt.h gcrypt-module.h
|
for X in gcrypt.h gcrypt-module.h
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities"
|
|||||||
do_stage() {
|
do_stage() {
|
||||||
oe_libinstall -so -C src libgcrypt ${STAGING_LIBDIR}
|
oe_libinstall -so -C src libgcrypt ${STAGING_LIBDIR}
|
||||||
oe_libinstall -so -C src libgcrypt-pthread ${STAGING_LIBDIR}
|
oe_libinstall -so -C src libgcrypt-pthread ${STAGING_LIBDIR}
|
||||||
install -m 0755 src/libgcrypt-config ${STAGING_BINDIR}/
|
install -m 0755 src/libgcrypt-config ${STAGING_BINDIR_CROSS}/
|
||||||
|
|
||||||
install -d ${STAGING_INCDIR}/
|
install -d ${STAGING_INCDIR}/
|
||||||
for X in gcrypt.h gcrypt-module.h
|
for X in gcrypt.h gcrypt-module.h
|
||||||
|
|||||||
@@ -23,6 +23,10 @@ do_stage() {
|
|||||||
|
|
||||||
cp ${STAGING_BINDIR}/libIDL-config-2 ${STAGING_BINDIR}/libIDL-config-2.orig
|
cp ${STAGING_BINDIR}/libIDL-config-2 ${STAGING_BINDIR}/libIDL-config-2.orig
|
||||||
cat ${STAGING_BINDIR}/libIDL-config-2.orig | sed -e 's:${includedir}:${STAGING_INCDIR}:' > ${STAGING_BINDIR}/libIDL-config-2
|
cat ${STAGING_BINDIR}/libIDL-config-2.orig | sed -e 's:${includedir}:${STAGING_INCDIR}:' > ${STAGING_BINDIR}/libIDL-config-2
|
||||||
|
|
||||||
|
if [ "${STAGING_BINDIR}" != "${STAGING_BINDIR_CROSS}" ]; then
|
||||||
|
mv ${STAGING_BINDIR}/libIDL-config-2 ${STAGING_BINDIR_CROSS}/libIDL-config-2
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
FILES_${PN} = "${libdir}/*.so.*"
|
FILES_${PN} = "${libdir}/*.so.*"
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ S = "${WORKDIR}/libtool-${PV}"
|
|||||||
|
|
||||||
prefix = "${STAGING_DIR}"
|
prefix = "${STAGING_DIR}"
|
||||||
exec_prefix = "${prefix}/${BUILD_SYS}"
|
exec_prefix = "${prefix}/${BUILD_SYS}"
|
||||||
|
bindir = "${STAGING_BINDIR_NATIVE}"
|
||||||
|
|
||||||
do_compile () {
|
do_compile () {
|
||||||
:
|
:
|
||||||
|
|||||||
@@ -20,6 +20,11 @@ do_stage() {
|
|||||||
install -m 755 ${S}/libusb-config ${STAGING_BINDIR}
|
install -m 755 ${S}/libusb-config ${STAGING_BINDIR}
|
||||||
perl -pi -e 's:\-L${libdir} :-L${STAGING_LIBDIR} :' ${STAGING_BINDIR}/libusb-config
|
perl -pi -e 's:\-L${libdir} :-L${STAGING_LIBDIR} :' ${STAGING_BINDIR}/libusb-config
|
||||||
|
|
||||||
|
if [ "${STAGING_BINDIR}" != "${STAGING_BINDIR_CROSS}" ]; then
|
||||||
|
install -d ${STAGING_BINDIR_CROSS}/
|
||||||
|
mv ${STAGING_BINDIR}/libusb-config ${STAGING_BINDIR_CROSS}/libusb-config
|
||||||
|
fi
|
||||||
|
|
||||||
install -d ${STAGING_INCDIR}/
|
install -d ${STAGING_INCDIR}/
|
||||||
for X in usb.h
|
for X in usb.h
|
||||||
do
|
do
|
||||||
|
|||||||
@@ -27,8 +27,8 @@ do_stage () {
|
|||||||
cat xml2-config | sed -e "s,^prefix=.*,prefix=${STAGING_BINDIR}/..," \
|
cat xml2-config | sed -e "s,^prefix=.*,prefix=${STAGING_BINDIR}/..," \
|
||||||
-e "s,^exec_prefix=.*,exec_prefix=${STAGING_BINDIR}/..," \
|
-e "s,^exec_prefix=.*,exec_prefix=${STAGING_BINDIR}/..," \
|
||||||
-e "s,^includedir=.*,includedir=${STAGING_INCDIR}," \
|
-e "s,^includedir=.*,includedir=${STAGING_INCDIR}," \
|
||||||
-e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR}/xml2-config
|
-e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR_CROSS}/xml2-config
|
||||||
chmod a+rx ${STAGING_BINDIR}/xml2-config
|
chmod a+rx ${STAGING_BINDIR_CROSS}/xml2-config
|
||||||
install -m 0644 libxml.m4 ${STAGING_DATADIR}/aclocal/
|
install -m 0644 libxml.m4 ${STAGING_DATADIR}/aclocal/
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user