[arch-commits] Commit in perl-libapreq2/trunk (2 files)

[Anatol Pomozov]

    Date: Sunday, June 8, 2014 @ 18:38:43
  Author: anatolik
Revision: 112821

upgpkg: perl-libapreq2 2.13-7

Recompile against perl 5.20
Make the module loadable outsize of Apache

Added:
  perl-libapreq2/trunk/link-in-apr-shared-objects.patch
Modified:
  perl-libapreq2/trunk/PKGBUILD

----------------------------------+
 PKGBUILD                         |   18 +++++++++++++-----
 link-in-apr-shared-objects.patch |   28 ++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-06-08 14:23:38 UTC (rev 112820)
+++ PKGBUILD	2014-06-08 16:38:43 UTC (rev 112821)
@@ -4,22 +4,30 @@
 
 pkgname=perl-libapreq2
 pkgver=2.13
-pkgrel=6
+pkgrel=7
 pkgdesc="A safe, standards-compliant, high-performance library used for parsing HTTP cookies, query-strings and POST data."
 arch=('i686' 'x86_64')
 url="http://search.cpan.org/dist/libapreq2"
+options=('!emptydirs')
 depends=('mod_perl' 'apr-util')
 makedepends=('perl-extutils-xsbuilder')
 license=("GPL")
-source=(http://search.cpan.org/CPAN/authors/id/I/IS/ISAAC/libapreq2-$pkgver.tar.gz)
-md5sums=('c11fb0861aa84dcc6cd0f0798b045eee')
+source=(http://search.cpan.org/CPAN/authors/id/I/IS/ISAAC/libapreq2-$pkgver.tar.gz
+        link-in-apr-shared-objects.patch)
+md5sums=('c11fb0861aa84dcc6cd0f0798b045eee'
+         '4cee6d940e95aeb47dd503b8e8a1c7dd')
 
+prepare() {
+  cd $srcdir/libapreq2-$pkgver
+  patch -p1 < ../link-in-apr-shared-objects.patch
+}
+
 build() {
   cd  $srcdir/libapreq2-$pkgver
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL --with-apache2-apxs=/usr/sbin/apxs
+  PERL_MM_USE_DEFAULT=1 perl Makefile.PL --with-apache2-apxs=/usr/bin/apxs --with-mm-opts="INSTALLDIRS=vendor"
   find . -type f -name Makefile -exec sed -i 's#-ldb-5.1#-ldb-5.2#' {} \;
   sed -i 's#-ldb-5.1#-ldb-5.2#' apreq2-config
-  make
+  make LD_RUN_PATH="/usr/lib"  # build sets RPATH to non-sanitized path, force correct rpath
 }
 
 package(){

Added: link-in-apr-shared-objects.patch
===================================================================
--- link-in-apr-shared-objects.patch	                        (rev 0)
+++ link-in-apr-shared-objects.patch	2014-06-08 16:38:43 UTC (rev 112821)
@@ -0,0 +1,28 @@
+Don't try to regenerate Makefiles at installation time, as this will forget
+to link against the internal copy of libapreq2-dev, which will cause problems
+when trying to load the module outside Apache.
+
+Index: libapreq2-2.12/glue/Makefile.am
+===================================================================
+--- libapreq2-2.12.orig/glue/Makefile.am
++++ libapreq2-2.12/glue/Makefile.am
+@@ -15,7 +15,6 @@ perl_test: perl/Makefile
+ 	cd perl; $(MAKE) test
+ 
+ perl_install:
+-	cd perl; INSTALL=1 @PERL@ @PERL_OPTS@ Makefile.PL -apxs @APACHE2_APXS@ @MM_OPTS@
+ 	cd perl; $(MAKE) install
+ 
+ perl_clean:
+Index: libapreq2-2.12/glue/Makefile.in
+===================================================================
+--- libapreq2-2.12.orig/glue/Makefile.in
++++ libapreq2-2.12/glue/Makefile.in
+@@ -265,7 +265,6 @@ perl_test: perl/Makefile
+ 	cd perl; $(MAKE) test
+ 
+ perl_install:
+-	cd perl; INSTALL=1 @PERL@ @PERL_OPTS@ Makefile.PL -apxs @APACHE2_APXS@ @MM_OPTS@
+ 	cd perl; $(MAKE) install
+ 
+ perl_clean: