From 448b73fd5d7d5be17254cf0c7230cc7332499047 Mon Sep 17 00:00:00 2001 From: cyrus Date: Sun, 13 Jul 2014 10:51:21 +0000 Subject: [PATCH] apr-util: moved to github git-svn-id: svn://svn.openwrt.org/openwrt/packages@41609 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- libs/apr-util/Makefile | 75 ------------------------- libs/apr-util/patches/001-automake-compat.patch | 21 ------- 2 files changed, 96 deletions(-) delete mode 100644 libs/apr-util/Makefile delete mode 100644 libs/apr-util/patches/001-automake-compat.patch diff --git a/libs/apr-util/Makefile b/libs/apr-util/Makefile deleted file mode 100644 index fb34a5599..000000000 --- a/libs/apr-util/Makefile +++ /dev/null @@ -1,75 +0,0 @@ -# -# Copyright (C) 2007-2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=apr-util -PKG_VERSION:=1.3.12 -PKG_RELEASE:=2 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://www.ibiblio.org/pub/mirrors/apache/apr -PKG_MD5SUM:=0f671b037ca62751a8a7005578085560 - -PKG_FIXUP:=autoreconf -PKG_REMOVE_FILES:=aclocal.m4 build/ltmain.sh - -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/nls.mk - -define Package/libaprutil - SECTION:=libs - CATEGORY:=Libraries - DEPENDS:=+libapr +libexpat +libsqlite3 +libuuid $(ICONV_DEPENDS) - TITLE:=Apache Portable Runtime Utility Library - URL:=http://apr.apache.org/ -endef - -TARGET_CFLAGS += $(FPIC) -TARGET_CPPFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE - -CONFIGURE_ARGS += \ - --with-pgsql=no \ - --with-apr="$(STAGING_DIR)/usr/bin/apr-1-config" \ - --with-expat="$(STAGING_DIR)/usr" \ - --without-sqlite2 \ - --with-sqlite3="$(STAGING_DIR)/usr" \ - --with-iconv="$(ICONV_PREFIX)" \ - -CONFIGURE_VARS += \ - ac_cv_file_dbd_apr_dbd_mysql_c=no \ - ac_cv_path_ODBC_CONFIG= \ - APR_BUILD_DIR="$(STAGING_DIR)/usr/share/build-1" \ - -MAKE_FLAGS += \ - APRUTIL_LIBS="-lsqlite3 $(TARGET_LDFLAGS) -lexpat $(if $(ICONV_FULL),-liconv) -lapr-1 -luuid -lm -lcrypt" \ - -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/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/apr-1/* \ - $(1)/usr/include/apr-1/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.{la,a,so*} \ - $(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 - $(SED) 's,^libdir=\"$$$${exec_prefix}/lib,libdir=\"$(STAGING_DIR)/usr/lib,g' $(1)/usr/bin/apu-1-config - $(SED) 's,^includedir=\"$$$${prefix}/include/,includedir=\"$(STAGING_DIR)/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 - -define Package/libaprutil/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.so.* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libaprutil)) diff --git a/libs/apr-util/patches/001-automake-compat.patch b/libs/apr-util/patches/001-automake-compat.patch deleted file mode 100644 index d8071c5fd..000000000 --- a/libs/apr-util/patches/001-automake-compat.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -8,6 +8,7 @@ APRUTIL_MAJOR_VERSION=@APRUTIL_MAJOR_VER - APRUTIL_DOTTED_VERSION=@APRUTIL_DOTTED_VERSION@ - - srcdir = @srcdir@ -+top_builddir = @top_builddir@ - VPATH = @srcdir@ - - INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@ ---- a/configure.in -+++ b/configure.in -@@ -40,6 +40,8 @@ AC_SUBST(APU_CONFIG_LOCATION) - AC_CANONICAL_SYSTEM - - AC_PROG_INSTALL -+AC_PROG_LIBTOOL -+LT_INIT - - # Use -no-install to link the test programs on all platforms - # but Darwin, where it would cause the programs to be linked -- 2.11.0