Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv21784
Modified Files:
fltk-backend-oct-3.2.4.info octave-3.0.5.info
octave-3.2.4.info octave.patch
Added Files:
fltk-backend-oct324.patch octave-glpk.patch
Removed Files:
fltk-backend.patch
Log Message:
Was in the middle of revising the patching scheme when I discovered
that Xcode 4.2 broke Octave-3.2.4's build, so commit at this working
stage.
--- NEW FILE: octave-glpk.patch ---
diff -Nurd -x'*~' octave-@[email protected]/src/DLD-FUNCTIONS/__glpk__.cc
octave-@OCTVERSION@/src/DLD-FUNCTIONS/__glpk__.cc
--- octave-@[email protected]/src/DLD-FUNCTIONS/__glpk__.cc 2009-01-16
01:46:23.000000000 -0500
+++ octave-@OCTVERSION@/src/DLD-FUNCTIONS/__glpk__.cc 2010-10-15
17:50:25.000000000 -0400
@@ -59,8 +59,20 @@
#else
-void _glp_lib_print_hook (int (*func)(void *info, char *buf), void *info);
-void _glp_lib_fault_hook (int (*func)(void *info, char *buf), void *info);
+void _glp_lib_print_hook (int (*func)(void *info, char *buf), void *info)
+{ /* stolen from glpk-4.26 */
+ int (*hook)(void *, const char *) = (int(*)(void *, const char *))
+ (func);
+ glp_term_hook(hook, info);
+ return;
+}
+
+void _glp_lib_fault_hook (int (*func)(void *info, char *buf), void *info)
+{ /* stolen from glpk-4.26 */
+ assert(func == func);
+ assert(info == info);
+ return;
+}
#endif
}
--- fltk-backend.patch DELETED ---
Index: octave.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/octave.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- octave.patch 23 Sep 2011 15:55:06 -0000 1.4
+++ octave.patch 15 Oct 2011 22:17:12 -0000 1.5
@@ -1,29 +1,3 @@
-diff -Nurd -x'*~' octave-@[email protected]/src/DLD-FUNCTIONS/__glpk__.cc
octave-@OCTVERSION@/src/DLD-FUNCTIONS/__glpk__.cc
---- octave-@[email protected]/src/DLD-FUNCTIONS/__glpk__.cc 2009-01-16
01:46:23.000000000 -0500
-+++ octave-@OCTVERSION@/src/DLD-FUNCTIONS/__glpk__.cc 2010-10-15
17:50:25.000000000 -0400
-@@ -59,8 +59,20 @@
-
- #else
-
--void _glp_lib_print_hook (int (*func)(void *info, char *buf), void *info);
--void _glp_lib_fault_hook (int (*func)(void *info, char *buf), void *info);
-+void _glp_lib_print_hook (int (*func)(void *info, char *buf), void *info)
-+{ /* stolen from glpk-4.26 */
-+ int (*hook)(void *, const char *) = (int(*)(void *, const char *))
-+ (func);
-+ glp_term_hook(hook, info);
-+ return;
-+}
-+
-+void _glp_lib_fault_hook (int (*func)(void *info, char *buf), void *info)
-+{ /* stolen from glpk-4.26 */
-+ assert(func == func);
-+ assert(info == info);
-+ return;
-+}
-
- #endif
- }
diff -Nurd '-x*~' octave-@OCTVERSION@//octave-forge-comp
octave-@[email protected]//octave-forge-comp
--- octave-@OCTVERSION@//octave-forge-comp 1969-12-31 19:00:00.000000000
-0500
+++ octave-@[email protected]//octave-forge-comp 2011-08-11
20:23:10.000000000 -0400
Index: octave-3.2.4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/octave-3.2.4.info,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- octave-3.2.4.info 2 Oct 2011 23:47:36 -0000 1.24
+++ octave-3.2.4.info 15 Oct 2011 22:17:12 -0000 1.25
@@ -33,20 +33,46 @@
Replaces: %{Ni}, %{Ni}-atlas, %{Ni}3.0.2 ( << 3.0.2-5), %{Ni}3.0.2-atlas ( <<
3.0.2-5)
UseMaxBuildJobs: false
-PatchFile: %{ni}.patch
-PatchFile-MD5: 88467884eb9955a26a37b9b3b87e122f
-PatchFile2: %{ni}-%v.patch
-PatchFile2-MD5: a09d6337e021085a8c9d14c5bdcdf088
-PatchFile3: %{ni}-10.7.patch
-PatchFile3-MD5: adf5439f08870b6f7ba0d9be7e85bb22
+PatchFile: %{ni}-glpk.patch
+PatchFile-MD5: a4861a0803cfbbbb8892019cd5f217d2
+PatchFile2: %{ni}.patch
+PatchFile2-MD5: 94f6e470ee04b0e2837709966fc31420
+PatchFile3: %{ni}-%v.patch
+PatchFile3-MD5: a09d6337e021085a8c9d14c5bdcdf088
+PatchFile4: %{ni}-10.7.patch
+PatchFile4-MD5: adf5439f08870b6f7ba0d9be7e85bb22
PatchScript: <<
#!/bin/sh -ev
+ #fix for use of glpk private internals
+ patch -p1 < %{PatchFile}
+ # create versioned manpages
cp doc/interpreter/%{Ni}.1 doc/interpreter/%{Ni}-%v.1
cp doc/interpreter/%{Ni}-bug.1 doc/interpreter/%{Ni}-bug-%v.1
cp doc/interpreter/%{Ni}-config.1 doc/interpreter/%{Ni}-config-%v.1
cp doc/interpreter/mkoctfile.1 doc/interpreter/mkoctfile-%v.1
- sed -e 's/@OCTVERSION@/%v/g' %{PatchFile} | patch -p1
+ #Fink-specific changes
+ sed -e 's/@OCTVERSION@/%v/g' %{PatchFile2} | patch -p1
sed -i -e 's|@FINKPREFIX@|%p|g' %{Ni}-forge* %{Ni}rc
doc/interpreter/*.1 mkoctfile.in
+ # Put compiler information without 'flag-sort' into oct-conf.h, which
in
+ # turn gets harcoded into the Octave interpreter's 'octave_config_info'
+ # function, which is then used by some of the octave-forge packages at
+ # configure time. Also do this for mkoctfile.in.
+ sed -i.bak -e "s|%%OCTAVE_CONF_CC%%|\"`which gcc`\"|" \
+ -e "s|%%OCTAVE_CONF_CXXCPP%%|\"`which g++`
-E\"|" \
+ -e "s|%%OCTAVE_CONF_CXX%%|\"`which g++`\"|" \
+ -e "s|%%OCTAVE_CONF_DL_LD%%|\"`which g++`\"|" \
+ -e "s|%%OCTAVE_CONF_LD_CXX%%|\"`which g++`\"|" \
+ -e "s|%%OCTAVE_CONF_SH_LD%%|\"`which g++`\"|"
src/oct-conf.h.in mkoctfile.in
+ # Add the BLAS C library for the -atlas variant.
+ if [ "%type_pkg[-atlas]" = "-atlas" ]
+ then sed -i.bak -e
's|%%OCTAVE_CONF_BLAS_LIBS%%|"%p/lib/liblapack.dylib %p/lib/libf77blas.dylib
%p/lib/libcblas.dylib"|' \
+ src/oct-conf.h.in
mkoctfile.in
+ fi
+ # disable FLTK backend since that's in a separate package, and make
sure GraphicsMagick
+ # gets activated properly.
+ patch -p1 < %{PatchFile3}
+ # fix lack of CGDisplayBitsPerPixel
+ patch -p1 < %{PatchFile4}
# fix lib name for qhull6
perl -pi -e 's|(qhull[/.])|lib\1|g ; s|lqhull|lqhull6|' configure
# wrong include dir for qhull6
@@ -71,25 +97,7 @@
# missing qualifier to dependent-name member-function
sed -i.orig -e '/truncate_int/s|\(return\) \(truncate_int\)|\1
octave_int_base<T>::\2|' \
liboctave/oct-inttypes.h
- # disable FLTK backend
- patch -p1 < %{PatchFile2}
- # fix lack of CGDisplayBitsPerPixel
- patch -p1 < %{PatchFile3}
- # Put compiler information without 'flag-sort' into oct-conf.h, which
in
- # turn gets harcoded into the Octave interpreter's 'octave_config_info'
- # function, which is then used by some of the octave-forge packages at
- # configure time. Also do this for mkoctfile.in.
- sed -i.bak -e "s|%%OCTAVE_CONF_CC%%|\"`which gcc`\"|" \
- -e "s|%%OCTAVE_CONF_CXXCPP%%|\"`which g++`
-E\"|" \
- -e "s|%%OCTAVE_CONF_CXX%%|\"`which g++`\"|" \
- -e "s|%%OCTAVE_CONF_DL_LD%%|\"`which g++`\"|" \
- -e "s|%%OCTAVE_CONF_LD_CXX%%|\"`which g++`\"|" \
- -e "s|%%OCTAVE_CONF_SH_LD%%|\"`which g++`\"|"
src/oct-conf.h.in mkoctfile.in
- # Add the BLAS C library for the -atlas variant.
- if [ "%type_pkg[-atlas]" = "-atlas" ]
- then sed -i.bak -e
's|%%OCTAVE_CONF_BLAS_LIBS%%|"%p/lib/liblapack.dylib %p/lib/libf77blas.dylib
%p/lib/libcblas.dylib"|' \
- src/oct-conf.h.in
mkoctfile.in
- fi
+ sed -i.orig -e 's|template static|template|g' liboctave/eigs-base.cc
<<
SetCC: flag-sort -r gcc
@@ -163,10 +171,8 @@
-e "s|flag-sort -r g++|`which g++`|g" \
%i/bin/%{Ni}-bug-%v
# for the -atlas variant, add libcblas.dylib to BLAS_LIBS:
- if ["%type_pkg[-atlas]" = "-atlas"]
- then perl -pi -e 's|(%p/lib/liblapack.dylib %p/lib/libf77blas.dylib)|$1
%p/lib/libcblas.dylib|' \
- %i/bin/%{ni}-bug-%v
- fi
+ perl -pi -e 's|(%p/lib/liblapack.dylib %p/lib/libf77blas.dylib)|$1
%p/lib/libcblas.dylib|' \
+ %i/bin/%{ni}-bug-%v
# generate Fink-gcc enabled mkoctfile
cp %i/bin/mkoctfile-%type_raw[oct]
%i/bin/mkoctfile-%type_raw[oct]-gcc%type_raw[gcc]
perl -pi -e \
@@ -486,9 +492,6 @@
Get rid of the ugly construction previously used for setting the BLAS and
LAPACK libraries.
-Fix issue in which BLAS_LIBS wasn't getting properly encoded for the x86_64
-non-atlas variant.
-
Now includes an additional mkoctfile which uses Fink's gcc46 compilers instead
of Xcode's.
<<
--- NEW FILE: fltk-backend-oct324.patch ---
diff -Nurd octave-3.2.4/src/Makefile.in octave-3.2.4.patched/src/Makefile.in
--- octave-3.2.4/src/Makefile.in 2009-06-03 08:32:49.000000000 -0400
+++ octave-3.2.4.patched/src/Makefile.in 2011-09-05 13:35:11.000000000
-0400
@@ -63,21 +63,7 @@
OPT_IN := $(addprefix ../liboctave/, $(addsuffix .in, $(OPT_BASE)))
OPT_INC := $(addprefix ../liboctave/, $(addsuffix .h, $(OPT_BASE)))
-DLD_XSRC := amd.cc balance.cc besselj.cc betainc.cc bsxfun.cc \
- cellfun.cc chol.cc ccolamd.cc colamd.cc colloc.cc \
- conv2.cc convhulln.cc daspk.cc dasrt.cc dassl.cc det.cc \
- dispatch.cc dlmread.cc dmperm.cc eig.cc eigs.cc fft.cc \
- fft2.cc fftn.cc fftw.cc filter.cc find.cc fltk_backend.cc \
- gammainc.cc gcd.cc getgrent.cc getpwent.cc getrusage.cc \
- givens.cc hess.cc hex2num.cc inv.cc kron.cc lookup.cc \
- lsode.cc lu.cc luinc.cc matrix_type.cc max.cc md5sum.cc \
- pinv.cc qr.cc quad.cc qz.cc rand.cc rcond.cc regexp.cc \
- schur.cc sparse.cc spparms.cc sqrtm.cc svd.cc syl.cc \
- symrcm.cc symbfact.cc time.cc tsearch.cc typecast.cc \
- urlwrite.cc __contourc__.cc __delaunayn__.cc \
- __dsearchn__.cc __glpk__.cc __lin_interpn__.cc \
- __magick_read__.cc __pchip_deriv__.cc __qp__.cc \
- __voronoi__.cc __convn__.cc
+DLD_XSRC := fltk_backend.cc
DLD_SRC := $(addprefix DLD-FUNCTIONS/, $(DLD_XSRC))
Index: octave-3.0.5.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/octave-3.0.5.info,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- octave-3.0.5.info 2 Oct 2011 23:43:47 -0000 1.23
+++ octave-3.0.5.info 15 Oct 2011 22:17:12 -0000 1.24
@@ -27,15 +27,21 @@
Replaces: %{Ni}, %{Ni}-atlas, %{Ni}3.0.2 ( << 3.0.2-5), %{Ni}3.0.2-atlas ( <<
3.0.2-5)
UseMaxBuildJobs: false
-PatchFile: %{ni}.patch
-PatchFile-MD5: 88467884eb9955a26a37b9b3b87e122f
+PatchFile: %{ni}-glpk.patch
+PatchFile-MD5: a4861a0803cfbbbb8892019cd5f217d2
+PatchFile2: %{ni}.patch
+PatchFile2-MD5: 94f6e470ee04b0e2837709966fc31420
PatchScript: <<
#!/bin/sh -ev
+ #fix for use of glpk private internals
+ patch -p1 < %{PatchFile}
+ # create versioned manpages
cp doc/interpreter/%{Ni}.1 doc/interpreter/%{Ni}-%v.1
cp doc/interpreter/%{Ni}-bug.1 doc/interpreter/%{Ni}-bug-%v.1
cp doc/interpreter/%{Ni}-config.1 doc/interpreter/%{Ni}-config-%v.1
cp doc/interpreter/mkoctfile.1 doc/interpreter/mkoctfile-%v.1
- sed -e 's/@OCTVERSION@/%v/g' %{PatchFile} | patch -p1
+ #Fink-specific changes
+ sed -e 's/@OCTVERSION@/%v/g' %{PatchFile2} | patch -p1
sed -i -e 's|@FINKPREFIX@|%p|g' %{Ni}-forge* %{Ni}rc
doc/interpreter/*.1 mkoctfile.in
# fix lib name for qhull6
perl -pi -e 's|(qhull[/.])|lib\1|g ; s|lqhull|lqhull6|' configure
Index: fltk-backend-oct-3.2.4.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/fltk-backend-oct-3.2.4.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- fltk-backend-oct-3.2.4.info 8 Sep 2011 15:27:17 -0000 1.8
+++ fltk-backend-oct-3.2.4.info 15 Oct 2011 22:17:12 -0000 1.9
@@ -1,6 +1,6 @@
Info2: <<
-Package: fltk-backend-%type_pkg[ui]-oct%type_pkg[oct]
-Type: ui (x11 aqua), oct(3.2.4)
+Package: fltk-backend%type_pkg[-ui]-oct%type_pkg[oct]
+Type: -ui (-x11 -aqua), oct(3.2.4)
Version: 3.2.4
Revision: 2
Maintainer: Alexander Hansen <[email protected]>
@@ -16,18 +16,18 @@
SourceDirectory: octave-%v
BuildDepends: <<
- (%type_pkg[ui] = x11) fltk-x11,
- (%type_pkg[ui] = x11) x11-dev,
- (%type_pkg[ui] = aqua) fltk13-aqua,
+ (%type_pkg[-ui] = -x11) fltk-x11,
+ (%type_pkg[-ui] = -x11) x11-dev,
+ (%type_pkg[-ui] = -aqua) fltk13-aqua,
arpack, glpk-dev, hdf5.7, readline5, libncurses5, fftw3 (>= 3.1.1-7),
libcurl4, libftgl2, qhull6-dev, qrupdate | qrupdate-atlas, flag-sort,
pcre, gcc46-compiler, suitesparse-metis, fink (>= 0.30.0), sed,
graphicsmagick-dev, freetype219, libftgl2
<<
Depends: <<
- (%type_pkg[ui] = x11) fltk-x11-shlibs,
- (%type_pkg[ui] = x11) x11,
- (%type_pkg[ui] = aqua) fltk13-aqua-shlibs
+ (%type_pkg[-ui] = -x11) fltk-x11-shlibs,
+ (%type_pkg[-ui] = -x11) x11,
+ (%type_pkg[-ui] = -aqua) fltk13-aqua-shlibs
<<
BuildConflicts: coot-dev, broken-gcc, lammpi-dev, fort77, 4ti2-dev
GCC: 4.0
@@ -35,16 +35,26 @@
Replaces: fltk-backend-aqua-oct%type_pkg[oct],
fltk-backend-x11-oct%type_pkg[oct]
UseMaxBuildJobs: false
-PatchFile: fltk-backend.patch
-PatchFile-MD5: 1df437597f67ce17b321534513e5946f
+PatchFile: octave-glpk.patch
+PatchFile-MD5: a4861a0803cfbbbb8892019cd5f217d2
+PatchFile2: %{ni}%type_pkg[oct].patch
+PatchFile2-MD5: 4897b35503d3ffa49f3f5547669feb29
PatchFile3: octave-10.7.patch
PatchFile3-MD5: adf5439f08870b6f7ba0d9be7e85bb22
-PatchFile2: fltk-backend-x11.patch
-PatchFile2-MD5: 6dd5be3b8d199fb76a72997ea50d05d4
+PatchFile4: fltk-backend-x11.patch
+PatchFile4-MD5: 6dd5be3b8d199fb76a72997ea50d05d4
PatchScript: <<
#!/bin/sh -ev
- sed -e 's/@OCTVERSION@/%v/g' %{PatchFile} | patch -p1
+ patch -p1 < %{PatchFile}
+ sed -e 's/@OCTVERSION@/%v/g' %{PatchFile2} | patch -p1
+ # Needed for 10.7 only, but shouldn't hurt on earlier OSes
+ if [ "%type_pkg[-ui]" = "-aqua" ]
+ then
+ patch -p1 < %{PatchFile3}
+ else
+ patch -p1 < %{PatchFile4}
+ fi
# fix lib name for qhull6
perl -pi -e 's|(qhull[/.])|lib\1|g ; s|lqhull|lqhull6|' configure
# wrong include dir for qhull6
@@ -68,13 +78,6 @@
done
# missing qualifier to dependent-name member-function
sed -i.orig -e '/truncate_int/s|\(return\) \(truncate_int\)|\1
octave_int_base<T>::\2|' liboctave/oct-inttypes.h
- # Needed for 10.7 only, but may work on earlier OSes
- if [ "%type_pkg[ui]" = "aqua" ]
- then
- patch -p1 < %{PatchFile3}
- else
- patch -p1 < %{PatchFile2}
- fi
perl -pi -e 's/scripts doc/scripts/; s/INSTALL.OCTAVE//' Makefile
<<
@@ -86,12 +89,12 @@
F77=%p/bin/gfortran-fsf-4.6 --host=%m-apple-darwin
--build=%m-apple-darwin \
--infodir='${prefix}/share/info' --mandir='${prefix}/share/man'
--libexecdir='${prefix}/lib' \
--enable-shared --enable-dl --without-mpi --with-hdf5 --with-fftw \
- (%type_pkg[ui] = x11 ) --with-x \
- (%type_pkg[ui] = x11 ) --x-libraries=/usr/X11/lib \
- (%type_pkg[ui] = x11 ) --x-includes=/usr/X11/include \
- (%type_pkg[ui] = x11 ) --without-framework-carbon \
- (%type_pkg[ui] = aqua ) --without-x \
- (%type_pkg[ui] = aqua ) --with-framework-carbon \
+ (%type_pkg[-ui] = -x11 ) --with-x \
+ (%type_pkg[-ui] = -x11 ) --x-libraries=/usr/X11/lib \
+ (%type_pkg[-ui] = -x11 ) --x-includes=/usr/X11/include \
+ (%type_pkg[-ui] = -x11 ) --without-framework-carbon \
+ (%type_pkg[-ui] = -aqua ) --without-x \
+ (%type_pkg[-ui] = -aqua ) --with-framework-carbon \
--disable-static
<<
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2d-oct
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
