From ad45b874d6d91a34723bcfcd749a8c4b6463c2f0 Mon Sep 17 00:00:00 2001 From: cyrus Date: Sun, 13 Jul 2014 10:51:20 +0000 Subject: [PATCH] apr: moved to github git-svn-id: svn://svn.openwrt.org/openwrt/packages@41608 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- libs/apr/Makefile | 77 ----------------------------- libs/apr/patches/001-autoconf-compat.patch | 22 --------- libs/apr/patches/101-fix_apr_time_now.patch | 13 ----- 3 files changed, 112 deletions(-) delete mode 100644 libs/apr/Makefile delete mode 100644 libs/apr/patches/001-autoconf-compat.patch delete mode 100644 libs/apr/patches/101-fix_apr_time_now.patch diff --git a/libs/apr/Makefile b/libs/apr/Makefile deleted file mode 100644 index 3027678aa..000000000 --- a/libs/apr/Makefile +++ /dev/null @@ -1,77 +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 -PKG_VERSION:=1.4.5 -PKG_RELEASE:=2 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://www.ibiblio.org/pub/mirrors/apache/apr -PKG_MD5SUM:=8b53f5a5669d0597f2da889a2f576eb6 - -PKG_FIXUP:=autoreconf -PKG_REMOVE_FILES:=aclocal.m4 build/ltmain.sh - -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/libapr - SECTION:=libs - CATEGORY:=Libraries - DEPENDS:=+libpthread +librt +libuuid - TITLE:=Apache Portable Runtime 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-devrandom=/dev/urandom \ - --disable-dso \ - --enable-ipv6 - -# XXX: ac_cv_sizeof_struct_iovec=1 is just to trick configure -CONFIGURE_VARS += \ - ac_cv_sizeof_struct_iovec=1 \ - ac_cv_struct_rlimit=yes \ - apr_cv_process_shared_works=no \ - apr_cv_mutex_robust_shared=no \ - apr_cv_tcp_nodelay_with_cork=yes \ - apr_cv_use_lfs64=yes \ - LDFLAGS="$$$$LDFLAGS -lpthread" \ - -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 - $(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/ -endef - -$(eval $(call BuildPackage,libapr)) diff --git a/libs/apr/patches/001-autoconf-compat.patch b/libs/apr/patches/001-autoconf-compat.patch deleted file mode 100644 index 8170572bc..000000000 --- a/libs/apr/patches/001-autoconf-compat.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -3,6 +3,7 @@ srcdir=@srcdir@ - VPATH=@srcdir@ - top_srcdir=@apr_srcdir@ - top_blddir=@apr_builddir@ -+top_builddir=@top_builddir@ - - # - # APR (Apache Portable Runtime) library Makefile. ---- a/configure.in -+++ b/configure.in -@@ -246,9 +246,6 @@ case $host in - gcc $CFLAGS $CPPFLAGS -o $LIBTOOL.exe $LIBTOOL.c - ;; - *) -- if test "x$LTFLAGS" = "x"; then -- LTFLAGS='--silent' -- fi - if test "$experimental_libtool" = "yes"; then - # Use a custom-made libtool replacement - echo "using jlibtool" diff --git a/libs/apr/patches/101-fix_apr_time_now.patch b/libs/apr/patches/101-fix_apr_time_now.patch deleted file mode 100644 index 6ad14a37c..000000000 --- a/libs/apr/patches/101-fix_apr_time_now.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://dev.openwrt.org/ticket/9287 - ---- a/time/unix/time.c -+++ b/time/unix/time.c -@@ -75,7 +75,7 @@ APR_DECLARE(apr_time_t) apr_time_now(voi - { - struct timeval tv; - gettimeofday(&tv, NULL); -- return tv.tv_sec * APR_USEC_PER_SEC + tv.tv_usec; -+ return tv.tv_sec * (apr_time_t)APR_USEC_PER_SEC + (apr_time_t)tv.tv_usec; - } - - static void explode_time(apr_time_exp_t *xt, apr_time_t t, -- 2.11.0