diff options
author | jtb <jtb> | 2001-05-01 16:13:53 +0000 |
---|---|---|
committer | jtb <jtb> | 2001-05-01 16:13:53 +0000 |
commit | e5e435c0dd90bf3f72a8cd29a831d793f61ace49 (patch) | |
tree | de208acdd69a33d2fee5252cbd8519b50387f31a /lang | |
parent | 72c2d8004cf051240128bcb9c69e5bc1becae08b (diff) | |
download | pkgsrc-e5e435c0dd90bf3f72a8cd29a831d793f61ace49.tar.gz |
Don't use the tcl or tk stub libraries. Thanks to Nick Hudson for pointing
out the problem.
Diffstat (limited to 'lang')
-rw-r--r-- | lang/tcl-itcl/distinfo | 10 | ||||
-rw-r--r-- | lang/tcl-itcl/patches/patch-aa | 24 | ||||
-rw-r--r-- | lang/tcl-itcl/patches/patch-ab | 28 | ||||
-rw-r--r-- | lang/tcl-itcl/patches/patch-ac | 40 | ||||
-rw-r--r-- | lang/tcl-itcl/patches/patch-ad | 28 |
5 files changed, 107 insertions, 23 deletions
diff --git a/lang/tcl-itcl/distinfo b/lang/tcl-itcl/distinfo index 271adb65062..acf3540df36 100644 --- a/lang/tcl-itcl/distinfo +++ b/lang/tcl-itcl/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 15:00:59 agc Exp $ +$NetBSD: distinfo,v 1.3 2001/05/01 16:13:53 jtb Exp $ SHA1 (itcl3.2.tar.gz) = 9e51a309414d4894f2bc7b33a1c44b51c7e1dbd5 Size (itcl3.2.tar.gz) = 1498517 bytes -SHA1 (patch-aa) = 92afb22172264dfcc35a39bc17e8b7ec8d67d517 -SHA1 (patch-ab) = c4a88c9581ad89ac54a037f5aab48e8e9e6d7d39 -SHA1 (patch-ac) = 938276eb303258a01e5979b03dda6a8cdabe004f -SHA1 (patch-ad) = 1683d737d979f90a74d0e84ae72d76f6f6448de7 +SHA1 (patch-aa) = 82510e7a39fd024ba9c24e8279744ad4be65f60e +SHA1 (patch-ab) = 4644c9e271a37502fbd51477340a47f4d0ecf8fe +SHA1 (patch-ac) = 79bdcaf01a21837fab22c23662e83a11d1bbe7d4 +SHA1 (patch-ad) = 2f61ebe7d8c4062426d1a79d93ef544b0b46c856 SHA1 (patch-ae) = e7ebc0443bc4fae29ce67909d8e35e9f65a0ef69 SHA1 (patch-af) = ca6609bd91fb3e94ec637d50568e5116b83c870a SHA1 (patch-ag) = ad0e4ca59e3b28e49993b8962f583ecbe8f00947 diff --git a/lang/tcl-itcl/patches/patch-aa b/lang/tcl-itcl/patches/patch-aa index df8c86eb89e..ea7086c09f5 100644 --- a/lang/tcl-itcl/patches/patch-aa +++ b/lang/tcl-itcl/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/02/23 20:36:28 jtb Exp $ +$NetBSD: patch-aa,v 1.2 2001/05/01 16:13:54 jtb Exp $ ---- itcl/configure.orig Tue Aug 29 15:58:00 2000 -+++ itcl/configure Fri Nov 10 01:10:13 2000 +--- itcl/configure.orig Tue Aug 29 03:58:00 2000 ++++ itcl/configure @@ -1119,7 +1119,7 @@ ;; *) @@ -11,6 +11,24 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/02/23 20:36:28 jtb Exp $ ;; esac +@@ -1575,12 +1575,12 @@ + # link against the non-stubbed Tcl library. + #-------------------------------------------------------------------- + +-if test "${SHARED_BUILD}" = "1" ; then +- cat >> confdefs.h <<\EOF +-#define USE_TCL_STUBS 1 +-EOF ++# if test "${SHARED_BUILD}" = "1" ; then ++# cat >> confdefs.h <<\EOF ++# #define USE_TCL_STUBS 1 ++# EOF + +-fi ++# fi + + #-------------------------------------------------------------------- + # This macro generates a line to use when building a library. It @@ -1598,7 +1598,7 @@ ;; *) diff --git a/lang/tcl-itcl/patches/patch-ab b/lang/tcl-itcl/patches/patch-ab index 872a181f722..a6f2c458b89 100644 --- a/lang/tcl-itcl/patches/patch-ab +++ b/lang/tcl-itcl/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.1.1.1 2001/02/23 20:36:30 jtb Exp $ +$NetBSD: patch-ab,v 1.2 2001/05/01 16:13:54 jtb Exp $ ---- itcl/Makefile.in.orig Tue Aug 29 15:58:00 2000 -+++ itcl/Makefile.in Thu Nov 9 23:54:52 2000 +--- itcl/Makefile.in.orig Tue Aug 29 03:58:00 2000 ++++ itcl/Makefile.in @@ -115,7 +115,7 @@ SAMPLE_NEW_VAR=@SAMPLE_NEW_VAR@ @@ -42,15 +42,18 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/02/23 20:36:30 jtb Exp $ CFLAGS_DEBUG = @CFLAGS_DEBUG@ CFLAGS_DEFAULT = @CFLAGS_DEFAULT@ CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@ -@@ -187,7 +187,7 @@ +@@ -187,9 +187,9 @@ OBJEXT = @OBJEXT@ RANLIB = @RANLIB@ SHLIB_CFLAGS = @SHLIB_CFLAGS@ -SHLIB_LD = @SHLIB_LD@ +SHLIB_LD = ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib SHLIB_LDFLAGS = @SHLIB_LDFLAGS@ - SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ +-SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ ++SHLIB_LD_LIBS = -Wl,-R${PREFIX}/lib -L${PREFIX}/lib -ltcl83 -lm STLIB_LD = @STLIB_LD@ + TCL_BIN_DIR = @TCL_BIN_DIR@ + TCL_DEFS = @TCL_DEFS@ @@ -230,7 +230,7 @@ AR = ar CFLAGS = @CFLAGS@ @@ -60,7 +63,20 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/02/23 20:36:30 jtb Exp $ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ #======================================================================== -@@ -420,7 +420,7 @@ +@@ -319,12 +319,10 @@ + $(itcl_LIB_FILE): $(itcl_OBJECTS) + -rm -f $(itcl_LIB_FILE) + @MAKE_LIB@ +- $(RANLIB) $(itcl_LIB_FILE) + + $(itclstub_LIB_FILE): $(itclstub_OBJECTS) + -rm -f $(itclstub_LIB_FILE) + @MAKE_STATIC_LIB@ +- $(RANLIB) $(itclstub_LIB_FILE) + + #======================================================================== + # We need to enumerate the list of .c to .o lines here. +@@ -420,7 +418,7 @@ #======================================================================== install-lib-binaries: installdirs diff --git a/lang/tcl-itcl/patches/patch-ac b/lang/tcl-itcl/patches/patch-ac index bfc9877153b..0ce6290d6cc 100644 --- a/lang/tcl-itcl/patches/patch-ac +++ b/lang/tcl-itcl/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.1.1.1 2001/02/23 20:36:30 jtb Exp $ +$NetBSD: patch-ac,v 1.2 2001/05/01 16:13:54 jtb Exp $ ---- itk/configure.orig Tue Aug 29 15:58:00 2000 -+++ itk/configure Fri Nov 10 01:11:17 2000 +--- itk/configure.orig Tue Aug 29 03:58:00 2000 ++++ itk/configure @@ -1119,7 +1119,7 @@ ;; *) @@ -11,6 +11,40 @@ $NetBSD: patch-ac,v 1.1.1.1 2001/02/23 20:36:30 jtb Exp $ ;; esac +@@ -1871,20 +1871,20 @@ + # link against the non-stubbed Tcl library. + #-------------------------------------------------------------------- + +-if test "${SHARED_BUILD}" = "1" ; then +- cat >> confdefs.h <<\EOF +-#define USE_TCL_STUBS 1 +-EOF +- +- cat >> confdefs.h <<\EOF +-#define USE_TK_STUBS 1 +-EOF ++# if test "${SHARED_BUILD}" = "1" ; then ++# cat >> confdefs.h <<\EOF ++# #define USE_TCL_STUBS 1 ++# EOF ++ ++# cat >> confdefs.h <<\EOF ++# #define USE_TK_STUBS 1 ++# EOF ++ ++# cat >> confdefs.h <<\EOF ++# #define USE_ITCL_STUBS 1 ++# EOF + +- cat >> confdefs.h <<\EOF +-#define USE_ITCL_STUBS 1 +-EOF +- +-fi ++# fi + + #-------------------------------------------------------------------- + # This macro generates a line to use when building a library. It @@ -1902,7 +1902,7 @@ ;; *) diff --git a/lang/tcl-itcl/patches/patch-ad b/lang/tcl-itcl/patches/patch-ad index 74ae8b5878b..2e30a025749 100644 --- a/lang/tcl-itcl/patches/patch-ad +++ b/lang/tcl-itcl/patches/patch-ad @@ -1,7 +1,7 @@ -$NetBSD: patch-ad,v 1.1.1.1 2001/02/23 20:36:31 jtb Exp $ +$NetBSD: patch-ad,v 1.2 2001/05/01 16:13:54 jtb Exp $ ---- itk/Makefile.in.orig Tue Aug 29 15:58:00 2000 -+++ itk/Makefile.in Thu Nov 9 23:58:09 2000 +--- itk/Makefile.in.orig Tue Aug 29 03:58:00 2000 ++++ itk/Makefile.in @@ -103,7 +103,7 @@ SAMPLE_NEW_VAR=@SAMPLE_NEW_VAR@ @@ -42,15 +42,18 @@ $NetBSD: patch-ad,v 1.1.1.1 2001/02/23 20:36:31 jtb Exp $ CFLAGS_DEBUG = @CFLAGS_DEBUG@ CFLAGS_DEFAULT = @CFLAGS_DEFAULT@ CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@ -@@ -175,7 +175,7 @@ +@@ -175,9 +175,9 @@ OBJEXT = @OBJEXT@ RANLIB = @RANLIB@ SHLIB_CFLAGS = @SHLIB_CFLAGS@ -SHLIB_LD = @SHLIB_LD@ +SHLIB_LD = ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib SHLIB_LDFLAGS = @SHLIB_LDFLAGS@ - SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ +-SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ ++SHLIB_LD_LIBS = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -Wl,-R${PREFIX}/lib -L${PREFIX}/lib -ltk83 -ltcl83 -lX11 -lm STLIB_LD = @STLIB_LD@ + TCL_BIN_DIR = @TCL_BIN_DIR@ + TCL_DEFS = @TCL_DEFS@ @@ -225,7 +225,7 @@ AR = ar CFLAGS = @CFLAGS@ @@ -60,7 +63,20 @@ $NetBSD: patch-ad,v 1.1.1.1 2001/02/23 20:36:31 jtb Exp $ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ #======================================================================== -@@ -394,7 +394,7 @@ +@@ -314,12 +314,10 @@ + $(itk_LIB_FILE): $(itk_OBJECTS) + -rm -f $(itk_LIB_FILE) + @MAKE_LIB@ +- $(RANLIB) $(itk_LIB_FILE) + + $(itkstub_LIB_FILE): $(itkstub_OBJECTS) + -rm -f $(itkstub_LIB_FILE) + @MAKE_STATIC_LIB@ +- $(RANLIB) $(itkstub_LIB_FILE) + + #======================================================================== + # We need to enumerate the list of .c to .o lines here. +@@ -394,7 +392,7 @@ #======================================================================== install-lib-binaries: installdirs |