diff options
| author |   Sebastien Fabbro <bicatali@gentoo.org> | 2010-03-06 18:40:20 +0000 |
|---|---|---|
| committer | Sebastien Fabbro <bicatali@gentoo.org> | 2010-03-06 18:40:20 +0000 |
| commit | fe6ed83e06e13444e1c4e2d6549fb6cffbfa778f (patch) | |
| tree | b29400885ad52782cbc5aeeee3d2f3a065db2e54 /sci-mathematics/octave/files | |
| parent | Add gpe-utils/gpe-plucker (diff) | |
| download | gentoo-2-fe6ed83e06e13444e1c4e2d6549fb6cffbfa778f.tar.gz gentoo-2-fe6ed83e06e13444e1c4e2d6549fb6cffbfa778f.tar.bz2 gentoo-2-fe6ed83e06e13444e1c4e2d6549fb6cffbfa778f.zip | |
Added a possibility to view results of tests (bug #303537), fixed imread (bug #307693), removed hdf5 (bug #299876), and now respect LDFLAGS
(Portage version: 2.2_rc63/cvs/Linux x86_64)
Diffstat (limited to 'sci-mathematics/octave/files')
| -rw-r--r-- | sci-mathematics/octave/files/octave-3.2.4-imread.patch | 29 | ||||
| -rw-r--r-- | sci-mathematics/octave/files/octave-3.2.4-ldflags.patch | 15 |
2 files changed, 44 insertions, 0 deletions
diff --git a/sci-mathematics/octave/files/octave-3.2.4-imread.patch b/sci-mathematics/octave/files/octave-3.2.4-imread.patch new file mode 100644 index 000000000000..4a7b73ea0ed8 --- /dev/null +++ b/sci-mathematics/octave/files/octave-3.2.4-imread.patch @@ -0,0 +1,29 @@ +--- src/DLD-FUNCTIONS/__magick_read__.cc.orig 2010-03-06 08:05:25.000000000 +0000 ++++ src/DLD-FUNCTIONS/__magick_read__.cc 2009-08-25 09:26:01.000000000 +0100 +@@ -30,6 +30,7 @@ + #include "defun-dld.h" + #include "error.h" + #include "ov-struct.h" ++#include "oct-env.h" + + #ifdef HAVE_MAGICK + +@@ -359,6 +358,18 @@ + + #ifdef HAVE_MAGICK + ++ static bool initialized = false; ++ ++ if (! initialized) ++ { ++ std::string program_name = octave_env::get_program_invocation_name (); ++ ++ Magick::InitializeMagick (program_name.c_str ()); ++ ++ initialized = true; ++ } ++ ++ + if (args.length () > 2 || args.length () < 1 || ! args(0).is_string () + || nargout > 3) + { diff --git a/sci-mathematics/octave/files/octave-3.2.4-ldflags.patch b/sci-mathematics/octave/files/octave-3.2.4-ldflags.patch new file mode 100644 index 000000000000..291914c6124e --- /dev/null +++ b/sci-mathematics/octave/files/octave-3.2.4-ldflags.patch @@ -0,0 +1,15 @@ +--- Makeconf.in.orig 2010-03-06 09:02:46.000000000 +0000 ++++ Makeconf.in 2010-03-06 09:23:06.000000000 +0000 +@@ -209,10 +209,10 @@ + BUILD_LDFLAGS = @BUILD_LDFLAGS@ + + SH_LD = @SH_LD@ +-SH_LDFLAGS = @SH_LDFLAGS@ ++SH_LDFLAGS = @SH_LDFLAGS@ @LDFLAGS@ + + DL_LD = @DL_LD@ +-DL_LDFLAGS = @DL_LDFLAGS@ ++DL_LDFLAGS = @DL_LDFLAGS@ @LDFLAGS@ + + SONAME_FLAGS = @SONAME_FLAGS@ + |