diff options
Diffstat (limited to 'dev-lang/scala/files')
| -rw-r--r-- | dev-lang/scala/files/scala-2.12.1-no-git.patch | 37 | ||||
| -rw-r--r-- | dev-lang/scala/files/scala-2.12.1-runner-script.patch | 22 |
2 files changed, 59 insertions, 0 deletions
diff --git a/dev-lang/scala/files/scala-2.12.1-no-git.patch b/dev-lang/scala/files/scala-2.12.1-no-git.patch new file mode 100644 index 000000000000..f5439e35aadc --- /dev/null +++ b/dev-lang/scala/files/scala-2.12.1-no-git.patch @@ -0,0 +1,37 @@ +--- scala-2.12.1-orig/tools/get-scala-commit-date 2016-12-05 20:45:09.000000000 +1100 ++++ scala-2.12.1/tools/get-scala-commit-date 2016-12-27 16:41:41.695942033 +1100 +@@ -10,13 +10,8 @@ + + [[ $# -eq 0 ]] || cd "$1" + +-if git rev-parse --is-inside-work-tree > /dev/null 2>&1; then +- lastcommitdate=$(git log --format="%ci" HEAD | head -n 1 | cut -d ' ' -f 1) +- lastcommithours=$(git log --format="%ci" HEAD | head -n 1 | cut -d ' ' -f 2) +-else +- lastcommitdate=$(date +%Y-%m-%d) +- lastcommithours=$(date +%H:%M:%S) +-fi ++lastcommitdate="2016-12-05" ++lastcommithours="00:00:00" + + # 20120324 + echo "${lastcommitdate//-/}-${lastcommithours//:/}" +--- scala-2.12.1-orig/tools/get-scala-commit-sha 2016-12-05 20:45:09.000000000 +1100 ++++ scala-2.12.1/tools/get-scala-commit-sha 2016-12-27 16:44:07.393422207 +1100 +@@ -10,13 +10,7 @@ + + [[ $# -eq 0 ]] || cd "$1" + +-if git rev-parse --is-inside-work-tree > /dev/null 2>&1; then +- # printf %016s is not portable for 0-padding, has to be a digit. +- # so we're stuck disassembling it. +- hash=$(git log -1 --format="%H" HEAD) +- hash=${hash#g} +- hash=${hash:0:10} +-else +- hash="unknown" +-fi ++hash="2787b47396013a44072fa7321482103b66fbccd3" ++hash=${hash#g} ++hash=${hash:0:10} + echo "$hash" diff --git a/dev-lang/scala/files/scala-2.12.1-runner-script.patch b/dev-lang/scala/files/scala-2.12.1-runner-script.patch new file mode 100644 index 000000000000..9115a9810f67 --- /dev/null +++ b/dev-lang/scala/files/scala-2.12.1-runner-script.patch @@ -0,0 +1,22 @@ +--- scala-2.12.1-orig/src/compiler/scala/tools/ant/templates/tool-unix.tmpl 2016-12-05 20:45:09.000000000 +1100 ++++ scala-2.12.1/src/compiler/scala/tools/ant/templates/tool-unix.tmpl 2016-12-28 11:46:29.120052198 +1100 +@@ -197,14 +197,11 @@ + # to java to suppress "." from materializing. + if [[ "$usebootcp" == "true" ]]; then + classpath_args=("-Xbootclasspath/a:$TOOL_CLASSPATH" -classpath "\"\"") +- # Note that the version numbers go 1.7, 1.8, 9, 10, ... +- java_release="$(cat $JAVA_HOME/release | grep JAVA_VERSION)" +- if [[ ! "$java_release" =~ JAVA_VERSION=\"1\. ]]; then +- # Java 9 removed sun.boot.class.path, and the supposed replacement to at least see +- # the appended boot classpath (jdk.boot.class.path.append) is not visible. +- # So we have to pass a custom system property that PathResolver will find. +- classpath_args+=("-Dscala.boot.class.path=$TOOL_CLASSPATH") +- fi ++ # Java 9 removed sun.boot.class.path, and the supposed replacement to at least see ++ # the appended boot classpath (jdk.boot.class.path.append) is not visible. ++ # So we have to pass a custom system property that PathResolver will find. ++ # We do this for all JVM versions, rather than getting into the business of JVM version detection. ++ classpath_args+=("-Dscala.boot.class.path=$TOOL_CLASSPATH") + else + classpath_args=(-classpath "$TOOL_CLASSPATH") + fi |