kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed building on systems with shared libraries named different than .so

Browse source
This commit is contained in:
adam 2004-11-30 20:30:19 +00:00
parent 90740a98d4
commit 6ec6393c10
4 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lang/tcl-expect/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.19 2004/11/18 16:47:19 adam Exp $
# $NetBSD: Makefile,v 1.20 2004/11/30 20:30:19 adam Exp $
.include "Makefile.common"
@ -10,10 +10,9 @@ COMMENT= Extensions to Tcl to support scripting of interactive programs
CONFLICTS+= expect-[0-9]*
CONFIGURE_ARGS= --enable-shared \
CONFIGURE_ARGS= --enable-shared --without-x \
--with-tclconfig=${PREFIX}/lib \
--with-tclinclude=${PREFIX}/include/tcl \
--without-x
--with-tclinclude=${PREFIX}/include/tcl
.include "../../lang/tcl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

5
lang/tcl-expect/distinfo
View file

@ -1,8 +1,9 @@
$NetBSD: distinfo,v 1.9 2004/11/18 16:47:19 adam Exp $
$NetBSD: distinfo,v 1.10 2004/11/30 20:30:19 adam Exp $
SHA1 (expect-5.42.1.tar.gz) = 84ca72f0abd2b7a31ee332049b34575a286e8f27
Size (expect-5.42.1.tar.gz) = 524882 bytes
SHA1 (patch-aa) = 6a099ccb398202e309229a16085272bf6d8f8040
SHA1 (patch-aa) = 81f45deba61affb5d2e0d3d0f91a67217e543b8e
SHA1 (patch-ab) = 642e714e58bfe72b332cb89559e1f55df9b6052f
SHA1 (patch-ac) = 68db32e76105d3719ea0809b99af0305e5100596
SHA1 (patch-ad) = 460fcc04e6f1936fbb2669c80be91e790173b0a3
SHA1 (patch-ae) = 308035226466d3fc0fa0a625365a817172842a69

10
lang/tcl-expect/patches/patch-aa
View file

@ -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:

13
lang/tcl-expect/patches/patch-ae Normal file
View file

@ -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