# HG changeset patch # User Christopher Rogers # Date 1286729679 0 # Node ID ceaf8fc264b86695e058d275c29e9a4c55ca22b2 # Parent 7130b9831b50cec3da92548672d8b8ed129f9d82 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. diff -r 7130b9831b50 -r ceaf8fc264b8 octave/receipt --- a/octave/receipt Sun Oct 10 15:15:08 2010 +0000 +++ b/octave/receipt Sun Oct 10 16:54:39 2010 +0000 @@ -8,7 +8,7 @@ TARBALL="$PACKAGE-$VERSION.tar.bz2" WEB_SITE="http://www.gnu.org/software/octave/" WGET_URL="ftp://ftp.octave.org/pub/$PACKAGE/$TARBALL" -BUILD_DEPENDS="gfortran zlib-dev ncurses-dev readline-dev freetype-dev xorg-dev fltk" +BUILD_DEPENDS="gfortran zlib-dev ncurses-dev readline-dev freetype-dev xorg-dev fltk perl" DEPENDS="libgfortran zlib ncurses readline freetype gcc-lib-base \ libgl libglu xorg-libX11 xorg-libXext xorg-libXxf86vm xorg-libXdamage \ xorg-libXfixes libdrm xorg-libXau xorg-libXdmcp pcre libcurl" @@ -18,10 +18,17 @@ compile_rules() { cd $src + patch -Np1 -i ../stuff/octave-3.2.0_as_needed.patch + patch -Np1 -i ../stuff/octave-3.2.0_parallel_make.patch + sed -i 's/scripts doc check/scripts check/' Makefile + + # http://www.nabble.com/Random-rounding-errors-td16010966.html + FFLAGS="-O -ffloat-store" \ ./configure --prefix=/usr --infodir=/usr/share/info \ --libexecdir=/usr/lib/$PACKAGE \ --mandir=/usr/share/man \ + --enable-shared --disable-static \ $CONFIGURE_ARGS && make -j 4 && make DESTDIR=$PWD/_pkg install diff -r 7130b9831b50 -r ceaf8fc264b8 octave/stuff/octave-3.2.0_as_needed.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/octave/stuff/octave-3.2.0_as_needed.patch Sun Oct 10 16:54:39 2010 +0000 @@ -0,0 +1,11 @@ +diff -Naur octave-3.2.0/liboctave/Makefile.in octave-3.2.0.new/liboctave/Makefile.in +--- octave-3.2.0/liboctave/Makefile.in 2009-05-25 02:04:59.000000000 -0400 ++++ octave-3.2.0.new/liboctave/Makefile.in 2009-07-10 10:32:09.000000000 -0400 +@@ -35,6 +35,7 @@ + DLL_CXXDEFS = @OCTAVE_DLL_DEFS@ + + LINK_DEPS = \ ++ -lpthread \ + -L../libcruft -L. $(RLD_FLAG) \ + $(LIBCRUFT) $(CHOLMOD_LIBS) $(UMFPACK_LIBS) $(AMD_LIBS) \ + $(CAMD_LIBS) $(COLAMD_LIBS) $(CCOLAMD_LIBS) $(CXSPARSE_LIBS) \ diff -r 7130b9831b50 -r ceaf8fc264b8 octave/stuff/octave-3.2.0_parallel_make.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/octave/stuff/octave-3.2.0_parallel_make.patch Sun Oct 10 16:54:39 2010 +0000 @@ -0,0 +1,12 @@ +diff -Naur octave-3.2.0/doc/Makefile.in octave-3.2.0.new/doc/Makefile.in +--- octave-3.2.0/doc/Makefile.in 2009-06-03 07:55:40.000000000 -0400 ++++ octave-3.2.0.new/doc/Makefile.in 2009-07-07 18:20:14.000000000 -0400 +@@ -30,6 +30,8 @@ + all: conf.texi $(SUBDIRS) + .PHONY: all + ++$(SUBDIRS): conf.texi ++ + conf.texi: conf.texi.in $(TOPDIR)/Makeconf + @$(do-subst-texinfo-vals) +