diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-07 11:42:03 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-07 11:42:03 +0100 |
| commit | f70601e0934acd62f6c5d06c5ede4cc607179514 (patch) | |
| tree | 0b337390375de04b950fc4b45edc0f895a4701a4 /sci-mathematics/octave/files/octave-4.4.0-imagemagick-configure.patch | |
| parent | b2be182d49eea46686b5cf2680d457df61e89dc4 (diff) | |
gentoo resync : 07.07.2018
Diffstat (limited to 'sci-mathematics/octave/files/octave-4.4.0-imagemagick-configure.patch')
| -rw-r--r-- | sci-mathematics/octave/files/octave-4.4.0-imagemagick-configure.patch | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/sci-mathematics/octave/files/octave-4.4.0-imagemagick-configure.patch b/sci-mathematics/octave/files/octave-4.4.0-imagemagick-configure.patch new file mode 100644 index 000000000000..ce81b801d99c --- /dev/null +++ b/sci-mathematics/octave/files/octave-4.4.0-imagemagick-configure.patch @@ -0,0 +1,16 @@ +--- a/configure.ac 2018-04-30 19:03:56.000000000 +0200 ++++ a/configure.ac.new 2018-05-22 12:23:30.371174341 +0200 +@@ -1946,11 +1946,11 @@ + MAGICK_LIBS= + + PKG_CHECK_EXISTS([$magick++], [ +- dnl Make sure we only get -I, -L, and -l flags. ++ dnl Make sure we only get -I, -D, -L, and -l flags. + dnl Some Graphics/ImageMagick++ dnl packages add extra flags that are + dnl useful when building Graphics/ImageMagick++ extentions. These extra + dnl flags break the Octave build. +- MAGICK_CPPFLAGS="$($PKG_CONFIG --cflags-only-I $magick++ | $SED -e 's/^ *$//')" ++ MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags $magick++ | sed -e 's/\(-@<:@DI@:>@@<:@^ \t@:>@*\)\|\(-@<:@^ \t@:>@*\)/\1/g'` + MAGICK_LDFLAGS="$($PKG_CONFIG --libs-only-L $magick++ | $SED -e 's/^ *$//')" + MAGICK_LIBS="$($PKG_CONFIG --libs-only-l $magick++ | $SED -e 's/^ *$//')" + |