Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1189

Modified Files:
        tcltk-x86_64.info tcltk.info 
Log Message:
try harder to find build-dir tclsh (tested on ppc, blindly assuming newer %v on 
arch:x86_64 is same)


Index: tcltk.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/tcltk.info,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- tcltk.info  20 Nov 2009 03:32:44 -0000      1.14
+++ tcltk.info  12 Feb 2010 06:34:46 -0000      1.15
@@ -1,6 +1,6 @@
 Package: tcltk
 Version: 8.4.19
-Revision: 2
+Revision: 3
 BuildDepends: x11-dev, fink (>= 0.24.12-1)
 Depends: %N-shlibs (= %v-%r)
 Source: mirror:sourceforge:tcl/tcl%v-src.tar.gz
@@ -22,7 +22,8 @@
        popd
 
        pushd tk%v/unix
-               ./configure %c
+               export DYLD_FALLBACK_LIBRARY_PATH=%b/tcl%v/unix
+               ac_cv_path_tclsh=%b/tcl%v/unix/tclsh ./configure %c
                make genstubs
                make
        popd
@@ -113,6 +114,11 @@
        tcl and tk are build in separate/parallel dirs. Clearer to do
        NoSourceDirectory and have them both subdirs of %b than to
        have one be %b and keep having to 'cd ..'
+
+       Make sure tk build finds tclsh from current build rather than
+       different-version one from installed fink package or different
+       arch and build-options one from OS X. Thanks pogma for helping
+       make sure tclsh finds its libtcl
 <<
 DescDetail: <<
 Tcl provides a portable scripting environment for Unix, Windows,

Index: tcltk-x86_64.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/tcltk-x86_64.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- tcltk-x86_64.info   20 Nov 2009 03:32:44 -0000      1.5
+++ tcltk-x86_64.info   12 Feb 2010 06:34:46 -0000      1.6
@@ -1,6 +1,6 @@
 Package: tcltk
 Version: 8.5.7
-Revision: 3
+Revision: 4
 Architecture: x86_64
 BuildDepends: x11-dev, fink (>= 0.24.12-1)
 BuildConflicts: freetype219
@@ -24,7 +24,8 @@
        popd
 
        pushd tk%v/unix
-               ./configure %c --build=%m-apple-darwin`uname -r|cut -f1 -d.` 
--host=%m-apple-darwin`uname -r|cut -f1 -d.`
+               export DYLD_FALLBACK_LIBRARY_PATH=%b/tcl%v/unix
+               ac_cv_path_tclsh=%b/tcl%v/unix/tclsh ./configure %c 
--build=%m-apple-darwin`uname -r|cut -f1 -d.` --host=%m-apple-darwin`uname 
-r|cut -f1 -d.`
                make genstubs
                make
        popd
@@ -113,6 +114,11 @@
        tcl and tk are build in separate/parallel dirs. Clearer to do
        NoSourceDirectory and have them both subdirs of %b than to
        have one be %b and keep having to 'cd ..'
+
+       Make sure tk build finds tclsh from current build rather than
+       different-version one from installed fink package or different
+       arch and build-options one from OS X. Thanks pogma for helping
+       make sure tclsh finds its libtcl
 <<
 DescDetail: <<
 Tcl provides a portable scripting environment for Unix, Windows,


------------------------------------------------------------------------------
SOLARIS 10 is the OS for Data Centers - provides features such as DTrace,
Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW
http://p.sf.net/sfu/solaris-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to