[arch-commits] Commit in apr/repos (7 files)

Evangelos Foutras foutrelis at archlinux.org
Sat May 16 14:09:37 UTC 2020


    Date: Saturday, May 16, 2020 @ 14:09:37
  Author: foutrelis
Revision: 384751

archrelease: copy trunk to staging-x86_64

Added:
  apr/repos/staging-x86_64/
  apr/repos/staging-x86_64/PKGBUILD
    (from rev 384749, apr/trunk/PKGBUILD)
  apr/repos/staging-x86_64/dont_override_external_buildflags
    (from rev 384749, apr/trunk/dont_override_external_buildflags)
  apr/repos/staging-x86_64/fix-apr.pc.patch
    (from rev 384749, apr/trunk/fix-apr.pc.patch)
  apr/repos/staging-x86_64/fix_apr-config.patch
    (from rev 384749, apr/trunk/fix_apr-config.patch)
  apr/repos/staging-x86_64/omit_extra_libs.patch
    (from rev 384749, apr/trunk/omit_extra_libs.patch)
  apr/repos/staging-x86_64/ship_find_apr.m4.patch
    (from rev 384749, apr/trunk/ship_find_apr.m4.patch)

-----------------------------------+
 PKGBUILD                          |   58 ++++++++++++++++++++++++++++++++++++
 dont_override_external_buildflags |   21 +++++++++++++
 fix-apr.pc.patch                  |   20 ++++++++++++
 fix_apr-config.patch              |   33 ++++++++++++++++++++
 omit_extra_libs.patch             |   20 ++++++++++++
 ship_find_apr.m4.patch            |   25 +++++++++++++++
 6 files changed, 177 insertions(+)

Copied: apr/repos/staging-x86_64/PKGBUILD (from rev 384749, apr/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2020-05-16 14:09:37 UTC (rev 384751)
@@ -0,0 +1,58 @@
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=apr
+pkgver=1.7.0
+pkgrel=3
+pkgdesc='The Apache Portable Runtime'
+arch=('x86_64')
+url='https://apr.apache.org/'
+depends=('util-linux')
+makedepends=('python')
+license=('APACHE')
+source=(https://www-us.apache.org/dist/apr/apr-$pkgver.tar.bz2{,.asc}
+        fix_apr-config.patch
+        ship_find_apr.m4.patch
+        fix-apr.pc.patch
+        omit_extra_libs.patch
+        dont_override_external_buildflags)
+sha256sums=('e2e148f0b2e99b8e5c6caa09f6d4fb4dd3e83f744aa72a952f94f5a14436f7ea'
+            'SKIP'
+            '91490ffee726f851edad9fc733ac6632aaf434a87920e706eeb132a97ee5f402'
+            '315932ef6536fc0644c1efe770ceb3bb675c3c7103a7cbb2f02efd8be03eb752'
+            '12595d331b48be9e44bd843635eb4f0f500bd213e197a551a9d383a28a24641f'
+            '3d491d3af8fb5a75db4e085a17e5d8dcbe058bd256ef893ee779dc97fc9f8ad6'
+            '5ac0bdc532479f6082d29115ac9d3ca24524fd8b97a556568755b88e5a68e3df')
+validpgpkeys=('5B5181C2C0AB13E59DA3F7A3EC582EB639FF092C'  # Jeff Trawick
+              'B1B96F45DFBDCCF974019235193F180AB55D9977') # Nick Kew <niq at apache.org>
+
+prepare() {
+  cd apr-$pkgver
+  patch -Np1 -i ../fix_apr-config.patch
+  patch -Np1 -i ../ship_find_apr.m4.patch
+  patch -Np1 -i ../fix-apr.pc.patch
+  patch -Np1 -i ../omit_extra_libs.patch
+  patch -Np1 -i ../dont_override_external_buildflags
+  ./buildconf
+}
+
+build() {
+  cd apr-$pkgver
+  ./configure --prefix=/usr --includedir=/usr/include/apr-1 \
+    --with-installbuilddir=/usr/share/apr-1/build \
+    --enable-nonportable-atomics \
+    --with-devrandom=/dev/urandom --disable-static
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make
+}
+
+check() {
+  cd apr-$pkgver
+  make -j1 check
+}
+
+package() {
+  cd apr-$pkgver
+  make DESTDIR="$pkgdir" install
+}

Copied: apr/repos/staging-x86_64/dont_override_external_buildflags (from rev 384749, apr/trunk/dont_override_external_buildflags)
===================================================================
--- staging-x86_64/dont_override_external_buildflags	                        (rev 0)
+++ staging-x86_64/dont_override_external_buildflags	2020-05-16 14:09:37 UTC (rev 384751)
@@ -0,0 +1,21 @@
+# Don't force apr-using projects to use the compile flags used during
+# apr's compilation.
+Index: apr/build/apr_rules.mk.in
+===================================================================
+--- apr.orig/build/apr_rules.mk.in	2010-04-21 17:20:26.000000000 +0200
++++ apr/build/apr_rules.mk.in	2013-11-01 21:22:19.655108671 +0100
+@@ -41,10 +41,10 @@
+ # compilation and linking flags that are supposed to be set only by the user.
+ # configure adds to them for tests, but we restore them at the end.
+ #
+-CFLAGS=@CFLAGS@
+-CPPFLAGS=@CPPFLAGS@
+-LDFLAGS=@LDFLAGS@
+-LIBS=@LIBS@
++CFLAGS?=@CFLAGS@
++CPPFLAGS?=@CPPFLAGS@
++LDFLAGS?=@LDFLAGS@
++LIBS?=@LIBS@
+ DEFS=@DEFS@
+ 
+ # anything added to the standard flags by configure is moved to EXTRA_*

Copied: apr/repos/staging-x86_64/fix-apr.pc.patch (from rev 384749, apr/trunk/fix-apr.pc.patch)
===================================================================
--- staging-x86_64/fix-apr.pc.patch	                        (rev 0)
+++ staging-x86_64/fix-apr.pc.patch	2020-05-16 14:09:37 UTC (rev 384751)
@@ -0,0 +1,20 @@
+From: <tfheen at debian.org>
+Subject: No description.
+
+---
+ apr.pc.in |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+Index: apr/apr.pc.in
+===================================================================
+--- apr.orig/apr.pc.in
++++ apr/apr.pc.in
+@@ -7,5 +7,6 @@
+ Name: APR
+ Description: The Apache Portable Runtime library
+ Version: @APR_DOTTED_VERSION@
+-Libs: -L${libdir} -l at APR_LIBNAME@ @EXTRA_LIBS@
+-Cflags: @EXTRA_CPPFLAGS@ @EXTRA_CFLAGS@ -I${includedir}
++Libs: -L${libdir} -l at APR_LIBNAME@
++Libs.private: @EXTRA_LIBS@
++Cflags: @EXTRA_CPPFLAGS@ -I${includedir}

Copied: apr/repos/staging-x86_64/fix_apr-config.patch (from rev 384749, apr/trunk/fix_apr-config.patch)
===================================================================
--- staging-x86_64/fix_apr-config.patch	                        (rev 0)
+++ staging-x86_64/fix_apr-config.patch	2020-05-16 14:09:37 UTC (rev 384751)
@@ -0,0 +1,33 @@
+From: <tfheen at debian.org>
+Subject: No description.
+
+---
+ apr-config.in |    8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+Index: apr/apr-config.in
+===================================================================
+--- apr.orig/apr-config.in
++++ apr/apr-config.in
+@@ -39,7 +39,7 @@
+ LIBS="@EXTRA_LIBS@"
+ EXTRA_INCLUDES="@EXTRA_INCLUDES@"
+ SHLIBPATH_VAR="@shlibpath_var@"
+-APR_SOURCE_DIR="@apr_srcdir@"
++APR_SOURCE_DIR="$(cd @installbuilddir@/.. ; pwd)"
+ APR_BUILD_DIR="@apr_builddir@"
+ APR_SO_EXT="@so_ext@"
+ APR_LIB_TARGET="@export_lib_target@"
+@@ -223,11 +223,7 @@
+     exit 0
+     ;;
+     --apr-libtool)
+-    if test "$location" = "installed"; then
+-        echo "${installbuilddir}/libtool"
+-    else
+-        echo "$APR_BUILD_DIR/libtool"
+-    fi
++        echo "$installbuilddir/libtool"
+     exit 0
+     ;;
+     --help)

Copied: apr/repos/staging-x86_64/omit_extra_libs.patch (from rev 384749, apr/trunk/omit_extra_libs.patch)
===================================================================
--- staging-x86_64/omit_extra_libs.patch	                        (rev 0)
+++ staging-x86_64/omit_extra_libs.patch	2020-05-16 14:09:37 UTC (rev 384751)
@@ -0,0 +1,20 @@
+From: Stefan Fritsch <sf at debian.org>
+Subject: #463399
+
+---
+ apr-config.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: apr/apr-config.in
+===================================================================
+--- apr.orig/apr-config.in
++++ apr/apr-config.in
+@@ -36,7 +36,7 @@
+ CPPFLAGS="@EXTRA_CPPFLAGS@"
+ CFLAGS="@EXTRA_CFLAGS@"
+ LDFLAGS="@EXTRA_LDFLAGS@"
+-LIBS="@EXTRA_LIBS@"
++LIBS=""
+ EXTRA_INCLUDES="@EXTRA_INCLUDES@"
+ SHLIBPATH_VAR="@shlibpath_var@"
+ APR_SOURCE_DIR="$(cd @installbuilddir@/.. ; pwd)"

Copied: apr/repos/staging-x86_64/ship_find_apr.m4.patch (from rev 384749, apr/trunk/ship_find_apr.m4.patch)
===================================================================
--- staging-x86_64/ship_find_apr.m4.patch	                        (rev 0)
+++ staging-x86_64/ship_find_apr.m4.patch	2020-05-16 14:09:37 UTC (rev 384751)
@@ -0,0 +1,25 @@
+From: Tollef Fog Heen <tfheen at err.no>
+Subject: Install a set of random build files too
+
+---
+ Makefile.in |    9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+--- apr.orig/Makefile.in
++++ apr/Makefile.in
+@@ -92,6 +92,15 @@ install: $(TARGETS)
+ 	done
+ 	$(INSTALL_DATA) build/apr_rules.out $(DESTDIR)$(installbuilddir)/apr_rules.mk
+ 	$(INSTALL) -m 755 apr-config.out $(DESTDIR)$(bindir)/$(APR_CONFIG)
++
++	if [ ! -d $(DESTDIR)$(installbuilddir) ]; then \
++	    $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(installbuilddir); \
++	fi
++	for file in find_apr.m4 apr_common.m4 install.sh gen-build.py get-version.sh ; do \
++		$(LIBTOOL) --mode=install cp $(top_srcdir)/build/$$file \
++	    $(DESTDIR)$(installbuilddir)/$$file	; \
++	done
++
+ 	@if [ $(INSTALL_SUBDIRS) != "none" ]; then \
+             for i in $(INSTALL_SUBDIRS); do \
+ 	        ( cd $$i ; $(MAKE) DESTDIR=$(DESTDIR) install ); \


More information about the arch-commits mailing list