diff options
| author |   Justin <jlec@users.noreply.github.com> | 2013-10-19 02:45:17 -0700 |
|---|---|---|
| committer | Justin <jlec@users.noreply.github.com> | 2013-10-19 02:45:17 -0700 |
| commit | 74bc4efaae4379476441101e4a82476cfaab7c31 (patch) | |
| tree | bd169b93e2b2f8c37d3a2b0cbcbab38473335d64 | |
| parent | remove old (diff) | |
| parent | Fix broken minimum version check in scilab-5.3.3 (diff) | |
| download | sci-74bc4efaae4379476441101e4a82476cfaab7c31.tar.gz sci-74bc4efaae4379476441101e4a82476cfaab7c31.tar.bz2 sci-74bc4efaae4379476441101e4a82476cfaab7c31.zip | |
Merge pull request #124 from laomaiweng/java-version-check
Fix broken minimum version check in scilab-5.3.3
| -rw-r--r-- | sci-mathematics/scilab/files/scilab-5.3.3-java-version-check.patch | 23 | ||||
| -rw-r--r-- | sci-mathematics/scilab/scilab-5.3.3-r2.ebuild (renamed from sci-mathematics/scilab/scilab-5.3.3-r1.ebuild) | 3 |
2 files changed, 25 insertions, 1 deletions
diff --git a/sci-mathematics/scilab/files/scilab-5.3.3-java-version-check.patch b/sci-mathematics/scilab/files/scilab-5.3.3-java-version-check.patch new file mode 100644 index 000000000..c5eb611ce --- /dev/null +++ b/sci-mathematics/scilab/files/scilab-5.3.3-java-version-check.patch @@ -0,0 +1,23 @@ +diff -Naurp scilab-5.3.3-r1-orig/m4/java-thirdparty.m4 scilab-5.3.3-r1/m4/java-thirdparty.m4 +--- scilab-5.3.3-r1-orig/m4/java-thirdparty.m4 2013-01-07 14:55:58.516374556 +0100 ++++ scilab-5.3.3-r1/m4/java-thirdparty.m4 2013-01-07 16:19:21.256370075 +0100 +@@ -38,9 +38,16 @@ AC_DEFUN([AC_JAVA_CHECK_VERSION_PACKAGE] + AC_JAVA_TRY_COMPILE($2, [String minVersion="$4"; + $6 + System.out.println($5); +- if (minVersion.compareTo($5) > 0) { +- System.exit(-1); +- } ] ++ String[] minV = minVersion.split("\\."); ++ String[] curV = $5.split("\\."); ++ for (int i=0; i<Math.max(minV.length,curV.length); i++) { ++ int mE = i<minV.length ? Integer.parseInt(minV[i]) : 0; ++ int cE = i<curV.length ? Integer.parseInt(curV[i]) : 0; ++ if (mE < cE) ++ break; ++ if (mE > cE) ++ System.exit(-1); ++ } ] + , "yes", echo "yes" , AC_MSG_ERROR([Wrong version of $1. Expected at least $4. Found $STDOUT])) + else + AC_JAVA_TRY_COMPILE($2, [String minVersion="$4"; diff --git a/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild b/sci-mathematics/scilab/scilab-5.3.3-r2.ebuild index 19fe80b4b..599a6915a 100644 --- a/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild +++ b/sci-mathematics/scilab/scilab-5.3.3-r2.ebuild @@ -125,7 +125,8 @@ src_prepare() { "${FILESDIR}"/${P}-no-xcos-deps.patch \ "${FILESDIR}"/${P}-javadoc-utf8.patch \ "${FILESDIR}"/${P}-fix-random-runtime-failures.patch \ - "${FILESDIR}"/${P}-gui-no-xcos.patch + "${FILESDIR}"/${P}-gui-no-xcos.patch \ + "${FILESDIR}"/${P}-java-version-check.patch # need serious as-needed work (inter-dependencies among modules) # "${FILESDIR}"/${P}-as-needed.patch \ |