diff options
| author | dmcmahill <dmcmahill@pkgsrc.org> | 2004-09-25 06:43:03 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill@pkgsrc.org> | 2004-09-25 06:43:03 +0000 |
| commit | cd0a43757fa6dec0361714c3fc76ff4e7fd3890a (patch) | |
| tree | b78c6527b7508052102b23d933629791cbe3de35 /lang/tcl-itcl-current/patches/patch-ad | |
| parent | 5c11c73356939d350cbfc11968567962be5baefa (diff) | |
| download | pkgsrc-cd0a43757fa6dec0361714c3fc76ff4e7fd3890a.tar.gz | |
- fix up the patched makefiles a bit so that libtool libs are correctly
in the all target. This prevents the libs from being created over and over.
- fix up the libitk.so library so that the itk part of this package
actually works.
Diffstat (limited to 'lang/tcl-itcl-current/patches/patch-ad')
| -rw-r--r-- | lang/tcl-itcl-current/patches/patch-ad | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/lang/tcl-itcl-current/patches/patch-ad b/lang/tcl-itcl-current/patches/patch-ad index 2d4aa41c3b7..8d07b449baf 100644 --- a/lang/tcl-itcl-current/patches/patch-ad +++ b/lang/tcl-itcl-current/patches/patch-ad @@ -1,7 +1,16 @@ -$NetBSD: patch-ad,v 1.1.1.1 2004/09/24 21:16:02 dmcmahill Exp $ +$NetBSD: patch-ad,v 1.2 2004/09/25 06:43:04 dmcmahill Exp $ --- itk/Makefile.in.orig Tue Aug 17 17:47:18 2004 +++ itk/Makefile.in +@@ -77,7 +77,7 @@ ITK_WIN_DIR_NATIVE = @ITK_WIN_DIR_NATIVE + PKG_LIB_FILE = @PKG_LIB_FILE@ + PKG_STUB_LIB_FILE = @PKG_STUB_LIB_FILE@ + +-lib_BINARIES = $(PKG_LIB_FILE) ++lib_BINARIES = ${PKG_LIB_FILE:C/\.so.*/.la/} + BINARIES = $(lib_BINARIES) + + SHELL = @SHELL@ @@ -96,19 +96,19 @@ DESTDIR = PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION) @@ -36,12 +45,16 @@ $NetBSD: patch-ad,v 1.1.1.1 2004/09/24 21:16:02 dmcmahill Exp $ +SHLIB_LD = ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib SHLIB_LD_FLAGS = @SHLIB_LD_FLAGS@ -SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ -+SHLIB_LD_LIBS = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -Wl,-R${PREFIX}/lib -L${PREFIX}/lib -ltk84 -ltcl84 -lX11 -lm ++SHLIB_LD_LIBS = ../itcl/itclStubLib.lo -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -Wl,-R${PREFIX}/lib -L${PREFIX}/lib -ltk84 -ltcl84 -lX11 -lm STLIB_LD = @STLIB_LD@ TCL_DEFS = @TCL_DEFS@ TCL_BIN_DIR = @TCL_BIN_DIR@ -@@ -256,12 +256,10 @@ depend: - $(PKG_LIB_FILE): $(PKG_OBJECTS) +@@ -253,15 +253,13 @@ depend: + # source files above. + #======================================================================== + +-$(PKG_LIB_FILE): $(PKG_OBJECTS) ++${PKG_LIB_FILE:C/\.so.*/.la/}: $(PKG_OBJECTS) -rm -f $(PKG_LIB_FILE) ${MAKE_LIB} - $(RANLIB) $(PKG_LIB_FILE) @@ -53,12 +66,3 @@ $NetBSD: patch-ad,v 1.1.1.1 2004/09/24 21:16:02 dmcmahill Exp $ #======================================================================== # We need to enumerate the list of .c to .o lines here. -@@ -317,7 +315,7 @@ distclean: clean - - install-lib-binaries: - @mkdir -p $(DESTDIR)$(pkglibdir) -- @list='$(lib_BINARIES)'; for p in $$list; do \ -+ @list='${PKG_LIB_FILE:C/\.so.*/.la/} ${PKG_STUB_LIB_FILE:C/\.so.*/.la/} $(lib_BINARIES)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \ - $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \ |