Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv9989/10.7/stable/main/finkinfo/sci
Modified Files:
ad-oct.info audio-oct.info gsl-oct.info
miscellaneous-oct-1.0.7.info octcdf-oct-1.0.12.info
Log Message:
More build cleanup.
Index: ad-oct.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/ad-oct.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ad-oct.info 14 Sep 2011 01:04:01 -0000 1.1
+++ ad-oct.info 14 Sep 2011 13:55:41 -0000 1.2
@@ -84,7 +84,13 @@
SetLIBRARY_PATH: /usr/X11R6/lib:%p/lib
SetMAKEFLAGS: -j1
-CompileScript: %p/share/octave/%type_raw[oct]/scripts/octave-forge-compile.sh
%type_raw[forge]-%v
+CompileScript: <<
+#!/bin/sh -ev
+export CC=`which cc`
+export CXX=`which c++`
+export OCTAVE=%p/bin/octave-%type_raw[oct]
+%p/share/octave/%type_raw[oct]/scripts/octave-forge-compile.sh
%type_raw[forge]-%v
+<<
InstallScript: <<
#!/bin/sh -ev
@@ -109,7 +115,12 @@
PreRmScript:
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-prerm
DescPackaging: <<
-Common for all octave-forge packages.
+This package:
+Somehow finds a reference to flag-sort, even though that has been scrubbed
+from all of the text files in our Octave distros, so we have to set CC and CXX
+explicitly.
+
+Common for all octave-forge packages:
We read in postinst and prerm template scripts installed by octaveN and modify
them to use the name of this package because Octave's package manager can't
Index: audio-oct.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/audio-oct.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- audio-oct.info 14 Sep 2011 13:09:35 -0000 1.1
+++ audio-oct.info 14 Sep 2011 13:55:41 -0000 1.2
@@ -57,6 +57,7 @@
#!/bin/sh -ev
export CC=`which cc`
export CXX=`which c++`
+export OCTAVE=%p/bin/octave-%type_raw[oct]
%p/share/octave/%type_raw[oct]/scripts/octave-forge-compile.sh
%type_raw[forge]-%v
<<
Index: miscellaneous-oct-1.0.7.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/miscellaneous-oct-1.0.7.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- miscellaneous-oct-1.0.7.info 7 Sep 2011 00:19:42 -0000 1.2
+++ miscellaneous-oct-1.0.7.info 14 Sep 2011 13:55:41 -0000 1.3
@@ -66,7 +66,13 @@
SetLIBRARY_PATH: /usr/X11R6/lib:%p/lib
SetMAKEFLAGS: -j1
-CompileScript: %p/share/octave/%type_raw[oct]/scripts/octave-forge-compile.sh
%type_raw[forge]-%v
+CompileScript: <<
+#!/bin/sh -ev
+export CC=`which cc`
+export CXX=`which c++`
+export OCTAVE=%p/bin/octave-%type_raw[oct]
+%p/share/octave/%type_raw[oct]/scripts/octave-forge-compile.sh
%type_raw[forge]-%v
+<<
InstallScript: <<
#!/bin/sh -ev
@@ -79,6 +85,7 @@
sed -i -e 's/@PKGNAME@/%type_raw[forge]/' octave-forge-prerm
chmod a+x octave-forge*
<<
+
PostInstScript: <<
if [ -s %p/var/octave/%type_raw[oct]/octave_packages ] && [ -f
%p/var/octave/%type_raw[oct]/octave_packages ]
then
@@ -91,8 +98,12 @@
PreRmScript:
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-prerm
DescPackaging: <<
-Common for all octave-forge packages.
+This package:
+Somehow finds a reference to flag-sort, even though that has been scrubbed
+from all of the text files in our Octave distros, so we have to set CC and CXX
+explicitly.
+Common for all octave-forge packages:
We read in postinst and prerm template scripts installed by octaveN and modify
them to use the name of this package because Octave's package manager can't
cope with non-literal arguments.
Index: gsl-oct.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/gsl-oct.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gsl-oct.info 14 Sep 2011 13:09:35 -0000 1.4
+++ gsl-oct.info 14 Sep 2011 13:55:41 -0000 1.5
@@ -173,6 +173,7 @@
#!/bin/sh -ev
export CC=`which cc`
export CXX=`which c++`
+ export OCTAVE=%p/bin/octave-%type_raw[oct]
rm -rf doc/RCS
%p/share/octave/%type_raw[oct]/scripts/octave-forge-compile.sh
%type_raw[forge]-%v
<<
Index: octcdf-oct-1.0.12.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/octcdf-oct-1.0.12.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- octcdf-oct-1.0.12.info 8 Sep 2011 00:45:42 -0000 1.1
+++ octcdf-oct-1.0.12.info 14 Sep 2011 13:55:41 -0000 1.2
@@ -80,6 +80,8 @@
CompileScript: <<
#!/bin/sh -ev
+export CC=`which cc`
+export CXX=`which c++`
export OCTAVE=%p/bin/octave-%type_raw[oct]
%p/share/octave/%type_raw[oct]/scripts/octave-forge-compile.sh
%type_raw[forge]-%v
<<
@@ -108,8 +110,12 @@
PreRmScript:
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-prerm
DescPackaging: <<
-Common for all octave-forge packages.
+This package:
+Somehow finds a reference to flag-sort, even though that has been scrubbed
+from all of the text files in our Octave distros, so we have to set CC and CXX
+explicitly.
+Common for all octave-forge packages:
We read in postinst and prerm template scripts installed by octaveN and modify
them to use the name of this package because Octave's package manager can't
cope with non-literal arguments.
------------------------------------------------------------------------------
BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA
Learn about the latest advances in developing for the
BlackBerry® mobile platform with sessions, labs & more.
See new tools and technologies. Register for BlackBerry® DevCon today!
http://p.sf.net/sfu/rim-devcon-copy1
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
