bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix apache compile

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@9877 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2007-12-23 21:35:37 +00:00
parent 3dc81ed1c1
commit 93697f7adf
3 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libs/apr-util/Makefile
View File

@ -29,7 +29,7 @@ endef
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--with-pgsql=no \ --with-pgsql=no \
--with-apr="$(STAGING_DIR)/usr/bin/apr-1-config" \ --with-apr="$(STAGING_DIR_HOST)/bin/apr-1-config" \
--with-expat="$(STAGING_DIR)/usr" \ --with-expat="$(STAGING_DIR)/usr" \
--without-sqlite2 \ --without-sqlite2 \
--with-sqlite3="$(STAGING_DIR)/usr" \ --with-sqlite3="$(STAGING_DIR)/usr" \
@ -46,34 +46,35 @@ endef
define Build/Compile 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-1 -luuid -lm -lcrypt" all
$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
endef endef
define Build/InstallDev define Build/InstallDev
mkdir -p $(1)/usr/bin mkdir -p $(2)/bin
$(CP) $(PKG_INSTALL_DIR)/usr/bin/apu-1-config \ $(CP) $(PKG_INSTALL_DIR)/usr/bin/apu-1-config \
$(1)/usr/bin $(2)/bin
mkdir -p $(1)/usr/include/apr-1/ mkdir -p $(1)/usr/include/apr-1/
$(CP) $(PKG_INSTALL_DIR)/usr/include/apr-1/* \ $(CP) $(PKG_INSTALL_DIR)/usr/include/apr-1/* \
$(1)/usr/include/apr-1/ $(1)/usr/include/apr-1/
mkdir -p $(1)/usr/lib mkdir -p $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.{a,so*} \ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.{la,a,so*} \
$(1)/usr/lib/ $(1)/usr/lib/
mkdir -p $(1)/usr/lib/pkgconfig/ mkdir -p $(1)/usr/lib/pkgconfig/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-util-1.pc \ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-util-1.pc \
$(1)/usr/lib/pkgconfig/ $(1)/usr/lib/pkgconfig/
$(SED) 's, -e \"s -I$$$$prefix/lib g\",,g' $(1)/usr/bin/apu-1-config $(SED) 's, -e \"s -I$$$$prefix/lib g\",,g' $(2)/bin/apu-1-config
$(SED) 's,^includedir=\"$$$${prefix}/include/,includedir=\"$(1)/usr/include/,g' $(1)/usr/bin/apu-1-config $(SED) 's,^libdir=\"$$$${exec_prefix}/lib,libdir=\"$(1)/usr/lib,g' $(2)/bin/apu-1-config
$(SED) 's,-L$$$$libdir,,g' $(1)/usr/bin/apu-1-config $(SED) 's,^includedir=\"$$$${prefix}/include/,includedir=\"$(1)/usr/include/,g' $(2)/bin/apu-1-config
$(SED) 's,-R$$$$libdir,,g' $(1)/usr/bin/apu-1-config $(SED) 's,-L$$$$libdir,,g' $(2)/bin/apu-1-config
$(SED) 's,-R$$$$libdir,,g' $(2)/bin/apu-1-config
endef endef
define Build/UninstallDev define Build/UninstallDev
rm -rf $(STAGING_DIR)/usr/bin/apu-1-config \ rm -rf $(2)/bin/apu-1-config \
$(STAGING_DIR)/usr/include/apr-1 \ $(1)/usr/include/apr-1 \
$(STAGING_DIR)/usr/lib/libaprutil-1.{a,so*} \ $(1)/usr/lib/libaprutil-1.{a,so*} \
$(STAGING_DIR)/usr/lib/pkgconfig/apr-util-1.pc $(1)/usr/lib/pkgconfig/apr-util-1.pc
endef endef
define Package/libaprutil/install define Package/libaprutil/install

19
libs/apr/Makefile
View File

@ -46,19 +46,19 @@ endef
define Build/Compile define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) all $(MAKE) -C $(PKG_BUILD_DIR) all
$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
endef endef
define Build/InstallDev define Build/InstallDev
mkdir -p $(1)/usr/bin mkdir -p $(2)/bin
$(CP) $(PKG_INSTALL_DIR)/usr/bin/apr-1-config \ $(CP) $(PKG_INSTALL_DIR)/usr/bin/apr-1-config \
$(1)/usr/bin $(2)/bin
mkdir -p $(1)/usr/include/apr-1 mkdir -p $(1)/usr/include/apr-1
$(CP) $(PKG_INSTALL_DIR)/usr/include/apr-1/* \ $(CP) $(PKG_INSTALL_DIR)/usr/include/apr-1/* \
$(1)/usr/include/apr-1/ $(1)/usr/include/apr-1/
mkdir -p $(1)/usr/lib mkdir -p $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libapr-1.{a,so*} \ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libapr-1.{la,a,so*} \
$(1)/usr/lib/ $(1)/usr/lib/
mkdir -p $(1)/usr/lib/pkgconfig mkdir -p $(1)/usr/lib/pkgconfig
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-1.pc \ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-1.pc \
@ -66,11 +66,12 @@ define Build/InstallDev
mkdir -p $(1)/usr/share/build-1 mkdir -p $(1)/usr/share/build-1
$(CP) $(PKG_INSTALL_DIR)/usr/share/build-1/* \ $(CP) $(PKG_INSTALL_DIR)/usr/share/build-1/* \
$(1)/usr/share/build-1/ $(1)/usr/share/build-1/
$(SED) 's,^datadir=\"/usr/share\",datadir=\"$(1)/usr/share\",g' $(1)/usr/bin/apr-1-config $(SED) 's,^datadir=\"/usr/share\",datadir=\"$(1)/usr/share\",g' $(2)/bin/apr-1-config
$(SED) 's,^installbuilddir=\"/usr/share/build-1\",installbuilddir=\"$(1)/usr/share/build-1\",g' $(1)/usr/bin/apr-1-config $(SED) 's,^installbuilddir=\"/usr/share/build-1\",installbuilddir=\"$(1)/usr/share/build-1\",g' $(2)/bin/apr-1-config
$(SED) 's,^includedir=\"$$$${prefix}/include/,includedir=\"$(1)/usr/include/,g' $(1)/usr/bin/apr-1-config $(SED) 's,^libdir=\"$$$${exec_prefix}/lib,libdir=\"$(1)/usr/lib,g' $(2)/bin/apr-1-config
$(SED) 's,-L$$$$libdir,,g' $(1)/usr/bin/apr-1-config $(SED) 's,^includedir=\"$$$${prefix}/include/,includedir=\"$(1)/usr/include/,g' $(2)/bin/apr-1-config
$(SED) 's,-R$$$$libdir,,g' $(1)/usr/bin/apr-1-config $(SED) 's,-L$$$$libdir,,g' $(2)/bin/apr-1-config
$(SED) 's,-R$$$$libdir,,g' $(2)/bin/apr-1-config
$(SED) 's,/usr/share/build-1,$(1)/usr/share/build-1,g' $(1)/usr/share/build-1/apr_rules.mk $(SED) 's,/usr/share/build-1,$(1)/usr/share/build-1,g' $(1)/usr/share/build-1/apr_rules.mk
endef endef

4
net/apache/Makefile
View File

@ -80,8 +80,8 @@ endef
define Build/Configure define Build/Configure
$(call Build/Configure/Default, \ $(call Build/Configure/Default, \
--with-apr="$(STAGING_DIR)/usr/bin/apr-1-config" \ --with-apr="$(STAGING_DIR_HOST)/bin/apr-1-config" \
--with-apr-util="$(STAGING_DIR)/usr/bin/apu-1-config" \ --with-apr-util="$(STAGING_DIR_HOST)/bin/apu-1-config" \
--with-pcre="$(STAGING_DIR)/usr/bin/pcre-config" \ --with-pcre="$(STAGING_DIR)/usr/bin/pcre-config" \
--enable-http \ --enable-http \
--enable-ssl \ --enable-ssl \