D8981.id.diff
View Options

	diff --git a/files/fix-plugin-compile-error-with-gradle-641.patch b/files/fix-plugin-compile-error-with-gradle-641.patch
	new file mode 100644
	--- /dev/null
	+++ b/files/fix-plugin-compile-error-with-gradle-641.patch
	@@ -0,0 +1,13 @@
	+diff --git a/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/CompileBenchmarkingPlugin.kt b/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/CompileBenchmarkingPlugin.kt
	+index 3df6e444b..4040cadff 100644
	+--- a/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/CompileBenchmarkingPlugin.kt
	++++ b/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/CompileBenchmarkingPlugin.kt
	+@@ -70,7 +70,7 @@ open class CompileBenchmarkingPlugin : Plugin<Project> {
	+ isIgnoreExitValue = true
	+ konanRun.dependsOn(this)
	+ doLast {
	+- exitCodes[name] = execResult.exitValue
	++ exitCodes[name] = execResult!!.exitValue
	+ }
	+ }
	+ }
	diff --git a/files/java-shim.sh b/files/java-shim.sh
	--- a/files/java-shim.sh
	+++ b/files/java-shim.sh
	@@ -1,6 +1,6 @@
	#!/bin/sh

	if [ -z "$JAVA_HOME" ]; then
	- export JAVA_HOME=/usr/lib64/openjdk-8
	+ export JAVA_HOME=/usr/lib64/openjdk-11
	fi

	diff --git a/package.yml b/package.yml
	--- a/package.yml
	+++ b/package.yml
	@@ -1,6 +1,6 @@
	name : kotlin-native
	version : 1.3.72
	-release : 5
	+release : 6
	source :
	- https://github.com/JetBrains/kotlin-native/archive/v1.3.72.tar.gz : 1f53ec1996b0f79ca615549fa5dc8485ef356cfab413212dceac64362ea6a13d
	- https://download.jetbrains.com/kotlin/native/clang-llvm-8.0.0-linux-x86-64.tar.gz : a9ebf55170bdbe5e089dbf884e0bc52065b5b7bc52e9354415e25a36e10e56c5
	@@ -21,14 +21,11 @@
	networking : true
	environment: \|
	export JAVA_HOME=/usr/lib64/openjdk-11
	- # prevents Gradle, Konan, and Java from failing to create files in ~
	- export JAVA_OPTS="-Djava.util.prefs.userRoot=$workdir/.java"
	+ # prevents Gradle and Konan from failing to create files in ~
	export GRADLE_USER_HOME="$workdir/.gradle"
	export KONAN_DATA_DIR="$workdir/.konan"
	- # prevents Gradle from dying due to being unable to identify some terminals like Kitty
	- export TERM=xterm-256color
	builddeps :
	- - openjdk-11
	+ - gradle
	rundeps :
	- openjdk-11
	setup : \|
	@@ -41,10 +38,11 @@
	done

	cat $pkgfiles/gradle.properties >> gradle.properties
	- ./gradlew dependencies:update
	%patch -p1 < $pkgfiles/use-cpp-11-as-std-version.patch
	+ %patch -p1 < $pkgfiles/fix-plugin-compile-error-with-gradle-641.patch
	+ gradle dependencies:update
	build : \|
	- ./gradlew bundle
	+ gradle bundle
	install : \|
	mkdir -p $installdir/usr/share/kotlin-native
	cp -r dist/* $installdir/usr/share/kotlin-native/
	diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
	--- a/pspec_x86_64.xml
	+++ b/pspec_x86_64.xml
	@@ -3120,8 +3120,8 @@
	</Files>
	</Package>
	<History>
	- <Update release="5">
	- <Date>2020-05-30</Date>
	+ <Update release="6">
	+ <Date>2020-06-03</Date>
	<Version>1.3.72</Version>
	<Comment>Packaging update</Comment>
	<Name>Campbell Jones</Name>

File Metadata

Mime Type: text/plain
Expires: Fri, Aug 11, 3:53 PM (3 h, 5 m ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 5815267
Default Alt Text: D8981.id.diff (3 KB)

D8981.id.diff
No OneTemporary
Actions

D8981.id.diff
View Options

File Metadata

Event Timeline

D8981.id.diffNo OneTemporaryActions

D8981.id.diffView Options

File Metadata

Event Timeline

D8981.id.diff
No OneTemporary
Actions

D8981.id.diff
View Options