summaryrefslogtreecommitdiff
path: root/x11/tk/patches
diff options
context:
space:
mode:
authorminskim <minskim@pkgsrc.org>2006-02-23 23:31:51 +0000
committerminskim <minskim@pkgsrc.org>2006-02-23 23:31:51 +0000
commita8ae64698b0100cbaf8d97fd973ec8774b1ecdaa (patch)
tree208ffea308b63afeb8b3bb0cb7332587489c4599 /x11/tk/patches
parent4e889098893ac7e5cfac8bca22756bf18c219c2c (diff)
downloadpkgsrc-a8ae64698b0100cbaf8d97fd973ec8774b1ecdaa.tar.gz
Add link options to have a correct dependency_libs line in .la files
on NetBSD. This fixes PR pkg/32915. Bump PKGREVISION.
Diffstat (limited to 'x11/tk/patches')
-rw-r--r--x11/tk/patches/patch-ab10
-rw-r--r--x11/tk/patches/patch-ac7
2 files changed, 10 insertions, 7 deletions
diff --git a/x11/tk/patches/patch-ab b/x11/tk/patches/patch-ab
index 8e7f64b9901..e9288086509 100644
--- a/x11/tk/patches/patch-ab
+++ b/x11/tk/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.23 2006/01/16 14:48:34 adam Exp $
+$NetBSD: patch-ab,v 1.24 2006/02/23 23:31:52 minskim Exp $
---- unix/configure.orig 2005-12-06 03:42:37.000000000 +0100
+--- unix/configure.orig 2005-12-06 02:42:37.000000000 +0000
+++ unix/configure
@@ -2007,12 +2007,13 @@ fi
# Step 3: set configuration options based on system name and version.
@@ -17,14 +17,16 @@ $NetBSD: patch-ab,v 1.23 2006/01/16 14:48:34 adam Exp $
CFLAGS_DEBUG=-g
CFLAGS_OPTIMIZE=-O
if test "$GCC" = "yes" ; then
-@@ -2699,7 +2700,6 @@ if eval "test \"`echo '$ac_cv_header_'$a
+@@ -2699,8 +2700,7 @@ if eval "test \"`echo '$ac_cv_header_'$a
# NetBSD/SPARC needs -fPIC, -fpic will not do.
SHLIB_CFLAGS="-fPIC"
- SHLIB_LD="ld -Bshareable -x"
- SHLIB_LD_LIBS=""
+- SHLIB_LD_LIBS=""
++ SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
+ DL_LIBS=""
@@ -2720,13 +2720,23 @@ EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "yes" >/dev/null 2>&1; then
diff --git a/x11/tk/patches/patch-ac b/x11/tk/patches/patch-ac
index c4d10787708..fd91bb1f618 100644
--- a/x11/tk/patches/patch-ac
+++ b/x11/tk/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.13 2006/01/16 14:48:35 adam Exp $
+$NetBSD: patch-ac,v 1.14 2006/02/23 23:31:52 minskim Exp $
---- unix/tcl.m4.orig 2005-12-06 03:42:37.000000000 +0100
+--- unix/tcl.m4.orig 2005-12-06 02:42:37.000000000 +0000
+++ unix/tcl.m4
@@ -900,6 +900,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
# Step 3: set configuration options based on system name and version.
@@ -62,7 +62,8 @@ $NetBSD: patch-ac,v 1.13 2006/01/16 14:48:35 adam Exp $
# NetBSD/SPARC needs -fPIC, -fpic will not do.
SHLIB_CFLAGS="-fPIC"
- SHLIB_LD="ld -Bshareable -x"
- SHLIB_LD_LIBS=""
+- SHLIB_LD_LIBS=""
++ SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""