summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorJohn Bowler <jbowler@nslu2-linux.org>2005-11-23 07:35:46 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-11-23 07:35:46 +0000
commitc3036f11360cf4992c635dcdc43f1d703b004cac (patch)
tree45daf494a0c3ca5f093d260c04ad6f44b1e69b16 /packages
parent990ee6d7b71d1f5922cd494ab9ba5be03eafc602 (diff)
base.bbclass: attempt to fix the staging .la problem
- when using oe_libinstall to install a libtool library (.la file - present) into the staging directory (${STAGING_LIBDIR}) fix up the - installed .lai file so that it contains 'installed=no' - this - prevents libtool from subsequently using a copy of the build system - library if it exists in the final (target) installation directory - on the build machine (typically /usr/lib). Remove the patches from - pcre_4.4.bb to match (it now seems to work without them), add - cherokee to the openslug (etc) build (it was failing because of this - problem.)
Diffstat (limited to 'packages')
-rw-r--r--packages/meta/slugos-packages.bb5
-rw-r--r--packages/pcre/pcre_4.4.bb10
2 files changed, 5 insertions, 10 deletions
diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index 367dea2160..6e98dc4ffa 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -36,6 +36,7 @@ SLUGOS_PACKAGES = "\
bwmon \
bzip2 \
ccxstream \
+ cherokee \
coreutils \
cron \
ctorrent \
@@ -178,7 +179,6 @@ UCLIBC_UNSUPPORTABLE_PACKAGES = "\
SLUGOS_PACKAGES_append_linux = "\
${UCLIBC_UNSUPPORTABLE_PACKAGES} \
ctrlproxy \
- dsniff \
iperf \
man man-pages \
psmisc \
@@ -187,6 +187,9 @@ SLUGOS_PACKAGES_append_linux = "\
xinetd \
"
+#BROKEN:
+# dsniff
+
SLUGOS_PACKAGES_append_linux-uclibc = "\
"
diff --git a/packages/pcre/pcre_4.4.bb b/packages/pcre/pcre_4.4.bb
index 9f153847a4..612d76d835 100644
--- a/packages/pcre/pcre_4.4.bb
+++ b/packages/pcre/pcre_4.4.bb
@@ -5,7 +5,7 @@ provides a POSIX calling interface to PCRE; the regular expressions \
themselves still follow Perl syntax and semantics. The header file for \
the POSIX-style functions is called pcreposix.h."
SECTION = "devel"
-PR = "r1"
+PR = "r2"
LICENSE = "BSD"
SRC_URI = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${PV}.tar.bz2"
S = "${WORKDIR}/pcre-${PV}"
@@ -27,18 +27,10 @@ do_compile () {
}
do_stage () {
- # Force all -L(dir) output to be prepended with the staging libdir to stop libtool
- # from trying to link to host libraries.
- sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/*libtool
-
oe_libinstall -a -so libpcre ${STAGING_LIBDIR}
oe_libinstall -a -so libpcreposix ${STAGING_LIBDIR}
install -m 0644 pcre.h ${STAGING_INCDIR}/
install -m 0644 pcreposix.h ${STAGING_INCDIR}/
-
- # pcreposix linked originally to the libpcre in it's working directory. That messed
- # the .la file up. I fix this manually here:
- sed -i 's:${S}:${STAGING_LIBDIR}:' ${STAGING_LIBDIR}/libpcreposix.la
}
FILES_${PN} = "${libdir}/lib*.so*"