[packages] apr-util: rename from apr-util to libaprutil, add libtool fixes, cleanup
git-svn-id: svn://svn.openwrt.org/openwrt/packages@9247 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
bf58793625
commit
c563e36ea9
@ -15,40 +15,39 @@ PKG_RELEASE:=1
|
|||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
PKG_SOURCE_URL:=http://apache.autinity.de/apr/
|
PKG_SOURCE_URL:=http://apache.autinity.de/apr/
|
||||||
PKG_MD5SUM:=a2e2e54d65e9eae961f7171335cf2550
|
PKG_MD5SUM:=a2e2e54d65e9eae961f7171335cf2550
|
||||||
PKG_CAT:=zcat
|
|
||||||
|
|
||||||
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
|
|
||||||
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
|
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
|
||||||
define Package/apr-util
|
define Package/libaprutil
|
||||||
SECTION:=utils
|
SECTION:=libs
|
||||||
CATEGORY:=Utilities
|
CATEGORY:=Libraries
|
||||||
DEPENDS:=+libiconv +libexpat +apr +libpthread +libopenssl +libsqlite3
|
DEPENDS:=+libapr +libexpat +libiconv +libpthread +libsqlite3
|
||||||
TITLE:=Apache Portable Runtime Library Util
|
TITLE:=Apache Portable Runtime Utility Library
|
||||||
URL:=http://apr.apache.org/
|
URL:=http://apr.apache.org/
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Build/Configure
|
|
||||||
$(call Build/Configure/Default, \
|
CONFIGURE_ARGS += \
|
||||||
--with-pgsql=no \
|
--with-pgsql=no \
|
||||||
--with-apr="$(STAGING_DIR)/usr/bin/apr-1-config" \
|
--with-apr="$(STAGING_DIR)/usr/bin/apr-1-config" \
|
||||||
--with-expat="$(STAGING_DIR)/usr" \
|
--with-expat="$(STAGING_DIR)/usr" \
|
||||||
--without-sqlite2 \
|
--without-sqlite2 \
|
||||||
, \
|
--with-sqlite3="$(STAGING_DIR)/usr" \
|
||||||
|
--with-iconv="$(STAGING_DIR)/usr/lib/libiconv" \
|
||||||
|
|
||||||
|
CONFIGURE_VARS += \
|
||||||
ac_cv_file_dbd_apr_dbd_mysql_c=no \
|
ac_cv_file_dbd_apr_dbd_mysql_c=no \
|
||||||
APR_BUILD_DIR="$(STAGING_DIR)/usr/share/build-1" \
|
APR_BUILD_DIR="$(STAGING_DIR)/usr/share/build-1" \
|
||||||
CFLAGS="-I$(STAGING_DIR)/usr/lib/libiconv/include/" \
|
|
||||||
LDFLAGS="-ldl -L$(STAGING_DIR)/lib \
|
define Build/Configure
|
||||||
-L$(STAGING_DIR)/usr/lib" \
|
$(call Build/Configure/Default)
|
||||||
)
|
$(call libtool_disable_rpath)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Build/Compile
|
define Build/Compile
|
||||||
$(MAKE) -C $(PKG_BUILD_DIR) \
|
$(MAKE) -C $(PKG_BUILD_DIR) all
|
||||||
DESTDIR="$(PKG_INSTALL_DIR)" \
|
$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
|
||||||
all install
|
$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Build/InstallDev
|
define Build/InstallDev
|
||||||
@ -59,23 +58,27 @@ define Build/InstallDev
|
|||||||
$(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/*aprutil* \
|
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.{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,\"/usr\",$(1)/usr," $(1)/usr/bin/apu-1-config
|
$(SED) 's, -e \"s -I$$$$prefix/lib g\",,g' $(1)/usr/bin/apu-1-config
|
||||||
|
$(SED) 's,^includedir=\"$$$${prefix}/include/,includedir=\"$(1)/usr/include/,g' $(1)/usr/bin/apu-1-config
|
||||||
|
$(SED) 's,-L$$$$libdir,,g' $(1)/usr/bin/apu-1-config
|
||||||
|
$(SED) 's,-R$$$$libdir,,g' $(1)/usr/bin/apu-1-config
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Build/UninstallDev
|
define Build/UninstallDev
|
||||||
rm -rf $(STAGING_DIR)/usr/bin/apu-1-config \
|
rm -rf $(STAGING_DIR)/usr/bin/apu-1-config \
|
||||||
$(STAGING_DIR)/usr/lib/{*aprutil-1*,aprutil.exp} \
|
$(STAGING_DIR)/usr/include/apr-1 \
|
||||||
$(STAGING_DIR)/usr/include/apr-1
|
$(STAGING_DIR)/usr/lib/libaprutil-1.{a,so*} \
|
||||||
|
$(STAGING_DIR)/usr/lib/pkgconfig/apr-util-1.pc
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/apr-util/install
|
define Package/libaprutil/install
|
||||||
$(INSTALL_DIR) $(1)/usr/lib
|
$(INSTALL_DIR) $(1)/usr/lib
|
||||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
|
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.so.* $(1)/usr/lib/
|
||||||
endef
|
endef
|
||||||
|
|
||||||
$(eval $(call BuildPackage,apr-util))
|
$(eval $(call BuildPackage,libaprutil))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user