summaryrefslogtreecommitdiff
path: root/devel/pcre/patches/patch-ab
blob: 7c21960f2b9ed1dbc7c1f7b956b04399ef06cc07 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
$NetBSD: patch-ab,v 1.8 2012/03/10 08:03:57 sbd Exp $

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).

--- configure.orig	2012-02-04 12:55:43.000000000 +0000
+++ configure
@@ -16189,6 +16189,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,
@@ -16231,6 +16233,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.
@@ -17014,6 +17019,10 @@ if test "$enable_pcretest_libreadline" =
 
 $as_echo "#define SUPPORT_LIBREADLINE /**/" >>confdefs.h
 
+else
+
+LIBREADLINE=
+
 fi