On 07/01/2014 12:51 PM, Helmut Grohne wrote:
Thanks for the ping (and CCing me).
You're welcome.
I believe that all major concerns raised by me are addressed in the
updated patch. The following documentary concerns apply:
* There is still no changelog entry.
* The patches added or updated have not been updated with Last-Modified
headers according to DEP-3.
Oh, indeed. I missed those.
For timezone differences, I suspect Erwan would be offline by now.
I am attaching a new patch addressing your 2 points above, with proper
credit to Erwan and Ubuntu.
Mark Baker may have a different view and is the one in charge.
Okay.
I shall retry the patch in rebootstrap, but would prefer it being
applied to pcre3 in sid directly.
Yes, and it would help us with /d/ebootstrap too. :)
Thank you again for your review and comments,
--
Mauricio Faria de Oliveira
IBM Linux Technology Center
diff -Nru pcre3-8.31/debian/changelog pcre3-8.31/debian/changelog
--- pcre3-8.31/debian/changelog 2014-04-23 17:00:42.000000000 -0300
+++ pcre3-8.31/debian/changelog 2014-07-01 13:11:19.000000000 -0300
@@ -1,3 +1,12 @@
+pcre3 (1:8.31-5.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS on ppc64el (patches by Ubuntu, collection by Erwan Prioul);
Closes: 751390
+ - Build with dh-autoreconf (requires update to soname.patch)
+ - Disable JIT on ppc64el (no_jit_ppc64el.patch)
+
+ -- Mauricio Faria de Oliveira <mauri...@linux.vnet.ibm.com> Tue, 01 Jul 2014
13:07:49 -0300
+
pcre3 (1:8.31-5) unstable; urgency=medium
* Previous attempt at detecting JIT support didn't work when cross
diff -Nru pcre3-8.31/debian/control pcre3-8.31/debian/control
--- pcre3-8.31/debian/control 2013-01-03 18:27:02.000000000 -0200
+++ pcre3-8.31/debian/control 2014-07-01 13:11:14.000000000 -0300
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Mark Baker <m...@mnb.org.uk>
Standards-Version: 3.9.3
-Build-Depends: debhelper (>= 5.0.22), dpkg-dev (>= 1.16.0)
+Build-Depends: debhelper (>= 5.0.22), dpkg-dev (>= 1.16.0), dh-autoreconf
Package: libpcre3
Section: libs
diff -Nru pcre3-8.31/debian/patches/no_jit_ppc64el.patch
pcre3-8.31/debian/patches/no_jit_ppc64el.patch
--- pcre3-8.31/debian/patches/no_jit_ppc64el.patch 1969-12-31
21:00:00.000000000 -0300
+++ pcre3-8.31/debian/patches/no_jit_ppc64el.patch 2014-07-01
13:11:14.000000000 -0300
@@ -0,0 +1,19 @@
+Description: Disable JIT on ppc64el, needs explicit porting to ELFv2.
+Author: Adam Conrad <adcon...@ubuntu.com>
+Last-Update: 2014-07-01
+
+--- pcre3-8.31.orig/sljit/sljitConfigInternal.h
++++ pcre3-8.31/sljit/sljitConfigInternal.h
+@@ -94,7 +94,11 @@
+ #define SLJIT_CONFIG_ARM_V5 1
+ #endif
+ #elif defined(__ppc64__) || defined(__powerpc64__)
+-#define SLJIT_CONFIG_PPC_64 1
++# if _CALL_ELF != 2
++# define SLJIT_CONFIG_PPC_64 1
++# else
++# define SLJIT_CONFIG_UNSUPPORTED 1
++# endif
+ #elif defined(__ppc__) || defined(__powerpc__)
+ #define SLJIT_CONFIG_PPC_32 1
+ #elif defined(__mips__)
diff -Nru pcre3-8.31/debian/patches/series pcre3-8.31/debian/patches/series
--- pcre3-8.31/debian/patches/series 2012-09-13 15:51:33.000000000 -0300
+++ pcre3-8.31/debian/patches/series 2014-07-01 13:11:14.000000000 -0300
@@ -4,3 +4,4 @@
pcregrep.1-patch
soname.patch
bug1287
+no_jit_ppc64el.patch
diff -Nru pcre3-8.31/debian/patches/soname.patch
pcre3-8.31/debian/patches/soname.patch
--- pcre3-8.31/debian/patches/soname.patch 2012-09-13 15:48:44.000000000
-0300
+++ pcre3-8.31/debian/patches/soname.patch 2014-07-01 13:11:14.000000000
-0300
@@ -1,23 +1,21 @@
From: Mark Baker <m...@mnb.org.uk>
Description: Change soname to what debian use
-Index: pcre3-8.31/configure
+Last-Update: 2014-07-01
+
+Index: b/configure.ac
===================================================================
---- pcre3-8.31.orig/configure 2012-07-06 10:02:02.000000000 +0100
-+++ pcre3-8.31/configure 2012-09-13 19:47:13.000000000 +0100
-@@ -17190,13 +17190,13 @@
- # (Note: The libpcre*_version bits are m4 variables, assigned above)
+--- a/configure.ac
++++ b/configure.ac
+@@ -17,9 +17,9 @@
+ # 50 lines of this file. Please update that if the variables above are moved.
- EXTRA_LIBPCRE_LDFLAGS="$EXTRA_LIBPCRE_LDFLAGS \
-- $NO_UNDEFINED -version-info 1:1:0"
-+ $NO_UNDEFINED -version-info 16:1:13"
+ # Libtool shared library interface versions (current:revision:age)
+-m4_define(libpcre_version, [1:1:0])
+-m4_define(libpcre16_version, [0:1:0])
+-m4_define(libpcreposix_version, [0:1:0])
++m4_define(libpcre_version, [16:1:13])
++m4_define(libpcre16_version, [16:1:13])
++m4_define(libpcreposix_version, [16:1:13])
+ m4_define(libpcrecpp_version, [0:0:0])
- EXTRA_LIBPCRE16_LDFLAGS="$EXTRA_LIBPCRE16_LDFLAGS \
-- $NO_UNDEFINED -version-info 0:1:0"
-+ $NO_UNDEFINED -version-info 16:1:13"
-
- EXTRA_LIBPCREPOSIX_LDFLAGS="$EXTRA_LIBPCREPOSIX_LDFLAGS \
-- $NO_UNDEFINED -version-info 0:1:0"
-+ $NO_UNDEFINED -version-info 16:1:13"
-
- EXTRA_LIBPCRECPP_LDFLAGS="$EXTRA_LIBPCRECPP_LDFLAGS \
- $NO_UNDEFINED -version-info 0:0:0 \
+ AC_PREREQ(2.57)
diff -Nru pcre3-8.31/debian/rules pcre3-8.31/debian/rules
--- pcre3-8.31/debian/rules 2014-04-23 17:00:45.000000000 -0300
+++ pcre3-8.31/debian/rules 2014-07-01 13:11:14.000000000 -0300
@@ -27,9 +27,10 @@
INSTALL_PROGRAM += -s
endif
-config.status: configure
+configure-stamp:
dh_testdir
# Add here commands to configure the package.
+ dh_autoreconf
CC_FOR_BUILD=cc CFLAGS="$(CFLAGS)" ./configure \
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr --mandir=\$${prefix}/share/man \
@@ -38,11 +39,12 @@
--enable-utf8 --enable-unicode-properties \
--disable-silent-rules \
$(shell . debian/jit-test)
+ touch configure-stamp
build: build-arch build-indep
build-arch: build-stamp
build-indep: build-stamp
-build-stamp: config.status
+build-stamp: configure-stamp
dh_testdir
# Add here commands to compile the package.
@@ -53,10 +55,10 @@
touch build-stamp
-clean: config.status
+clean:
dh_testdir
dh_testroot
- rm -f build-stamp
+ rm -f configure-stamp build-stamp
# Add here commands to clean up after the build process.
[ ! -f Makefile ] || $(MAKE) distclean
### -test -r /usr/share/misc/config.sub && \
@@ -64,6 +66,7 @@
### -test -r /usr/share/misc/config.guess && \
### cp -f /usr/share/misc/config.guess config.guess
rm -f dftables testsavedregex
+ dh_autoreconf_clean
dh_clean
install: build
