| 1 |
commit: b84fd861c8109d5bc5365b8ae3b4e92d0f970d15 |
| 2 |
Author: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon Oct 28 05:34:53 2013 +0000 |
| 4 |
Commit: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com> |
| 5 |
CommitDate: Mon Oct 28 05:34:53 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b84fd861 |
| 7 |
|
| 8 |
sci-mathematics/scilab add missing patch |
| 9 |
|
| 10 |
--- |
| 11 |
.../scilab-5.5.0-disable-static-systemlib.patch | 20 ++++++++++++++++++++ |
| 12 |
sci-mathematics/scilab/scilab-5.5.0.ebuild | 5 +++-- |
| 13 |
2 files changed, 23 insertions(+), 2 deletions(-) |
| 14 |
|
| 15 |
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 |
| 16 |
new file mode 100644 |
| 17 |
index 0000000..ce5b032 |
| 18 |
--- /dev/null |
| 19 |
+++ b/sci-mathematics/scilab/files/scilab-5.5.0-disable-static-systemlib.patch |
| 20 |
@@ -0,0 +1,20 @@ |
| 21 |
+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 |
| 22 |
+ |
| 23 |
+diff --git a/scilab/m4/compiler.m4 b/scilab/m4/compiler.m4 |
| 24 |
+index dbd0180..150a283 100644 |
| 25 |
+--- a/scilab/m4/compiler.m4 |
| 26 |
++++ b/scilab/m4/compiler.m4 |
| 27 |
+@@ -38,6 +38,13 @@ saved_LDFLAGS="$LDFLAGS" |
| 28 |
+ compiler_manage_static_libs=no |
| 29 |
+ USE_STATIC_SYSTEM_LIB=yes |
| 30 |
+ |
| 31 |
++ |
| 32 |
++if test "x$enable_static_system_lib" == "xno"; then |
| 33 |
++# The user ask for an explicit disable. |
| 34 |
++ USE_STATIC_SYSTEM_LIB=no |
| 35 |
++fi |
| 36 |
++ |
| 37 |
++ |
| 38 |
+ LDFLAGS="$LDFLAGS -static-libstdc++ -static-libgcc" |
| 39 |
+ AC_MSG_CHECKING([whether g++ accepts -static-libstdc++ -static-libgcc]) |
| 40 |
+ AC_LANG_PUSH(C++) |
| 41 |
|
| 42 |
diff --git a/sci-mathematics/scilab/scilab-5.5.0.ebuild b/sci-mathematics/scilab/scilab-5.5.0.ebuild |
| 43 |
index 7e69261..15b592e 100644 |
| 44 |
--- a/sci-mathematics/scilab/scilab-5.5.0.ebuild |
| 45 |
+++ b/sci-mathematics/scilab/scilab-5.5.0.ebuild |
| 46 |
@@ -10,7 +10,7 @@ VIRTUALX_REQUIRED="manual" |
| 47 |
inherit eutils autotools bash-completion-r1 check-reqs fdo-mime flag-o-matic \ |
| 48 |
fortran-2 java-pkg-opt-2 toolchain-funcs virtualx |
| 49 |
|
| 50 |
-MY_PV="${PV}"-beta-1 |
| 51 |
+MY_PV="${PV}-beta-1" |
| 52 |
MY_P="$PN"-"$MY_PV" |
| 53 |
|
| 54 |
# Things that don't work: |
| 55 |
@@ -79,7 +79,7 @@ DEPEND="${CDEPEND} |
| 56 |
gui? ( |
| 57 |
>=virtual/jdk-1.5 |
| 58 |
doc? ( app-text/docbook-xsl-stylesheets |
| 59 |
- dev-java/xml-commons-external:1.4 |
| 60 |
+ dev-java/xml-commons-external:1.4 |
| 61 |
dev-java/jlatexmath-fop:1 ) |
| 62 |
xcos? ( dev-lang/ocaml ) ) |
| 63 |
test? ( |
| 64 |
@@ -121,6 +121,7 @@ src_prepare() { |
| 65 |
"${FILESDIR}/${P}-followlinks.patch" \ |
| 66 |
"${FILESDIR}/${P}-gluegen.patch" \ |
| 67 |
"${FILESDIR}/${P}-fix-random-runtime-failure.patch" \ |
| 68 |
+ "${FILESDIR}/${P}-disable-static-systemlib.patch" \ |
| 69 |
"${FILESDIR}/${P}-always-use-dynamic-stack.patch" |
| 70 |
|
| 71 |
append-ldflags $(no-as-needed) |
Archives