summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/packages/libgcrypt/libgcrypt_1.2.1.bb2
-rw-r--r--meta/packages/libgcrypt/libgcrypt_1.2.3.bb2
-rw-r--r--meta/packages/libidl/libidl_0.8.3.bb4
-rw-r--r--meta/packages/libtool/libtool-cross_1.5.10.bb1
-rw-r--r--meta/packages/libusb/libusb_0.1.10a.bb5
-rw-r--r--meta/packages/libxml/libxml2_2.6.22.bb4
6 files changed, 14 insertions, 4 deletions
diff --git a/meta/packages/libgcrypt/libgcrypt_1.2.1.bb b/meta/packages/libgcrypt/libgcrypt_1.2.1.bb
index e797ee75c7..3f4942cae5 100644
--- a/meta/packages/libgcrypt/libgcrypt_1.2.1.bb
+++ b/meta/packages/libgcrypt/libgcrypt_1.2.1.bb
@@ -17,7 +17,7 @@ EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities"
17do_stage() { 17do_stage() {
18 oe_libinstall -so -C src libgcrypt ${STAGING_LIBDIR} 18 oe_libinstall -so -C src libgcrypt ${STAGING_LIBDIR}
19 oe_libinstall -so -C src libgcrypt-pthread ${STAGING_LIBDIR} 19 oe_libinstall -so -C src libgcrypt-pthread ${STAGING_LIBDIR}
20 install -m 0755 src/libgcrypt-config ${STAGING_BINDIR}/ 20 install -m 0755 src/libgcrypt-config ${STAGING_BINDIR_CROSS}/
21 21
22 install -d ${STAGING_INCDIR}/ 22 install -d ${STAGING_INCDIR}/
23 for X in gcrypt.h gcrypt-module.h 23 for X in gcrypt.h gcrypt-module.h
diff --git a/meta/packages/libgcrypt/libgcrypt_1.2.3.bb b/meta/packages/libgcrypt/libgcrypt_1.2.3.bb
index e797ee75c7..3f4942cae5 100644
--- a/meta/packages/libgcrypt/libgcrypt_1.2.3.bb
+++ b/meta/packages/libgcrypt/libgcrypt_1.2.3.bb
@@ -17,7 +17,7 @@ EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities"
17do_stage() { 17do_stage() {
18 oe_libinstall -so -C src libgcrypt ${STAGING_LIBDIR} 18 oe_libinstall -so -C src libgcrypt ${STAGING_LIBDIR}
19 oe_libinstall -so -C src libgcrypt-pthread ${STAGING_LIBDIR} 19 oe_libinstall -so -C src libgcrypt-pthread ${STAGING_LIBDIR}
20 install -m 0755 src/libgcrypt-config ${STAGING_BINDIR}/ 20 install -m 0755 src/libgcrypt-config ${STAGING_BINDIR_CROSS}/
21 21
22 install -d ${STAGING_INCDIR}/ 22 install -d ${STAGING_INCDIR}/
23 for X in gcrypt.h gcrypt-module.h 23 for X in gcrypt.h gcrypt-module.h
diff --git a/meta/packages/libidl/libidl_0.8.3.bb b/meta/packages/libidl/libidl_0.8.3.bb
index e743247390..fdce4ba186 100644
--- a/meta/packages/libidl/libidl_0.8.3.bb
+++ b/meta/packages/libidl/libidl_0.8.3.bb
@@ -23,6 +23,10 @@ do_stage() {
23 23
24 cp ${STAGING_BINDIR}/libIDL-config-2 ${STAGING_BINDIR}/libIDL-config-2.orig 24 cp ${STAGING_BINDIR}/libIDL-config-2 ${STAGING_BINDIR}/libIDL-config-2.orig
25 cat ${STAGING_BINDIR}/libIDL-config-2.orig | sed -e 's:${includedir}:${STAGING_INCDIR}:' > ${STAGING_BINDIR}/libIDL-config-2 25 cat ${STAGING_BINDIR}/libIDL-config-2.orig | sed -e 's:${includedir}:${STAGING_INCDIR}:' > ${STAGING_BINDIR}/libIDL-config-2
26
27 if [ "${STAGING_BINDIR}" != "${STAGING_BINDIR_CROSS}" ]; then
28 mv ${STAGING_BINDIR}/libIDL-config-2 ${STAGING_BINDIR_CROSS}/libIDL-config-2
29 fi
26} 30}
27 31
28FILES_${PN} = "${libdir}/*.so.*" 32FILES_${PN} = "${libdir}/*.so.*"
diff --git a/meta/packages/libtool/libtool-cross_1.5.10.bb b/meta/packages/libtool/libtool-cross_1.5.10.bb
index 81a4990d28..fdc8f6ffaf 100644
--- a/meta/packages/libtool/libtool-cross_1.5.10.bb
+++ b/meta/packages/libtool/libtool-cross_1.5.10.bb
@@ -13,6 +13,7 @@ S = "${WORKDIR}/libtool-${PV}"
13 13
14prefix = "${STAGING_DIR}" 14prefix = "${STAGING_DIR}"
15exec_prefix = "${prefix}/${BUILD_SYS}" 15exec_prefix = "${prefix}/${BUILD_SYS}"
16bindir = "${STAGING_BINDIR_NATIVE}"
16 17
17do_compile () { 18do_compile () {
18 : 19 :
diff --git a/meta/packages/libusb/libusb_0.1.10a.bb b/meta/packages/libusb/libusb_0.1.10a.bb
index 298eb5ee7f..3054d9230d 100644
--- a/meta/packages/libusb/libusb_0.1.10a.bb
+++ b/meta/packages/libusb/libusb_0.1.10a.bb
@@ -20,6 +20,11 @@ do_stage() {
20 install -m 755 ${S}/libusb-config ${STAGING_BINDIR} 20 install -m 755 ${S}/libusb-config ${STAGING_BINDIR}
21 perl -pi -e 's:\-L${libdir} :-L${STAGING_LIBDIR} :' ${STAGING_BINDIR}/libusb-config 21 perl -pi -e 's:\-L${libdir} :-L${STAGING_LIBDIR} :' ${STAGING_BINDIR}/libusb-config
22 22
23 if [ "${STAGING_BINDIR}" != "${STAGING_BINDIR_CROSS}" ]; then
24 install -d ${STAGING_BINDIR_CROSS}/
25 mv ${STAGING_BINDIR}/libusb-config ${STAGING_BINDIR_CROSS}/libusb-config
26 fi
27
23 install -d ${STAGING_INCDIR}/ 28 install -d ${STAGING_INCDIR}/
24 for X in usb.h 29 for X in usb.h
25 do 30 do
diff --git a/meta/packages/libxml/libxml2_2.6.22.bb b/meta/packages/libxml/libxml2_2.6.22.bb
index f29501040d..499b9beb63 100644
--- a/meta/packages/libxml/libxml2_2.6.22.bb
+++ b/meta/packages/libxml/libxml2_2.6.22.bb
@@ -27,8 +27,8 @@ do_stage () {
27 cat xml2-config | sed -e "s,^prefix=.*,prefix=${STAGING_BINDIR}/..," \ 27 cat xml2-config | sed -e "s,^prefix=.*,prefix=${STAGING_BINDIR}/..," \
28 -e "s,^exec_prefix=.*,exec_prefix=${STAGING_BINDIR}/..," \ 28 -e "s,^exec_prefix=.*,exec_prefix=${STAGING_BINDIR}/..," \
29 -e "s,^includedir=.*,includedir=${STAGING_INCDIR}," \ 29 -e "s,^includedir=.*,includedir=${STAGING_INCDIR}," \
30 -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR}/xml2-config 30 -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR_CROSS}/xml2-config
31 chmod a+rx ${STAGING_BINDIR}/xml2-config 31 chmod a+rx ${STAGING_BINDIR_CROSS}/xml2-config
32 install -m 0644 libxml.m4 ${STAGING_DATADIR}/aclocal/ 32 install -m 0644 libxml.m4 ${STAGING_DATADIR}/aclocal/
33} 33}
34 34