Patches to libapr-util  to support apache with modules.

Signed-off-by: Michael Geddes <michael at frog dot wheelycreek dot net>
---
Index: packages/libs/apr-util/Makefile
===================================================================
--- packages/libs/apr-util/Makefile     (revision 11372)
+++ packages/libs/apr-util/Makefile     (working copy)
@@ -42,18 +42,21 @@
        APR_BUILD_DIR="$(STAGING_DIR)/usr/share/build-1" \
 
 define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) 
APRUTIL_LIBS="-lsqlite3 -L$(STAGING_DIR)/usr/lib -lexpat -liconv -lapr-1 -luuid 
-lm -lcrypt" all
+       $(MAKE) -C $(PKG_BUILD_DIR) 
APRUTIL_LIBS="-lsqlite3 -L$(STAGING_DIR)/usr/lib -lexpat -liconv -lapr -luuid 
-lm -lcrypt" all
        $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
 endef
 
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include/apr-1/ $(1)/usr/lib  
$(1)/usr/lib/pkgconfig/
        $(CP)   $(PKG_INSTALL_DIR)/usr/bin/apu-1-config \
-               $(1)/usr/bin/
+               $(1)/usr/bin
        $(CP)   $(PKG_INSTALL_DIR)/usr/include/apr-1/* \
                $(1)/usr/include/apr-1/
-       $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.{la,a,so*} \
+       $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.{la,so*} \
                $(1)/usr/lib/
+       [ ! -e $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.a ] \
+       || $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.a \
+               $(1)/usr/lib/
        $(CP)   $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-util-1.pc \
                $(1)/usr/lib/pkgconfig/
        $(SED) 's, -e \"s -I$$$$prefix/lib  g\",,g' $(1)/usr/bin/apu-1-config
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Reply via email to