wok rev 6643

Added patchs to octave. I hope it fixes it since it takes forever to compile on my dual core pc to know of sure if it does.
author Christopher Rogers <slaxemulator@gmail.com>
date Sun Oct 10 16:54:39 2010 +0000 (2010-10-10)
parents 7130b9831b50
children e4647b7a54e0
files octave/receipt octave/stuff/octave-3.2.0_as_needed.patch octave/stuff/octave-3.2.0_parallel_make.patch
line diff
     1.1 --- a/octave/receipt	Sun Oct 10 15:15:08 2010 +0000
     1.2 +++ b/octave/receipt	Sun Oct 10 16:54:39 2010 +0000
     1.3 @@ -8,7 +8,7 @@
     1.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
     1.5  WEB_SITE="http://www.gnu.org/software/octave/"
     1.6  WGET_URL="ftp://ftp.octave.org/pub/$PACKAGE/$TARBALL"
     1.7 -BUILD_DEPENDS="gfortran zlib-dev ncurses-dev readline-dev freetype-dev xorg-dev fltk"
     1.8 +BUILD_DEPENDS="gfortran zlib-dev ncurses-dev readline-dev freetype-dev xorg-dev fltk perl"
     1.9  DEPENDS="libgfortran zlib ncurses readline freetype gcc-lib-base \
    1.10  libgl libglu xorg-libX11 xorg-libXext xorg-libXxf86vm xorg-libXdamage \
    1.11  xorg-libXfixes libdrm xorg-libXau xorg-libXdmcp pcre libcurl"
    1.12 @@ -18,10 +18,17 @@
    1.13  compile_rules()
    1.14  {
    1.15  	cd $src
    1.16 +	patch -Np1 -i ../stuff/octave-3.2.0_as_needed.patch
    1.17 +	patch -Np1 -i ../stuff/octave-3.2.0_parallel_make.patch
    1.18 +
    1.19  	sed -i 's/scripts doc check/scripts check/' Makefile
    1.20 +
    1.21 +	# http://www.nabble.com/Random-rounding-errors-td16010966.html
    1.22 +	FFLAGS="-O -ffloat-store" \
    1.23  	./configure --prefix=/usr --infodir=/usr/share/info \
    1.24  	--libexecdir=/usr/lib/$PACKAGE \
    1.25  	--mandir=/usr/share/man \
    1.26 +	--enable-shared --disable-static \
    1.27  	$CONFIGURE_ARGS &&
    1.28  	make -j 4 &&
    1.29  	make DESTDIR=$PWD/_pkg install

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/octave/stuff/octave-3.2.0_as_needed.patch	Sun Oct 10 16:54:39 2010 +0000
     2.3 @@ -0,0 +1,11 @@
     2.4 +diff -Naur octave-3.2.0/liboctave/Makefile.in octave-3.2.0.new/liboctave/Makefile.in
     2.5 +--- octave-3.2.0/liboctave/Makefile.in	2009-05-25 02:04:59.000000000 -0400
     2.6 ++++ octave-3.2.0.new/liboctave/Makefile.in	2009-07-10 10:32:09.000000000 -0400
     2.7 +@@ -35,6 +35,7 @@
     2.8 + DLL_CXXDEFS = @OCTAVE_DLL_DEFS@
     2.9 + 
    2.10 + LINK_DEPS = \
    2.11 ++  -lpthread \
    2.12 +   -L../libcruft -L. $(RLD_FLAG) \
    2.13 +   $(LIBCRUFT) $(CHOLMOD_LIBS) $(UMFPACK_LIBS)  $(AMD_LIBS) \
    2.14 +   $(CAMD_LIBS) $(COLAMD_LIBS) $(CCOLAMD_LIBS) $(CXSPARSE_LIBS) \

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/octave/stuff/octave-3.2.0_parallel_make.patch	Sun Oct 10 16:54:39 2010 +0000
     3.3 @@ -0,0 +1,12 @@
     3.4 +diff -Naur octave-3.2.0/doc/Makefile.in octave-3.2.0.new/doc/Makefile.in
     3.5 +--- octave-3.2.0/doc/Makefile.in	2009-06-03 07:55:40.000000000 -0400
     3.6 ++++ octave-3.2.0.new/doc/Makefile.in	2009-07-07 18:20:14.000000000 -0400
     3.7 +@@ -30,6 +30,8 @@
     3.8 + all: conf.texi $(SUBDIRS)
     3.9 + .PHONY: all
    3.10 + 
    3.11 ++$(SUBDIRS): conf.texi
    3.12 ++
    3.13 + conf.texi: conf.texi.in $(TOPDIR)/Makeconf
    3.14 + 	@$(do-subst-texinfo-vals)
    3.15 +