diff options
| author | tnn <tnn@pkgsrc.org> | 2008-05-27 16:20:52 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2008-05-27 16:20:52 +0000 |
| commit | d38c374aecb3920b21b3bf8b6e3a9fc180c2d2d2 (patch) | |
| tree | 3f365e9b7245bca06b15ee28bba9229b30e22f3d /devel | |
| parent | c15d65aff98d65a81daf14f77f0e7fe116c79913 (diff) | |
| download | pkgsrc-d38c374aecb3920b21b3bf8b6e3a9fc180c2d2d2.tar.gz | |
Remove a feeble attempt at providing ABI compatibility for the C++ portion
of the PCRE library. Relying on the C++ compiler to crunch symbols in a
particular way is platform dependent at best, and the comments indicate
that this was done for OSX.
Also, the test misfired on SunOS leading to breakage (PR pkg/38768).
I'm not bumping the ABI depends because I'm not aware of
any packages using the C++ library. Bump PKGREVISION, however.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/pcre/Makefile | 3 | ||||
| -rw-r--r-- | devel/pcre/distinfo | 3 | ||||
| -rw-r--r-- | devel/pcre/patches/patch-ab | 23 |
3 files changed, 27 insertions, 2 deletions
diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile index d51405b4e13..cc0b84d50bb 100644 --- a/devel/pcre/Makefile +++ b/devel/pcre/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.49 2008/05/25 17:39:32 tnn Exp $ +# $NetBSD: Makefile,v 1.50 2008/05/27 16:20:52 tnn Exp $ DISTNAME= pcre-7.7 +PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ \ ${MASTER_SITE_SOURCEFORGE:=pcre/} diff --git a/devel/pcre/distinfo b/devel/pcre/distinfo index 70ac3d18411..7de8a8a6bec 100644 --- a/devel/pcre/distinfo +++ b/devel/pcre/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.31 2008/05/24 10:45:17 wiz Exp $ +$NetBSD: distinfo,v 1.32 2008/05/27 16:20:52 tnn Exp $ SHA1 (pcre-7.7.tar.bz2) = f1f54d3e13e6cb427de962e62eaaee32c74cba38 RMD160 (pcre-7.7.tar.bz2) = fdf7785b982879ce91847130960fa1531caffaeb Size (pcre-7.7.tar.bz2) = 818897 bytes SHA1 (patch-aa) = 2bca13cdd4a398ae3dbf26f75fd94557cb076dbe +SHA1 (patch-ab) = a51a173c41825effd94c104f3b7eea3e48d019f9 diff --git a/devel/pcre/patches/patch-ab b/devel/pcre/patches/patch-ab new file mode 100644 index 00000000000..83e53e5d99b --- /dev/null +++ b/devel/pcre/patches/patch-ab @@ -0,0 +1,23 @@ +$NetBSD: patch-ab,v 1.5 2008/05/27 16:20:52 tnn Exp $ + +--- configure.orig 2008-05-07 18:22:58.000000000 +0200 ++++ configure +@@ -20901,6 +20901,8 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + ++# XXX pkgsrc ++if false; then + + # Older versions of pcre defined pcrecpp::no_arg, but in new versions + # it's called pcrecpp::RE::no_arg. For backwards ABI compatibility, +@@ -20968,6 +20970,9 @@ rm -f core conftest.err conftest.$ac_obj + done + LDFLAGS="$OLD_LDFLAGS" + ++# XXX pkgsrc ++fi ++ + # We could be more clever here, given we're doing AC_SUBST with this + # (eg set a var to be the name of the include file we want). But we're not + # so it's easy to change back to 'regular' autoconf vars if we needed to. |