diff options
| author | jmc <jmc> | 2001-12-16 07:39:10 +0000 |
|---|---|---|
| committer | jmc <jmc> | 2001-12-16 07:39:10 +0000 |
| commit | e8f26c6fc8ad015bbd6c3178bfce152a17e71dfe (patch) | |
| tree | bac74a7a4fc07c09a81bb6ff714196733a81090c /x11/blt/patches/patch-aa | |
| parent | 20be3eec4814a31bb9ecc52b17723cba85421e37 (diff) | |
| download | pkgsrc-e8f26c6fc8ad015bbd6c3178bfce152a17e71dfe.tar.gz | |
Various bits to get this working.
Buildlinkify against tcl/tk/x11
This configure is kinda brain dead so just keep the configure.in patches (which
were reversed anyways from the configure patches) and depend on autoconf
to force a correct configure. Also pass X11BASE along to configure's env
so the right -R flags end up in the libs/binaries.
Diffstat (limited to 'x11/blt/patches/patch-aa')
| -rw-r--r-- | x11/blt/patches/patch-aa | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/x11/blt/patches/patch-aa b/x11/blt/patches/patch-aa index cb2a8a6b163..6696321b5a8 100644 --- a/x11/blt/patches/patch-aa +++ b/x11/blt/patches/patch-aa @@ -1,28 +1,25 @@ -$NetBSD: patch-aa,v 1.5 2000/09/08 02:48:05 jwise Exp $ ---- configure.in.orig Wed Jan 12 15:15:36 2000 -+++ configure.in Thu Sep 7 21:56:11 2000 -@@ -580,9 +580,9 @@ +$NetBSD: patch-aa,v 1.6 2001/12/16 07:39:11 jmc Exp $ + +--- configure.in.orig Wed Jan 12 20:15:36 2000 ++++ configure.in Sun Dec 16 07:16:49 2001 +@@ -580,7 +580,7 @@ TK_LIB_DIR=${TK_EXEC_PREFIX}/lib case $target in - *-sunos4*|NetBSD-*|FreeBSD-*|OpenBSD-*) -- TCL_LIB_SPEC="-ltcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}" -- TK_LIB_SPEC="-ltk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}" + *-sunos4*|*-*-netbsd|FreeBSD-*|OpenBSD-*) -+ TCL_LIB_SPEC="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -ltcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}" -+ TK_LIB_SPEC="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -ltk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}" + TCL_LIB_SPEC="-ltcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}" + TK_LIB_SPEC="-ltk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}" ;; - *) - TCL_LIB_SPEC="-ltcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}" @@ -933,9 +933,10 @@ # Not available on all versions: check for include file. AC_CHECK_HEADER(dlfcn.h, test_ok=yes, test_ok=no) if test "$test_ok" = yes; then -+ LDFLAGS="-L${PREFIX}/lib -L${X11BASE}/lib -Wl,-R${PREFIX}/lib -Wl,-R${X11BASE}/lib" ++ LDFLAGS="-L${prefix}/lib -L${X11BASE}/lib -Wl,-R${prefix}/lib -Wl,-R${X11BASE}/lib" SHLIB_CFLAGS="-fpic" SHLIB_LD="ld" - SHLIB_LD_FLAGS="-Bshareable -x" -+ SHLIB_LD_FLAGS="-Bshareable -x -R${PREFIX}/lib -R${X11BASE}/lib" ++ SHLIB_LD_FLAGS="-Bshareable -x -R${prefix}/lib -R${X11BASE}/lib" fi ;; |