diff options
| author | bjs <bjs@pkgsrc.org> | 2007-11-23 14:23:34 +0000 |
|---|---|---|
| committer | bjs <bjs@pkgsrc.org> | 2007-11-23 14:23:34 +0000 |
| commit | 2b90466ca942f6cc07db23b3fcb12cacd33d02dd (patch) | |
| tree | 5d05176d039379d883a3a5c58021f962c3ee98b5 /x11/xterm | |
| parent | d782c41e3e5aaa4a01505858be13457b1be6d0cd (diff) | |
| download | pkgsrc-2b90466ca942f6cc07db23b3fcb12cacd33d02dd.tar.gz | |
Force ac_cv_lib_pcreposix_pcreposix_regcomp=yes, bump rev.
This function does not exist AFAIK in our pcre libraries, and the configure
check was failing.
A segment of nm output reads:
/usr/pkg/lib/libpcreposix.so:00000a06 T regcomp
/usr/pkg/lib/libpcreposix.so:00000abf T regerror
/usr/pkg/lib/libpcreposix.so:000007a8 T regexec
/usr/pkg/lib/libpcreposix.so:00000780 T regfree
These symbols will override those in libc:
/usr/lib/libc.so:00031be8 T _regcomp
/usr/lib/libc.so:0002fbf8 T _regerror
/usr/lib/libc.so:0002e9c2 T _regexec
/usr/lib/libc.so:0006336c T _regfree
/usr/lib/libc.so:00031be8 W regcomp
/usr/lib/libc.so:0002fbf8 W regerror
/usr/lib/libc.so:0002e9c2 W regexec
/usr/lib/libc.so:0006336c W regfree
Diffstat (limited to 'x11/xterm')
| -rw-r--r-- | x11/xterm/Makefile | 10 | ||||
| -rw-r--r-- | x11/xterm/options.mk | 9 |
2 files changed, 13 insertions, 6 deletions
diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile index fc214323952..1be1ead26c4 100644 --- a/x11/xterm/Makefile +++ b/x11/xterm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2007/09/17 06:36:21 bjs Exp $ +# $NetBSD: Makefile,v 1.37 2007/11/23 14:23:34 bjs Exp $ DISTNAME= xterm-229 CATEGORIES= x11 @@ -31,9 +31,9 @@ CONFIGURE_ARGS+= --enable-wide-chars CONFIGURE_ARGS+= --with-setuid .endif -.if ${OPSYS} == "SunOS" -INSTALL_FILE= ${WRKDIR}/INSTALL -DEINSTALL_FILE= ${INSTALL_FILE} +#.#if ${OPSYS} == "SunOS" +#INSTALL_FILE= ${WRKDIR}/INSTALL +#DEINSTALL_FILE= ${INSTALL_FILE} pre-build: ${MKDIR} ${INSTALL_FILE:H} @@ -47,7 +47,7 @@ pre-install: post-install: ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL -.endif +#.endif .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXaw/buildlink3.mk" diff --git a/x11/xterm/options.mk b/x11/xterm/options.mk index e65964ccb42..cca686ee07d 100644 --- a/x11/xterm/options.mk +++ b/x11/xterm/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.6 2007/10/02 15:04:53 aymeric Exp $ +# $NetBSD: options.mk,v 1.7 2007/11/23 14:23:34 bjs Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.xterm PKG_SUPPORTED_OPTIONS= pcre xterm-luit freetype xterm-toolbar @@ -30,7 +30,14 @@ CONFIGURE_ARGS+= --enable-freetype CONFIGURE_ARGS+= --enable-toolbar .endif +### +### XXX The configure test checks for pcreposix_regcomp in libpcreposix. +### However, there is no such function [insofar as I can tell]. +### Moreover, libc's regex(3) functions are weak-aliased to those +### within libc's namespace, so we should have no problems. +### .if !empty(PKG_OPTIONS:Mpcre) CONFIGURE_ARGS+= --with-pcre +CONFIGURE_ENV+= ac_cv_lib_pcreposix_pcreposix_regcomp=yes . include "../../devel/pcre/buildlink3.mk" .endif |