pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/tk Add link options to have a correct dependency_l...
details: https://anonhg.NetBSD.org/pkgsrc/rev/54b7a748b36b
branches: trunk
changeset: 508705:54b7a748b36b
user: minskim <minskim%pkgsrc.org@localhost>
date: Thu Feb 23 23:31:51 2006 +0000
description:
Add link options to have a correct dependency_libs line in .la files
on NetBSD. This fixes PR pkg/32915.
Bump PKGREVISION.
diffstat:
x11/tk/Makefile | 4 ++--
x11/tk/distinfo | 6 +++---
x11/tk/patches/patch-ab | 10 ++++++----
x11/tk/patches/patch-ac | 7 ++++---
4 files changed, 15 insertions(+), 12 deletions(-)
diffs (84 lines):
diff -r 6c01024d38b0 -r 54b7a748b36b x11/tk/Makefile
--- a/x11/tk/Makefile Thu Feb 23 23:30:57 2006 +0000
+++ b/x11/tk/Makefile Thu Feb 23 23:31:51 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.54 2006/02/05 23:11:43 joerg Exp $
+# $NetBSD: Makefile,v 1.55 2006/02/23 23:31:51 minskim Exp $
DISTNAME= tk${TK_VERSION}-src
PKGNAME= tk-${TK_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11 lang
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/}
diff -r 6c01024d38b0 -r 54b7a748b36b x11/tk/distinfo
--- a/x11/tk/distinfo Thu Feb 23 23:30:57 2006 +0000
+++ b/x11/tk/distinfo Thu Feb 23 23:31:51 2006 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.26 2006/01/16 14:48:34 adam Exp $
+$NetBSD: distinfo,v 1.27 2006/02/23 23:31:51 minskim Exp $
SHA1 (tk8.4.12-src.tar.gz) = 05e8a82fc4ab9f825b8e7b8cbc917ea9ba31ed5d
RMD160 (tk8.4.12-src.tar.gz) = b50e4da0bc3914e6339fc537761d550ddcf22330
Size (tk8.4.12-src.tar.gz) = 3245547 bytes
SHA1 (patch-aa) = cdb66101f4b87cb2c967f2777f8e7af9c82079cd
-SHA1 (patch-ab) = bab49f0cbf043f7a88351ee0f8f2f7b2584c91d4
-SHA1 (patch-ac) = 24c56d9660e8f6e644d4cc72909befd7eafa9a32
+SHA1 (patch-ab) = 96207d41dc0825eafc8fc70a501621e49f960f66
+SHA1 (patch-ac) = 48aec4bbe8e3d5d670f5951055f7fb2d112bac36
SHA1 (patch-ad) = f6ea4c2fde0a916f252c30bbc2117a4af8a9f442
SHA1 (patch-ae) = 2815cb827ee15cbdd979d4866b8a3bcdf453cc54
diff -r 6c01024d38b0 -r 54b7a748b36b x11/tk/patches/patch-ab
--- a/x11/tk/patches/patch-ab Thu Feb 23 23:30:57 2006 +0000
+++ b/x11/tk/patches/patch-ab Thu Feb 23 23:31:51 2006 +0000
@@ -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 @@
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 -r 6c01024d38b0 -r 54b7a748b36b x11/tk/patches/patch-ac
--- a/x11/tk/patches/patch-ac Thu Feb 23 23:30:57 2006 +0000
+++ b/x11/tk/patches/patch-ac Thu Feb 23 23:31:51 2006 +0000
@@ -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/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=""
Home |
Main Index |
Thread Index |
Old Index