diff options
| author |   Guillaume Horel <guillaume.horel@gmail.com> | 2013-10-28 01:34:53 -0400 |
|---|---|---|
| committer | Guillaume Horel <guillaume.horel@gmail.com> | 2013-10-28 01:34:53 -0400 |
| commit | b84fd861c8109d5bc5365b8ae3b4e92d0f970d15 (patch) | |
| tree | 65b6f749cd077b65d98522ae29c1797ef4d41dec /sci-mathematics/scilab | |
| parent | mask scilab-5.5.0 until release (diff) | |
| download | sci-b84fd861c8109d5bc5365b8ae3b4e92d0f970d15.tar.gz sci-b84fd861c8109d5bc5365b8ae3b4e92d0f970d15.tar.bz2 sci-b84fd861c8109d5bc5365b8ae3b4e92d0f970d15.zip | |
sci-mathematics/scilab add missing patch
Diffstat (limited to 'sci-mathematics/scilab')
| -rw-r--r-- | sci-mathematics/scilab/files/scilab-5.5.0-disable-static-systemlib.patch | 20 | ||||
| -rw-r--r-- | sci-mathematics/scilab/scilab-5.5.0.ebuild | 5 |
2 files changed, 23 insertions, 2 deletions
diff --git a/sci-mathematics/scilab/files/scilab-5.5.0-disable-static-systemlib.patch b/sci-mathematics/scilab/files/scilab-5.5.0-disable-static-systemlib.patch new file mode 100644 index 000000000..ce5b03293 --- /dev/null +++ b/sci-mathematics/scilab/files/scilab-5.5.0-disable-static-systemlib.patch @@ -0,0 +1,20 @@ +X-Git-Url: http://gitweb.scilab.org/?p=scilab.git;a=blobdiff_plain;f=scilab%2Fm4%2Fcompiler.m4;h=150a283c5ba4f30a997dceb7fd4cb529283b3d54;hp=dbd0180faee5f4f491205e8bd97e7fc6082930d7;hb=3147468d32d010c01036ecfe4a86b2d9c6c12bf0;hpb=a9218e259ed573228e1aa6732c6ff7ea3c21fae4 + +diff --git a/scilab/m4/compiler.m4 b/scilab/m4/compiler.m4 +index dbd0180..150a283 100644 +--- a/scilab/m4/compiler.m4 ++++ b/scilab/m4/compiler.m4 +@@ -38,6 +38,13 @@ saved_LDFLAGS="$LDFLAGS" + compiler_manage_static_libs=no + USE_STATIC_SYSTEM_LIB=yes + ++ ++if test "x$enable_static_system_lib" == "xno"; then ++# The user ask for an explicit disable. ++ USE_STATIC_SYSTEM_LIB=no ++fi ++ ++ + LDFLAGS="$LDFLAGS -static-libstdc++ -static-libgcc" + AC_MSG_CHECKING([whether g++ accepts -static-libstdc++ -static-libgcc]) + AC_LANG_PUSH(C++) diff --git a/sci-mathematics/scilab/scilab-5.5.0.ebuild b/sci-mathematics/scilab/scilab-5.5.0.ebuild index 7e6926185..15b592ea7 100644 --- a/sci-mathematics/scilab/scilab-5.5.0.ebuild +++ b/sci-mathematics/scilab/scilab-5.5.0.ebuild @@ -10,7 +10,7 @@ VIRTUALX_REQUIRED="manual" inherit eutils autotools bash-completion-r1 check-reqs fdo-mime flag-o-matic \ fortran-2 java-pkg-opt-2 toolchain-funcs virtualx -MY_PV="${PV}"-beta-1 +MY_PV="${PV}-beta-1" MY_P="$PN"-"$MY_PV" # Things that don't work: @@ -79,7 +79,7 @@ DEPEND="${CDEPEND} gui? ( >=virtual/jdk-1.5 doc? ( app-text/docbook-xsl-stylesheets - dev-java/xml-commons-external:1.4 + dev-java/xml-commons-external:1.4 dev-java/jlatexmath-fop:1 ) xcos? ( dev-lang/ocaml ) ) test? ( @@ -121,6 +121,7 @@ src_prepare() { "${FILESDIR}/${P}-followlinks.patch" \ "${FILESDIR}/${P}-gluegen.patch" \ "${FILESDIR}/${P}-fix-random-runtime-failure.patch" \ + "${FILESDIR}/${P}-disable-static-systemlib.patch" \ "${FILESDIR}/${P}-always-use-dynamic-stack.patch" append-ldflags $(no-as-needed) |