[arch-commits] Commit in pcre/repos (4 files)
Eric Belanger
eric at archlinux.org
Wed May 14 03:03:52 UTC 2008
Date: Tuesday, May 13, 2008 @ 23:03:52
Author: eric
Revision: 1629
Merged revisions 2-1628 via svnmerge from
svn+ssh://svn.archlinux.org/home/svn-packages/pcre/trunk
........
r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
Added svn:keywords to all PKGBUILDs
........
r1480 | eric | 2008-05-10 20:57:17 -0400 (Sat, 10 May 2008) | 2 lines
upgpkg: pcre 7.7-1
Upstream update, Added ChangeLog
........
Added:
pcre/repos/core-x86_64/ChangeLog
(from rev 1480, pcre/trunk/ChangeLog)
Modified:
pcre/repos/core-x86_64/ (properties)
pcre/repos/core-x86_64/PKGBUILD
Deleted:
pcre/repos/core-x86_64/no_arg.patch
--------------+
ChangeLog | 5 +++++
PKGBUILD | 14 ++++++--------
no_arg.patch | 18 ------------------
3 files changed, 11 insertions(+), 26 deletions(-)
Property changes on: pcre/repos/core-x86_64
___________________________________________________________________
Name: svnmerge-integrated
- /pcre/trunk:1
+ /pcre/trunk:1-1628
Copied: pcre/repos/core-x86_64/ChangeLog (from rev 1480, pcre/trunk/ChangeLog)
===================================================================
--- core-x86_64/ChangeLog (rev 0)
+++ core-x86_64/ChangeLog 2008-05-14 03:03:52 UTC (rev 1629)
@@ -0,0 +1,5 @@
+2008-05-10 Eric Belanger <eric at archlinux.org>
+
+ * pcre 7.7-1
+ * Upstream update
+ * Added ChangeLog
Modified: core-x86_64/PKGBUILD
===================================================================
--- core-x86_64/PKGBUILD 2008-05-14 03:03:05 UTC (rev 1628)
+++ core-x86_64/PKGBUILD 2008-05-14 03:03:52 UTC (rev 1629)
@@ -3,24 +3,22 @@
# Contributor: John Proctor <jproctor at prium.net>
pkgname=pcre
-pkgver=7.6
-pkgrel=3
+pkgver=7.7
+pkgrel=1
pkgdesc="A library that implements Perl 5-style regular expressions"
arch=('i686' 'x86_64')
url="http://pcre.sourceforge.net"
license=('custom')
groups=('base')
depends=('gcc-libs')
-options=('!libtool')
-source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2
- no_arg.patch)
-md5sums=('2af38e083fb90ef60fa9eda7cc290e86'
- '9adcec8fce27628753a89f67b52c6ff2')
+options=('!libtool' '!makeflags')
+source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('4b2e9cde1f7227448dddba59843efa0b')
+sha1sums=('f1f54d3e13e6cb427de962e62eaaee32c74cba38')
build() {
cd ${startdir}/src/${pkgname}-${pkgver}
[ "${CARCH}" = "x86_64" ] && export CFLAGS="${CFLAGS} -fPIC"
- patch -Np0 -i ${startdir}/src/no_arg.patch || return 1
./configure --prefix=/usr --enable-utf8 --enable-unicode-properties
make || return 1
make DESTDIR=${startdir}/pkg install
Deleted: core-x86_64/no_arg.patch
===================================================================
--- core-x86_64/no_arg.patch 2008-05-14 03:03:05 UTC (rev 1628)
+++ core-x86_64/no_arg.patch 2008-05-14 03:03:52 UTC (rev 1629)
@@ -1,18 +0,0 @@
-Index: pcrecpp.cc
-===================================================================
---- pcrecpp.cc (revision 319)
-+++ pcrecpp.cc (working copy)
-@@ -57,6 +57,14 @@
- // Special object that stands-in for no argument
- Arg RE::no_arg((void*)NULL);
-
-+// This is for ABI compatibility with old versions of pcre (pre-7.6),
-+// which defined a global no_arg variable instead of putting it in the
-+// RE class. This works on GCC >= 3, at least. We could probably have
-+// a more inclusive test if we ever needed it.
-+#if defined(__GNUC__) && __GNUC__ >= 3
-+extern Arg no_arg __attribute__((alias("_ZN7pcrecpp2RE6no_argE")));
-+#endif
-+
- // If a regular expression has no error, its error_ field points here
- static const string empty_string;
More information about the arch-commits
mailing list