Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/languages In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv537
Modified Files: python27.info python31.info python32.info python33.info Log Message: Make python return the installed library as BLDLIBRARY. This is a hack and nothing should be using BLDLIBRARY since it's only supposed to be valid while python is building. Index: python31.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/python31.info,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- python31.info 16 Jun 2013 01:08:43 -0000 1.8 +++ python31.info 13 Aug 2013 01:11:59 -0000 1.9 @@ -1,7 +1,7 @@ Info2: << Package: python%type_pkg[python] Version: 3.1.5 -Revision: 4 +Revision: 5 Type: python 3.1 Maintainer: Daniel Johnson <dan...@daniel-johnson.org> Depends: << @@ -68,6 +68,7 @@ export MAKEFLAGS=-j1 make install DESTDIR=%d + perl -pi -e 's,BLDLIBRARY= .*$,BLDLIBRARY= %p/lib/python%type_raw[python]/config/libpython%type_raw[python].dylib,' %i/lib/python%type_raw[python]/config/Makefile # we don't want -lintl to appear in LIBS otherwise python-config will propagate it perl -pi -e 's/-lintl //' %i/lib/python%type_raw[python]/config/Makefile Index: python33.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/python33.info,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- python33.info 16 May 2013 11:43:13 -0000 1.8 +++ python33.info 13 Aug 2013 01:11:59 -0000 1.9 @@ -1,7 +1,7 @@ Info2: << Package: python%type_pkg[python] Version: 3.3.2 -Revision: 2 +Revision: 3 Type: python 3.3 Maintainer: Daniel Johnson <dan...@daniel-johnson.org> Depends: << @@ -80,7 +80,7 @@ # _sysconfigdata.py contains build-time variables that point to %b. # This is harmless but upsets fink's validator. # Change to %p/lib to make fink happy. - perl -pi -e 's,%b,%p/lib,' `ls -d %b/build/lib*`/_sysconfigdata.py + perl -pi -e 's,%b,%p/lib/python%type_raw[python]/config-%type_raw[python]m,' `ls -d %b/build/lib*`/_sysconfigdata.py # Don't propagate -lintl to other packages. perl -pi -e 's/-lintl //' `ls -d %b/build/lib*`/_sysconfigdata.py # install fails with -j greater than 1 @@ -89,7 +89,7 @@ # we don't want -lintl to appear in LIBS otherwise python-config will propagate it perl -pi -e 's/-lintl //' %i/lib/python%type_raw[python]/config-%type_raw[python]m/Makefile - + perl -pi -e 's,%b,%p/lib/python%type_raw[python]/config-%type_raw[python]m,' %i/lib/python%type_raw[python]/config-%type_raw[python]m/Makefile # fix all main things to be python-versioned filenames with # unversioned symlinks to them pushd %i/bin Index: python32.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/python32.info,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- python32.info 16 May 2013 01:24:03 -0000 1.9 +++ python32.info 13 Aug 2013 01:11:59 -0000 1.10 @@ -1,7 +1,7 @@ Info2: << Package: python%type_pkg[python] Version: 3.2.5 -Revision: 1 +Revision: 2 Type: python 3.2 Maintainer: Daniel Johnson <dan...@daniel-johnson.org> Depends: << @@ -78,6 +78,8 @@ export MAKEFLAGS=-j1 make install DESTDIR=%d + # Change to %p/lib to make fink happy. + perl -pi -e 's,%b,%p/lib/python%type_raw[python]/config-%type_raw[python]m,' %i/lib/python%type_raw[python]/config-%type_raw[python]m/Makefile # we don't want -lintl to appear in LIBS otherwise python-config will propagate it perl -pi -e 's/-lintl //' %i/lib/python%type_raw[python]/config-%type_raw[python]m/Makefile Index: python27.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/languages/python27.info,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- python27.info 16 May 2013 11:43:13 -0000 1.16 +++ python27.info 13 Aug 2013 01:11:59 -0000 1.17 @@ -1,7 +1,7 @@ Info2: << Package: python%type_pkg[python] Version: 2.7.5 -Revision: 2 +Revision: 3 Epoch: 1 Type: python 2.7 Maintainer: Daniel Johnson <dan...@daniel-johnson.org> @@ -80,7 +80,7 @@ # _sysconfigdata.py contains build-time variables that point to %b. # This is harmless but upsets fink's validator. # Change to %p/lib to make fink happy. - perl -pi -e 's,%b,%p/lib,' `ls -d %b/build/lib*`/_sysconfigdata.py + perl -pi -e 's,%b,%p/lib/python%type_raw[python]/config,' `ls -d %b/build/lib*`/_sysconfigdata.py # Don't propagate -lintl to other packages. perl -pi -e 's/-lintl //' `ls -d %b/build/lib*`/_sysconfigdata.py make install DESTDIR=%d ------------------------------------------------------------------------------ Get 100% visibility into Java/.NET code with AppDynamics Lite! It's a free troubleshooting tool designed for production. Get down to code-level detail for bottlenecks, with <2% overhead. Download for free and get started troubleshooting in minutes. http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs