From d7d15730d6d54d481dbe8494a1f6d34ce2ce42b9 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Fri, 1 Mar 2019 12:12:01 +0100 Subject: apr-util: remove after on year in staging Signed-off-by: Michael Olbrich --- .../0001-apu-config-add-SYSROOT.patch | 58 --------------------- ...kefile-fallback-to-gen_uri_delims-from-PA.patch | 19 ------- patches/apr-util-0.9.19/series | 5 -- rules/apr-util.in | 20 -------- rules/apr-util.make | 60 ---------------------- 5 files changed, 162 deletions(-) delete mode 100644 patches/apr-util-0.9.19/0001-apu-config-add-SYSROOT.patch delete mode 100644 patches/apr-util-0.9.19/0002-HACK-uri-Makefile-fallback-to-gen_uri_delims-from-PA.patch delete mode 100644 patches/apr-util-0.9.19/series delete mode 100644 rules/apr-util.in delete mode 100644 rules/apr-util.make diff --git a/patches/apr-util-0.9.19/0001-apu-config-add-SYSROOT.patch b/patches/apr-util-0.9.19/0001-apu-config-add-SYSROOT.patch deleted file mode 100644 index 025f7a27a..000000000 --- a/patches/apr-util-0.9.19/0001-apu-config-add-SYSROOT.patch +++ /dev/null @@ -1,58 +0,0 @@ -From: Marc Kleine-Budde -Date: Thu, 26 Apr 2012 13:03:39 +0200 -Subject: [PATCH] apu-config: add SYSROOT - -Signed-off-by: Marc Kleine-Budde ---- - apu-config.in | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/apu-config.in b/apu-config.in -index f05360c..3d669e7 100644 ---- a/apu-config.in -+++ b/apu-config.in -@@ -78,7 +78,7 @@ if test $# -eq 0; then - fi - - if test "$location" = "installed"; then -- LA_FILE="$libdir/lib${APRUTIL_LIBNAME}.la" -+ LA_FILE="${SYSROOT}$libdir/lib${APRUTIL_LIBNAME}.la" - - LIBS=`echo "$LIBS" | sed -e "s $APU_BUILD_DIR/xml/expat $prefix g" -e "s $prefix/libexpat.la -lexpat g"` - LDFLAGS=`echo "$LDFLAGS" | sed -e "s $APU_BUILD_DIR/xml/expat $prefix g"` -@@ -114,7 +114,7 @@ while test $# -gt 0; do - ;; - --includedir) - if test "$location" = "installed"; then -- flags="$includedir" -+ flags="${SYSROOT}$includedir" - elif test "$location" = "source"; then - flags="$APU_SOURCE_DIR/include" - else -@@ -126,7 +126,7 @@ while test $# -gt 0; do - ;; - --includes) - if test "$location" = "installed"; then -- flags="$flags -I$includedir $INCLUDES" -+ flags="$flags -I${SYSROOT}$includedir $INCLUDES" - elif test "$location" = "source"; then - flags="$flags -I$APU_SOURCE_DIR/include $INCLUDES" - else -@@ -148,7 +148,7 @@ while test $# -gt 0; do - --link-ld) - if test "$location" = "installed"; then - ### avoid using -L if libdir is a "standard" location like /usr/lib -- flags="$flags -L$libdir -l$APRUTIL_LIBNAME" -+ flags="$flags -L${SYSROOT}$libdir -l$APRUTIL_LIBNAME" - else - flags="$flags -L$APU_BUILD_DIR -l$APRUTIL_LIBNAME" - fi -@@ -162,7 +162,7 @@ while test $# -gt 0; do - flags="$flags $LA_FILE" - elif test "$location" = "installed"; then - ### avoid using -L if libdir is a "standard" location like /usr/lib -- flags="$flags -L$libdir -l$APRUTIL_LIBNAME" -+ flags="$flags -L${SYSROOT}$libdir -l$APRUTIL_LIBNAME" - else - flags="$flags $LA_FILE" - fi diff --git a/patches/apr-util-0.9.19/0002-HACK-uri-Makefile-fallback-to-gen_uri_delims-from-PA.patch b/patches/apr-util-0.9.19/0002-HACK-uri-Makefile-fallback-to-gen_uri_delims-from-PA.patch deleted file mode 100644 index a25da074f..000000000 --- a/patches/apr-util-0.9.19/0002-HACK-uri-Makefile-fallback-to-gen_uri_delims-from-PA.patch +++ /dev/null @@ -1,19 +0,0 @@ -From: Marc Kleine-Budde -Date: Thu, 26 Apr 2012 09:50:17 +0200 -Subject: [PATCH] HACK: uri/Makefile: fallback to gen_uri_delims from $PATH - -Signed-off-by: Marc Kleine-Budde ---- - uri/Makefile.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/uri/Makefile.in b/uri/Makefile.in -index 37d2f06..cac644e 100644 ---- a/uri/Makefile.in -+++ b/uri/Makefile.in -@@ -15,4 +15,4 @@ gen_uri_delims: $(gen_uri_delims_OBJECTS) - apr_uri.lo: uri_delims.h apr_uri.c - - uri_delims.h: gen_uri_delims -- ./gen_uri_delims > uri_delims.h -+ ./gen_uri_delims > uri_delims.h || gen_uri_delims > uri_delims.h diff --git a/patches/apr-util-0.9.19/series b/patches/apr-util-0.9.19/series deleted file mode 100644 index d024277bd..000000000 --- a/patches/apr-util-0.9.19/series +++ /dev/null @@ -1,5 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-apu-config-add-SYSROOT.patch -0002-HACK-uri-Makefile-fallback-to-gen_uri_delims-from-PA.patch -# b515dde9e38a53e6df537b9e537b48e5 - git-ptx-patches magic diff --git a/rules/apr-util.in b/rules/apr-util.in deleted file mode 100644 index 6f73ae3f1..000000000 --- a/rules/apr-util.in +++ /dev/null @@ -1,20 +0,0 @@ -## SECTION=staging -## old section: -### SECTION=networking - -config APR_UTIL - tristate - select APR - select HOST_APR_UTIL - select EXPAT - prompt "apr-util" - help - APR is Apache's Portable Runtime Library, designed to be a - support library that provides a predictable and consistent - interface to underlying platform-specific implementations. - APR Util is a utilities library implemented on top of apr, - providing database access, xml parsing, and other useful - functionality. - - STAGING: remove in ptxdist-2019.03.0 - Really old version that needs updating. diff --git a/rules/apr-util.make b/rules/apr-util.make deleted file mode 100644 index b9db68605..000000000 --- a/rules/apr-util.make +++ /dev/null @@ -1,60 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2012 by Marc Kleine-Budde -# -# See CREDITS for details about who has contributed to this project. -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_APR_UTIL) += apr-util - -# -# Paths and names -# -APR_UTIL_VERSION := 0.9.19 -APR_UTIL_MD5 := 927a200513018a579cc9936c05d35206 -APR_UTIL := apr-util-$(APR_UTIL_VERSION) -APR_UTIL_SUFFIX := tar.bz2 -APR_UTIL_URL := http://archive.apache.org/dist/apr/$(APR_UTIL).$(APR_UTIL_SUFFIX) -APR_UTIL_SOURCE := $(SRCDIR)/$(APR_UTIL).$(APR_UTIL_SUFFIX) -APR_UTIL_DIR := $(BUILDDIR)/$(APR_UTIL) -APR_UTIL_LICENSE := Apache-2.0 - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -# -# autoconf -# -APR_UTIL_CONF_TOOL := autoconf -APR_UTIL_CONF_OPT := \ - $(CROSS_AUTOCONF_USR) \ - --with-apr=$(PTXDIST_SYSROOT_CROSS)/bin/apr-config \ - --with-expat=$(PTXDIST_SYSROOT_TARGET)/usr - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/apr-util.targetinstall: - @$(call targetinfo) - - @$(call install_init, apr-util) - @$(call install_fixup, apr-util,PRIORITY,optional) - @$(call install_fixup, apr-util,SECTION,base) - @$(call install_fixup, apr-util,AUTHOR,"Marc Kleine-Budde ") - @$(call install_fixup, apr-util,DESCRIPTION,missing) - - @$(call install_lib, apr-util, 0, 0, 0644, libaprutil-0) - - @$(call install_finish, apr-util) - - @$(call touch) - -# vim: syntax=make -- cgit v1.2.3