This set starts off with patches to libapr to support Apache with modules
rather than static. With
modules, it is more versatile, and more compact for a required feature set.
Much of this work was borrowed from optware.
Signed-off-by: Michael Geddes <michael at frog dot wheelycreek dot net>
---
Index: packages/libs/apr/Makefile
===================================================================
--- packages/libs/apr/Makefile (revision 11372)
+++ packages/libs/apr/Makefile (working copy)
@@ -29,9 +29,7 @@
endef
CONFIGURE_ARGS += \
- --with-devrandom=/dev/urandom \
- --disable-dso \
- --enable-ipv6
+ --with-devrandom=/dev/urandom
CONFIGURE_VARS += \
ac_cv_file__dev_zero=yes \
@@ -39,36 +37,53 @@
apr_cv_mutex_robust_shared=no \
apr_cv_tcp_nodelay_with_cork=yes \
ac_cv_sizeof_ssize_t=4 \
- LDFLAGS="$$$$LDFLAGS -lpthread" \
+ LDFLAGS="$$$$LDFLAGS -lpthread"
-define Build/Compile
+ifneq ($(CONFIG_PACKAGE_libapr),)
+define Build/Compile/libapr
+ echo configuring APR Dynamic
+ $(call Build/Configure/Default, \
+ --disable-static \
+ --enable-layout=GNU \
+ --enable-lfs \
+ --enable-ipv6 \
+ )
+ echo Building APR Dynamic
$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
endef
+endif
+define Build/Compile
+ $(call Build/Compile/libapr)
+endef
+
+define Build/Configure
+ echo NOT configuring APR
+endef
+
define Build/InstallDev
- $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include/apr-1 $(1)/usr/lib
$(1)/usr/lib/pkgconfig
$(1)/usr/share/build-1
- $(CP) $(PKG_INSTALL_DIR)/usr/bin/apr-1-config \
- $(1)/usr/bin/
- $(CP) $(PKG_INSTALL_DIR)/usr/include/apr-1/* \
- $(1)/usr/include/apr-1/
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libapr-1.{la,a,so*} \
- $(1)/usr/lib/
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-1.pc \
- $(1)/usr/lib/pkgconfig/
- $(CP) $(PKG_INSTALL_DIR)/usr/share/build-1/* \
- $(1)/usr/share/build-1/
- $(SED)
's,^datadir=\"/usr/share\",datadir=\"$(STAGING_DIR)/usr/share\",g'
$(1)/usr/bin/apr-1-config
-
$(SED)
's,^installbuilddir=\"/usr/share/build-1\",installbuilddir=\"$(STAGING_DIR)/usr/share/build-1\",g'
$(1)/usr/bin/apr-1-config
- $(SED)
's,^libdir=\"$$$${exec_prefix}/lib,libdir=\"$(STAGING_DIR)/usr/lib,g'
$(1)/usr/bin/apr-1-config
- $(SED)
's,^includedir=\"$$$${prefix}/include/,includedir=\"$(STAGING_DIR)/usr/include/,g'
$(1)/usr/bin/apr-1-config
- $(SED) 's,-L$$$$libdir,,g' $(1)/usr/bin/apr-1-config
- $(SED) 's,-R$$$$libdir,,g' $(1)/usr/bin/apr-1-config
+ $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include/apr-1 $(1)/usr/lib
$(1)/usr/lib/pkgconfig
$(1)/usr/share/build-1 $(1)/usr/include/apache2
+ $(CP) $(PKG_INSTALL_DIR)/usr/bin/apr-1-config* $(1)/usr/bin || true
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/apr-1/*
$(1)/usr/include/apr-1 || true
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/apache2/*
$(1)/usr/include/apache2 || true
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{apr-1,apr}.{la,a,so*}
$(1)/usr/lib || true
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-1.pc
$(1)/usr/lib/pkgconfig || true
+ $(CP) $(PKG_INSTALL_DIR)/usr/share/build-1/*
$(1)/usr/share/build-1 || true
+ for i in $(1)/usr/bin/apr-1-config* ; do \
+ $(SED)
's,^datadir=\"/usr/share\",datadir=\"$(STAGING_DIR)/usr/share\",g' $$$$i; \
+
$(SED)
's,^installbuilddir=\"/usr/share/build-1\",installbuilddir=\"$(STAGING_DIR)/usr/share/build-1\",g'
$$$$i ; \
+ $(SED)
's,^libdir=\"$$$${exec_prefix}/lib,libdir=\"$(STAGING_DIR)/usr/lib,g' $$$$i ; \
+ $(SED)
's,^includedir=\"$$$${prefix}/include/,includedir=\"$(STAGING_DIR)/usr/include/,g'
$$$$i ; \
+ $(SED) 's,-L$$$$libdir,,g' $$$$i ; \
+ $(SED) 's,-R$$$$libdir,,g' $$$$i ; \
+ done
$(SED) 's,/usr/share/build-1,$(STAGING_DIR)/usr/share/build-1,g'
$(1)/usr/share/build-1/apr_rules.mk
endef
define Package/libapr/install
$(INSTALL_DIR) $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libapr-1.so.* $(1)/usr/lib/
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libapr.so.* $(1)/usr/lib/
endef
$(eval $(call BuildPackage,libapr))
+
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
