[oe-commits] Frans Meulenbroeks : apache2: reinstated native for now

[git version control]

Module: openembedded.git
Branch: eFfeM/sanity
Commit: fe06865fc90e8e1f383136ddcb8bbca0649e398c
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=fe06865fc90e8e1f383136ddcb8bbca0649e398c

Author: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>
Date:   Sun Mar 14 16:34:46 2010 +0100

apache2: reinstated native for now

Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>

---

 recipes/apache2/apache2-native_2.2.14.bb |   39 ++++++++++++++++++++++++++++++
 recipes/apache2/apache2_2.2.14.bb        |    2 -
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/recipes/apache2/apache2-native_2.2.14.bb b/recipes/apache2/apache2-native_2.2.14.bb
new file mode 100644
index 0000000..371bb49
--- /dev/null
+++ b/recipes/apache2/apache2-native_2.2.14.bb
@@ -0,0 +1,39 @@
+SECTION = "net"
+DEPENDS = "expat pcre"
+
+inherit native 
+
+PR ="r1"
+SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2"
+
+S = "${WORKDIR}/httpd-${PV}"
+
+do_configure () {
+	./configure --with-included-apr --prefix=${prefix}
+}
+
+do_stage () {
+	install -d ${STAGING_BINDIR_NATIVE}
+	cp server/gen_test_char ${STAGING_BINDIR_NATIVE}
+	cp srclib/apr/apr-1-config ${STAGING_BINDIR_NATIVE}
+	cp srclib/apr-util/apu-1-config ${STAGING_BINDIR_NATIVE}
+	cp support/apxs ${STAGING_BINDIR_NATIVE}
+	chmod 755 ${STAGING_BINDIR_NATIVE}/apxs
+	mkdir -p ${STAGING_DIR_NATIVE}//usr/build
+	cp build/*.mk ${STAGING_DIR_NATIVE}/usr/build
+	cp build/instdso.sh ${STAGING_DIR_NATIVE}/usr/build
+	cp .libs/httpd ${STAGING_BINDIR_NATIVE}
+
+	(cd srclib/apr/.libs; tar -cf - libapr-*.so* ) |
+	  (cd ${STAGING_LIBDIR_NATIVE}; tar -xf - )
+	(cd srclib/apr-util/.libs; tar -cf - libaprutil-*.so* ) |
+	  (cd ${STAGING_LIBDIR_NATIVE}; tar -xf - )
+
+	mkdir -p ${STAGING_INCDIR_NATIVE}/apache2
+	cp include/* ${STAGING_INCDIR_NATIVE}/apache2
+	cp os/unix/os.h ${STAGING_INCDIR_NATIVE}/apache2
+	cp os/unix/unixd.h ${STAGING_INCDIR_NATIVE}/apache2
+
+  	cp support/envvars-std ${STAGING_BINDIR_NATIVE}/envvars
+    	chmod 755 ${STAGING_BINDIR_NATIVE}/envvars
+}
diff --git a/recipes/apache2/apache2_2.2.14.bb b/recipes/apache2/apache2_2.2.14.bb
index 19b4477..4ad7743 100644
--- a/recipes/apache2/apache2_2.2.14.bb
+++ b/recipes/apache2/apache2_2.2.14.bb
@@ -112,5 +112,3 @@ do_install_append() {
 # Expat should be found in the staging area via DEPENDS...
 	rm -f ${D}/${libdir}/libexpat.*
 }
-
-BBCLASSEXTEND="native"