apache-2.0.47.oe:

  BUGFIX: build util_debug and link it into gen_test_char.
pcre-4.4.oe:
  BUGFIX: was using CC not BUILD_CC for dftables.

BKrev: 3f5e13c49uzKOWG40RT9_zT8SrncVA

diff --git a/content/apache-2.0.47.oe b/content/apache-2.0.47.oe
index e69de29..06510e7 100644 (file)
--- a/content/apache-2.0.47.oe
+++ b/content/apache-2.0.47.oe
@@ -0,0 +1,24 @@
+SRC_URI = http://ftp.epix.net/apache/httpd/httpd-${PV}.tar.gz
+SECTION = net
+DEPENDS = virtual/libc expat pcre
+RDEPENDS = libc6, libexpat1, libpcre0
+
+S = ${WORKDIR}/httpd-${PV}
+
+CFLAGS_append = " -DPATH_MAX=4096"
+do_compile () {
+       set -e
+       oe_runconf
+       touch srclib/apr-util/uri/gen_uri_delims.lo
+       ${BUILD_CC} srclib/apr-util/uri/gen_uri_delims.c -o srclib/apr-util/uri/gen_uri_delims
+       touch srclib/pcre/dftables.lo
+       ${BUILD_CC} -I/usr/include/pcre srclib/pcre/dftables.c -o srclib/pcre/dftables
+       cd server
+       ${BUILD_CC} -I${S}/srclib/apr/include -c gen_test_char.c && touch gen_test_char.lo
+       ${BUILD_CC} -I${S}/os/unix -I${S}/srclib/apr/include -I${S}/srclib/apr-util/include -I${S}/include -c util_debug.c && touch util_debug.lo
+       ${BUILD_CC} gen_test_char.o util_debug.o -o gen_test_char
+       cd ..
+       oe_runmake
+}
+
+inherit base

diff --git a/content/pcre-4.4.oe b/content/pcre-4.4.oe
index e69de29..855a6cc 100644 (file)
--- a/content/pcre-4.4.oe
+++ b/content/pcre-4.4.oe
@@ -0,0 +1,35 @@
+DEPENDS = virtual/libc
+RDEPENDS = libc6
+DESCRIPTION = Perl-compatible regular expression library. PCRE has its own native \
+API, but a set of "wrapper" functions that are based on the POSIX API \
+are also supplied in the library libpcreposix. Note that this just \
+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.
+
+
+SRC_URI = ftp://ftp.csx.cam.ac.uk/pub/software/programming/${PN}/${P}.tar.bz2
+S = "${WORKDIR}/${P}"
+
+do_compile () {
+       set -e
+       oe_runconf
+       ${BUILD_CC} -I${S}/include -c dftables.c
+       ${BUILD_CC} dftables.o -o dftables
+       oe_runmake
+}
+
+do_stage () {
+       set -e
+       install -m 0755 .libs/libpcreposix.so.0.0.0 ${STAGING_LIBDIR}/
+       ln -sf libpcreposix.so.0.0.0 ${STAGING_LIBDIR}/libpcreposix.so.0
+       install -m 0755 .libs/libpcre.so.0.0.1 ${STAGING_LIBDIR}/
+       ln -sf libpcre.so.0.0.1 ${STAGING_LIBDIR}/libpcre.so.0
+       
+       ln -sf libpcre.so.0.0.1 ${STAGING_LIBDIR}/libpcre.so
+       ln -sf libpcreposix.so.0.0.0 ${STAGING_LIBDIR}/libpcreposix.so
+       install -m 0644 .libs/libpcre.a ${STAGING_LIBDIR}/
+       install -m 0644 .libs/libpcreposix.a ${STAGING_LIBDIR}/
+       install -m 0644 pcre.h ${STAGING_DIR}/target/include/
+       install -m 0644 pcreposix.h ${STAGING_DIR}/target/include/
+}