summaryrefslogtreecommitdiff
path: root/lang/tcl-expect/patches
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2004-11-30 20:30:19 +0000
committeradam <adam@pkgsrc.org>2004-11-30 20:30:19 +0000
commit76f34181b4bbcf60efa1004b2005e7d3ff21313e (patch)
treebefd6bc249d31dbd4eb69bf99b8f0ee6618c9d07 /lang/tcl-expect/patches
parentf82689b748e2bbc61503113ba37c8bee6fa26188 (diff)
downloadpkgsrc-76f34181b4bbcf60efa1004b2005e7d3ff21313e.tar.gz
Fixed building on systems with shared libraries named different than .so
Diffstat (limited to 'lang/tcl-expect/patches')
-rw-r--r--lang/tcl-expect/patches/patch-aa10
-rw-r--r--lang/tcl-expect/patches/patch-ae13
2 files changed, 18 insertions, 5 deletions
diff --git a/lang/tcl-expect/patches/patch-aa b/lang/tcl-expect/patches/patch-aa
index 77aac144cce..3066ae86216 100644
--- a/lang/tcl-expect/patches/patch-aa
+++ b/lang/tcl-expect/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2004/11/18 16:47:19 adam Exp $
+$NetBSD: patch-aa,v 1.4 2004/11/30 20:30:19 adam Exp $
--- Makefile.in.orig 2004-05-07 18:10:30.000000000 +0000
+++ Makefile.in
@@ -99,12 +99,12 @@ $NetBSD: patch-aa,v 1.3 2004/11/18 16:47:19 adam Exp $
- $(INSTALL_PROGRAM) $(EXP_SHARED_LIB_FILE) $(tcl_libdir)/$(EXP_SHARED_LIB_FILE) ; \
- $(INSTALL_PROGRAM) pkgIndex $(libdir)/pkgIndex.tcl ; \
- else true; fi
-+ $(INSTALL_DATA) $(EXP_SHARED_LIB_FILE:C/\.so.*/.la/) $(tcl_libdir)
++ $(INSTALL_DATA) $(EXP_SHARED_LIB_FILE) $(tcl_libdir)
+ $(INSTALL_DATA) pkgIndex $(libdir)/pkgIndex.tcl
expect_installed: exp_main_exp.o $(EXP_LIB_FILE) install_shared_lib
- $(CC) $(XCFLAGS) @EXP_SHLIB_CFLAGS@ @TCL_LD_FLAGS@ -o expect_installed exp_main_exp.o @EXP_LIB_SPEC@ $(TCLLIB_INSTALLED) $(EXP_AND_TCL_LIBS)
-+ $(LD) $(XCFLAGS) @EXP_SHLIB_CFLAGS@ @TCL_LD_FLAGS@ -o expect_installed exp_main_exp.o $(EXP_SHARED_LIB_FILE:C/\.so.*/.la/) $(TCLLIB_INSTALLED) $(EXP_AND_TCL_LIBS)
++ $(LD) $(XCFLAGS) @EXP_SHLIB_CFLAGS@ @TCL_LD_FLAGS@ -o expect_installed exp_main_exp.o $(EXP_SHARED_LIB_FILE) $(TCLLIB_INSTALLED) $(EXP_AND_TCL_LIBS)
$(SETUID) expect_installed
# Build Expect with TestCenter
@@ -124,7 +124,7 @@ $NetBSD: patch-aa,v 1.3 2004/11/18 16:47:19 adam Exp $
expectk_installed: exp_main_tk.o $(EXP_LIB_FILE)
- $(CC) $(XCFLAGS) @EXP_SHLIB_CFLAGS@ @TCL_LD_FLAGS@ -o expectk_installed exp_main_tk.o @EXP_LIB_SPEC@ $(TKLIB_INSTALLED) $(TCLLIB_INSTALLED) $(X11_LD_FLAGS) $(EXP_AND_TK_LIBS)
-+ $(LD) $(XCFLAGS) @EXP_SHLIB_CFLAGS@ @TCL_LD_FLAGS@ -o expectk_installed exp_main_tk.o $(EXP_SHARED_LIB_FILE:C/\.so.*/.la/) $(TKLIB_INSTALLED) $(TCLLIB_INSTALLED) $(X11_LD_FLAGS) $(EXP_AND_TK_LIBS)
++ $(LD) $(XCFLAGS) @EXP_SHLIB_CFLAGS@ @TCL_LD_FLAGS@ -o expectk_installed exp_main_tk.o $(EXP_SHARED_LIB_FILE) $(TKLIB_INSTALLED) $(TCLLIB_INSTALLED) $(X11_LD_FLAGS) $(EXP_AND_TK_LIBS)
$(SETUID) expectk_installed
# Build Expectk with TestCenter
@@ -139,7 +139,7 @@ $NetBSD: patch-aa,v 1.3 2004/11/18 16:47:19 adam Exp $
$(EXP_SHARED_LIB_FILE): $(OFILES)
-rm -f $(EXP_SHARED_LIB_FILE)
- @TCL_SHLIB_LD@ -o $(EXP_SHARED_LIB_FILE) $(SHARED_OFILES) @EXP_LD_SEARCH_FLAGS@ @EXP_SHLIB_LD_LIBS@
-+ ${LIBTOOL} @CC@ --mode=link -rpath ${PREFIX}/lib -o $(EXP_SHARED_LIB_FILE:C/\.so.*/.la/) $(OFILES:.o=.lo) @EXP_LD_SEARCH_FLAGS@ @EXP_SHLIB_LD_LIBS@ -version-info 1:0
++ ${LIBTOOL} @CC@ --mode=link -rpath ${PREFIX}/lib -o $(EXP_SHARED_LIB_FILE) $(OFILES:.o=.lo) @EXP_LD_SEARCH_FLAGS@ @EXP_SHLIB_LD_LIBS@ -version-info 1:0
.PHONY: install-info install info
install-info:
diff --git a/lang/tcl-expect/patches/patch-ae b/lang/tcl-expect/patches/patch-ae
new file mode 100644
index 00000000000..76632942ffe
--- /dev/null
+++ b/lang/tcl-expect/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2004/11/30 20:30:19 adam Exp $
+
+--- configure.orig Tue Nov 30 20:26:40 2004
++++ configure
+@@ -6367,7 +6367,7 @@ echo $ac_n "checking for type of library
+ echo "configure:6383: checking for type of library to build" >&5
+ if test "$enable_shared" = "yes" && test "x${TCL_SHLIB_SUFFIX}" != "x" ; then
+ EXP_SHLIB_CFLAGS=$TCL_SHLIB_CFLAGS
+- eval "EXP_SHARED_LIB_FILE=libexpect${TCL_SHARED_LIB_SUFFIX}"
++ eval "EXP_SHARED_LIB_FILE=libexpect${EXP_MAJOR_VERSION}${EXP_MINOR_VERSION}.la"
+ EXP_LIB_FILE=$EXP_SHARED_LIB_FILE
+ EXP_LIB_FILES="$EXP_SHARED_LIB_FILE $EXP_UNSHARED_LIB_FILE"
+ echo "$ac_t""both shared and unshared" 1>&6