diff options
| -rw-r--r-- | patches/apr-0.9.20/0001-apr-config.in-add-SYSROOT.patch | 90 | ||||
| -rw-r--r-- | patches/apr-0.9.20/series | 4 | ||||
| -rw-r--r-- | rules/apr.in | 14 | ||||
| -rw-r--r-- | rules/apr.make | 80 |
4 files changed, 0 insertions, 188 deletions
diff --git a/patches/apr-0.9.20/0001-apr-config.in-add-SYSROOT.patch b/patches/apr-0.9.20/0001-apr-config.in-add-SYSROOT.patch deleted file mode 100644 index 9c6ac8d74..000000000 --- a/patches/apr-0.9.20/0001-apr-config.in-add-SYSROOT.patch +++ /dev/null @@ -1,90 +0,0 @@ -From: Marc Kleine-Budde <mkl@pengutronix.de> -Date: Wed, 25 Apr 2012 20:05:58 +0200 -Subject: [PATCH] apr-config.in: add SYSROOT - -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> ---- - Makefile.in | 2 +- - apr-config.in | 14 +++++++------- - 2 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 42139ea..a62c3ed 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -67,7 +67,7 @@ apr-config.out: apr-config - - # Create apr_rules.mk suitable for the install tree - build/apr_rules.out: build/apr_rules.mk -- sed 's,^\(apr_build.*=\).*$$,\1$(installbuilddir),' < build/apr_rules.mk > $@ -+ sed 's,^\(apr_build.*=\).*$$,\1@SYSROOT@$(installbuilddir),' < build/apr_rules.mk > $@ - - install: $(TARGET_LIB) apr-config.out build/apr_rules.out - if [ ! -d $(DESTDIR)$(includedir) ]; then \ -diff --git a/apr-config.in b/apr-config.in -index 9eae645..129be96 100644 ---- a/apr-config.in -+++ b/apr-config.in -@@ -92,7 +92,7 @@ if test $# -eq 0; then - fi - - if test "$location" = "installed"; then -- LA_FILE="$libdir/lib${APR_LIBNAME}.la" -+ LA_FILE="@SYSROOT@$libdir/lib${APR_LIBNAME}.la" - else - LA_FILE="$APR_BUILD_DIR/lib${APR_LIBNAME}.la" - fi -@@ -121,7 +121,7 @@ while test $# -gt 0; do - ;; - --includedir) - if test "$location" = "installed"; then -- flags="$includedir" -+ flags="@SYSROOT@$includedir" - elif test "$location" = "source"; then - flags="$APR_SOURCE_DIR/include" - else -@@ -153,7 +153,7 @@ while test $# -gt 0; do - ;; - --includes) - if test "$location" = "installed"; then -- flags="$flags -I$includedir $EXTRA_INCLUDES" -+ flags="$flags -I@SYSROOT@$includedir $EXTRA_INCLUDES" - elif test "$location" = "source"; then - flags="$flags -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES" - else -@@ -167,7 +167,7 @@ while test $# -gt 0; do - ;; - --installbuilddir) - if test "$location" = "installed"; then -- echo "${installbuilddir}" -+ echo "@SYSROOT@${installbuilddir}" - elif test "$location" = "source"; then - echo "$APR_SOURCE_DIR/build" - else -@@ -183,7 +183,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${APR_LIBNAME}" -+ flags="$flags -L@SYSROOT@$libdir -l${APR_LIBNAME}" - else - ### this surely can't work since the library is in .libs? - flags="$flags -L$APR_BUILD_DIR -l${APR_LIBNAME}" -@@ -198,7 +198,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${APR_LIBNAME}" -+ flags="$flags -L@SYSROOT@$libdir -l${APR_LIBNAME}" - else - flags="$flags $LA_FILE" - fi -@@ -222,7 +222,7 @@ while test $# -gt 0; do - ;; - --apr-libtool) - if test "$location" = "installed"; then -- echo "${installbuilddir}/libtool" -+ echo "@SYSROOT@${installbuilddir}/libtool" - else - echo "$APR_BUILD_DIR/libtool" - fi diff --git a/patches/apr-0.9.20/series b/patches/apr-0.9.20/series deleted file mode 100644 index 9ebc3855e..000000000 --- a/patches/apr-0.9.20/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-apr-config.in-add-SYSROOT.patch -# 6a42fc53b2a27c7e1f088ff3bf8ec133 - git-ptx-patches magic diff --git a/rules/apr.in b/rules/apr.in deleted file mode 100644 index 63b8cea12..000000000 --- a/rules/apr.in +++ /dev/null @@ -1,14 +0,0 @@ -## SECTION=staging -## old section: -### SECTION=networking - -config APR - tristate - prompt "apr" - 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. - - STAGING: remove in ptxdist-2019.03.0 - Really old version that needs updating. diff --git a/rules/apr.make b/rules/apr.make deleted file mode 100644 index 90164fe90..000000000 --- a/rules/apr.make +++ /dev/null @@ -1,80 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2012 by Marc Kleine-Budde <mkl@pengutronix.de> -# -# 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) += apr - -# -# Paths and names -# -APR_VERSION := 0.9.20 -APR_MD5 := 6dd59a88ee75b8cdf719a90b5a2f2485 -APR := apr-$(APR_VERSION) -APR_SUFFIX := tar.bz2 -APR_URL := http://archive.apache.org/dist/apr/$(APR).$(APR_SUFFIX) -APR_SOURCE := $(SRCDIR)/$(APR).$(APR_SUFFIX) -APR_DIR := $(BUILDDIR)/$(APR) -APR_LICENSE := Apache-2.0 - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -APR_CONF_ENV := \ - $(CROSS_ENV) \ - ac_cv_file__dev_zero=yes \ - ac_cv_sizeof_size_t=4 \ - ac_cv_sizeof_ssize_t=4 \ - ac_cv_struct_rlimit=yes \ - apr_cv_mutex_robust_shared=no \ - apr_cv_process_shared_works=yes \ - apr_cv_pthreads_lib="-lpthread" - -# -# autoconf -# -APR_CONF_TOOL := autoconf -APR_CONF_OPT := \ - $(CROSS_AUTOCONF_USR) \ - --enable-threads - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/apr.install.post: - @$(call targetinfo) - @$(call world/install.post, APR) - sed -i -e "s~@SYSROOT@~${PTXDIST_SYSROOT_TARGET}~g" \ - $(PTXDIST_SYSROOT_TARGET)/usr/build/apr_rules.mk - @$(call touch) - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/apr.targetinstall: - @$(call targetinfo) - - @$(call install_init, apr) - @$(call install_fixup, apr,PRIORITY,optional) - @$(call install_fixup, apr,SECTION,base) - @$(call install_fixup, apr,AUTHOR,"Marc Kleine-Budde <mkl@pengutronix.de>") - @$(call install_fixup, apr,DESCRIPTION,missing) - - @$(call install_lib, apr, 0, 0, 0644, libapr-0) - - @$(call install_finish, apr) - - @$(call touch) - -# vim: syntax=make |