Apache 2.0.47 builds successfully :)

BKrev: 3f5e70dem3guAaYtt5kIPfomAJ0ewA

6 files changed, 57 insertions, 9 deletions

diff --git a/content/apache-2.0.47.oe b/content/apache-2.0.47.oe
index 74bc5c65b2..5e00a5b7dc 100644
--- a/content/apache-2.0.47.oe
+++ b/content/apache-2.0.47.oe
@@ -1,11 +1,13 @@
 SRC_URI = http://ftp.epix.net/apache/httpd/httpd-${PV}.tar.gz
 SECTION = net
-DEPENDS = virtual/libc expat pcre libtool
+DEPENDS = virtual/libc expat pcre libtool openssl
 RDEPENDS = libc6, libexpat1, libpcre0
 
 S = ${WORKDIR}/httpd-${PV}
 
 CFLAGS_append = " -DPATH_MAX=4096"
+CFLAGS_prepend = "-I${STAGING_DIR}/target/include/openssl "
+EXTRA_OECONF = --enable-ssl --with-ssl=${STAGING_DIR}/target --enable-dav --enable-dav-fs
 do_compile () {
 	set -e
 	oe_runconf
@@ -17,6 +19,9 @@ do_compile () {
 	${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
+	/bin/sh ${S}/srclib/apr/libtool --silent --mode=compile ${CC} -DPATH_MAX=4096 -I${S}/srclib/apr/include -prefer-non-pic -static -c gen_test_char.c && touch gen_test_char.lo
+	/bin/sh ${S}/srclib/apr/libtool --silent --mode=compile ${CC} -DPATH_MAX=4096 -I${S}/os/unix -I${S}/srclib/apr/include -I${S}/srclib/apr-util/include -I${S}/include -prefer-non-pic -static -c util_debug.c && touch util_debug.lo
+	touch gen_test_char
 	cd ..
 	oe_runmake
 }
diff --git a/content/glibc-2.3.2.oe b/content/glibc-2.3.2.oe
index 383dd51723..b799286666 100644
--- a/content/glibc-2.3.2.oe
+++ b/content/glibc-2.3.2.oe
@@ -87,6 +87,18 @@ do_compile() {
 	base_do_compile $@
 }
 
+do_stage() {
+	set -e
+#	oe_runmake -C ${builddir} install_root=${STAGING_DIR}/target \
+#		includedir=/include libdir=/lib slibdir=/lib \
+#		${STAGING_LIBDIR}/libc-${PV}.so ${STAGING_LIBDIR}/libc.so.6 \
+#		${STAGING_LIBDIR}/libc.so install-headers install-lib
+	for i in pthread c; do
+		mv ${STAGING_LIBDIR}/lib$i.so ${STAGING_LIBDIR}/lib$i-old.so
+		cat ${STAGING_LIBDIR}/lib$i-old.so | sed -e's,/lib/,,g' > ${STAGING_LIBDIR}/lib$i.so
+	done
+}
+
 do_install() {
 	set -e
 	oe_runmake -C ${builddir} install_root=${D} install
diff --git a/content/libjpeg-6b.oe b/content/libjpeg-6b.oe
index 21158f6bdb..2183fd5f1f 100644
--- a/content/libjpeg-6b.oe
+++ b/content/libjpeg-6b.oe
@@ -17,11 +17,11 @@ CFLAGS_append = " -D_REENTRANT"
 
 do_stage() {
 	install -d ${STAGING_DIR}/{bin,lib,include}
-	install -m 644 -D jconfig.h ${STAGING_DIR}/include/jconfig.h
-	install -m 644 -D jpeglib.h ${STAGING_DIR}/include/jpeglib.h
-	install -m 644 -D jmorecfg.h ${STAGING_DIR}/include/jmorecfg.h
-	install -m 644 -D jerror.h ${STAGING_DIR}/include/jerror.h
-	install -m 644 -D jpegint.h ${STAGING_DIR}/include/jpegint.h
+	install -m 644 -D jconfig.h ${STAGING_DIR}/target/include/jconfig.h
+	install -m 644 -D jpeglib.h ${STAGING_DIR}/target/include/jpeglib.h
+	install -m 644 -D jmorecfg.h ${STAGING_DIR}/target/include/jmorecfg.h
+	install -m 644 -D jerror.h ${STAGING_DIR}/target/include/jerror.h
+	install -m 644 -D jpegint.h ${STAGING_DIR}/target/include/jpegint.h
 	install -m 755 -D .libs/libjpeg.so.62.0.0 ${STAGING_LIBDIR}/libjpeg.so.62.0.0
 	ln -sf libjpeg.so.62.0.0 ${STAGING_LIBDIR}/libjpeg.so.62
 	ln -sf libjpeg.so.62.0.0 ${STAGING_LIBDIR}/libjpeg.so
diff --git a/content/libpng-1.2.5.oe b/content/libpng-1.2.5.oe
index d8224bb680..e61004a3aa 100644
--- a/content/libpng-1.2.5.oe
+++ b/content/libpng-1.2.5.oe
@@ -9,7 +9,7 @@ RDEPENDS_append_libpng3=' libpng12'
 SRC_URI=http://www.libpng.org/pub/png/src/${P}.tar.bz2
 S=${WORKDIR}/${P}
 
-EXTRA_OEMAKE_append=' ZLIBINC=${STAGING_DIR}/include ZLIBLIB=${STAGING_LIBDIR}'
+EXTRA_OEMAKE_append=' ZLIBINC=${STAGING_DIR}/target/include ZLIBLIB=${STAGING_LIBDIR}'
 
 do_compile() {
 	set -e
@@ -19,8 +19,8 @@ do_compile() {
 
 do_stage() {
 	install -d ${STAGING_DIR}/{bin,lib,include}
-	install -m 644 -D png.h ${STAGING_DIR}/include/png.h
-	install -m 644 -D pngconf.h ${STAGING_DIR}/include/pngconf.h
+	install -m 644 -D png.h ${STAGING_DIR}/target/include/png.h
+	install -m 644 -D pngconf.h ${STAGING_DIR}/target/include/pngconf.h
 	install -m 755 -D libpng12.so.0.${PV} ${STAGING_LIBDIR}/libpng12.so.0.${PV}
 	ln -sf ./libpng12.so.0.${PV} ${STAGING_LIBDIR}/libpng12.so.0
 	ln -sf ./libpng12.so.0.${PV} ${STAGING_LIBDIR}/libpng12.so
diff --git a/content/openssl-0.9.7b.oe b/content/openssl-0.9.7b.oe
index e69de29bb2..3bb19528e5 100644
--- a/content/openssl-0.9.7b.oe
+++ b/content/openssl-0.9.7b.oe
@@ -0,0 +1,28 @@
+SRC_URI = ${DEBIAN_MIRROR}/main/o/openssl/${PN}_${PV}.orig.tar.gz \
+	  ${DEBIAN_MIRROR}/main/o/openssl/${PN}_${PV}-2.diff.gz;patch=1
+S = ${WORKDIR}/${PN}-${PV}.orig
+
+DEPENDS = virtual/libc
+SECTION = libs
+DESCRIPTION = Secure Socket Layer (SSL) binary and related cryptographic tools.
+
+export AR := ${AR} r
+export CFLAG = "-fPIC -DTHREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -DL_ENDIAN -DTERMIO -Wall ${FULL_OPTIMIZATION}"
+export DIRS = "crypto ssl"
+export EX_LIBS = "-lgcc -ldl -L${STAGING_LIBDIR}"
+do_compile () {
+	set -e
+	perl util/perlpath.pl /usr/bin
+	perl ./Configure shared --prefix=/usr --openssldir=/usr/lib/ssl linux-elf-arm
+	ln -sf apps/openssl.pod crypto/crypto.pod ssl/ssl.pod doc/
+	oe_runmake -f Makefile.ssl
+}
+
+do_stage () {
+	set -e
+	cp --dereference -R include/openssl ${STAGING_DIR}/target/include/
+	install -m 0755 libcrypto.so.0.9.7 ${STAGING_LIBDIR}/
+	ln -sf libcrypto.so.0.9.7 ${STAGING_LIBDIR}/libcrypto.so
+	install -m 0755 libssl.so.0.9.7 ${STAGING_LIBDIR}/
+	ln -sf libssl.so.0.9.7 ${STAGING_LIBDIR}/libssl.so
+}
diff --git a/content/pcre-4.4.oe b/content/pcre-4.4.oe
index 855a6cc97b..41bbbbf786 100644
--- a/content/pcre-4.4.oe
+++ b/content/pcre-4.4.oe
@@ -11,6 +11,9 @@ 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}"
 
+# this libtool cant handle the multiword gcc
+CC:=${@oe.data.getVar("CC", d, 1).split()[-1].strip()}
+CFLAGS_append = " -D_REENTRANT"
 do_compile () {
 	set -e
 	oe_runconf