[Jython-checkins] jython: Update JNR/JFFI and ARM stub. Fixes GH-108.
jeff.allen
jython-checkins at python.org
Sat May 4 12:25:59 EDT 2019
https://hg.python.org/jython/rev/6e25c0f19222
changeset: 8241:6e25c0f19222
user: James Mudd <james.mudd at gmail.com>
date: Fri May 03 20:38:26 2019 +0100
summary:
Update JNR/JFFI and ARM stub. Fixes GH-108.
Updates:
- jnr-ffi 2.1.7 to 2.1.9
- jnr-posix 3.0.44 to 3.0.49
- jnr-constants 0.9.9 to 0.9.12
- jffi 1.2.15 to 1.2.18
This also updates the ARM stub for a newer one. This was recently updated
to improve ARM hard float support and is needed to fix this bug. See
https://github.com/jnr/jffi/commit/c29326dfd03a1eb3fe1b78b5934fc84a4b9cf16d
files:
NEWS | 1 +
build.gradle | 8 ++++----
build.xml | 16 ++++++++--------
extlibs/jffi-1.2.18.jar | Bin
extlibs/jffi-arm-Linux.jar | Bin
extlibs/jnr-constants-0.9.12.jar | Bin
extlibs/jnr-constants-0.9.9.jar | Bin
extlibs/jnr-ffi-2.1.9.jar | Bin
extlibs/jnr-posix-3.0.49.jar | Bin
9 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@
Development tip
Bugs fixed
+ - [ GH-108 ] Updates to JNR/JFFI to improve ARM HF support
- [ 2445 ] Eclipse's DelegatingFeatureMap has MRO conflict (and IBM's MQQueue)
- [ GH-121 ] Allow struct unpack and unpack_from bytearray and buffer
- [ 2635 ] AST.lineno ignored by compile
diff --git a/build.gradle b/build.gradle
--- a/build.gradle
+++ b/build.gradle
@@ -158,11 +158,11 @@
implementation group: 'com.carrotsearch', name: 'java-sizeof', version: '0.0.5'
- implementation group: 'com.github.jnr', name: 'jffi', version: '1.2.16'
+ implementation group: 'com.github.jnr', name: 'jffi', version: '1.2.18'
implementation group: 'com.github.jnr', name: 'jnr-netdb', version: '1.1.6'
- implementation group: 'com.github.jnr', name: 'jnr-ffi', version: '2.1.7'
- implementation group: 'com.github.jnr', name: 'jnr-posix', version: '3.0.44'
- implementation group: 'com.github.jnr', name: 'jnr-constants', version: '0.9.9'
+ implementation group: 'com.github.jnr', name: 'jnr-ffi', version: '2.1.9'
+ implementation group: 'com.github.jnr', name: 'jnr-posix', version: '3.0.49'
+ implementation group: 'com.github.jnr', name: 'jnr-constants', version: '0.9.12'
implementation group: 'jline', name: 'jline', version: '2.14.5'
diff --git a/build.xml b/build.xml
--- a/build.xml
+++ b/build.xml
@@ -152,12 +152,12 @@
<pathelement path="${extlibs.dir}/asm-util-7.0.jar" />
<pathelement path="${extlibs.dir}/guava-22.0-android.jar" />
<pathelement path="${extlibs.dir}/icu4j-59_1.jar" />
- <pathelement path="${extlibs.dir}/jffi-1.2.16.jar"/>
+ <pathelement path="${extlibs.dir}/jffi-1.2.18.jar"/>
<pathelement path="${extlibs.dir}/java-sizeof-0.0.5.jar"/>
- <pathelement path="${extlibs.dir}/jnr-ffi-2.1.7.jar"/>
+ <pathelement path="${extlibs.dir}/jnr-ffi-2.1.9.jar"/>
<pathelement path="${extlibs.dir}/jnr-netdb-1.1.6.jar"/>
- <pathelement path="${extlibs.dir}/jnr-posix-3.0.44.jar"/>
- <pathelement path="${extlibs.dir}/jnr-constants-0.9.9.jar"/>
+ <pathelement path="${extlibs.dir}/jnr-posix-3.0.49.jar"/>
+ <pathelement path="${extlibs.dir}/jnr-constants-0.9.12.jar"/>
<pathelement path="${extlibs.dir}/jline-2.14.5.jar"/>
<pathelement path="${extlibs.dir}/netty-buffer-4.1.24.Final.jar"/>
<pathelement path="${extlibs.dir}/netty-codec-4.1.24.Final.jar"/>
@@ -600,11 +600,11 @@
<zipfileset src="extlibs/jffi-x86_64-SunOS.jar"/>
<zipfileset src="extlibs/jffi-x86_64-Windows.jar"/>
<!-- remainder of JNR, JFFI -->
- <zipfileset src="extlibs/jffi-1.2.16.jar"/>
- <zipfileset src="${extlibs.dir}/jnr-ffi-2.1.7.jar"/>
+ <zipfileset src="extlibs/jffi-1.2.18.jar"/>
+ <zipfileset src="${extlibs.dir}/jnr-ffi-2.1.9.jar"/>
<zipfileset src="${extlibs.dir}/jnr-netdb-1.1.6.jar"/>
- <zipfileset src="${extlibs.dir}/jnr-posix-3.0.44.jar"/>
- <zipfileset src="${extlibs.dir}/jnr-constants-0.9.9.jar"/>
+ <zipfileset src="${extlibs.dir}/jnr-posix-3.0.49.jar"/>
+ <zipfileset src="${extlibs.dir}/jnr-constants-0.9.12.jar"/>
<zipfileset src="extlibs/xercesImpl-2.11.0.jar" excludes="META-INF/services/*"/>
<rule pattern="org.apache.xml.**" result="org.python.apache.xml. at 1"/>
<rule pattern="org.apache.xerces.**" result="org.python.apache.xerces. at 1"/>
diff --git a/extlibs/jffi-1.2.16.jar b/extlibs/jffi-1.2.18.jar
rename from extlibs/jffi-1.2.16.jar
rename to extlibs/jffi-1.2.18.jar
index e253de5b1088af0042921ec07c507add06e5f858..d5218fad127e17baa4e761a03b218d99026f8eb6
GIT binary patch
[stripped]
diff --git a/extlibs/jffi-arm-Linux.jar b/extlibs/jffi-arm-Linux.jar
index b3c5d977c1b7ad3fc196bfe2cd24fe56129dc8f9..f9a048b77d6af53661e9a9b5aae7e0f1ccabc599
GIT binary patch
[stripped]
diff --git a/extlibs/jnr-constants-0.9.12.jar b/extlibs/jnr-constants-0.9.12.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..d894741f4b85d19b626a11f1220468ee5ba6d389
GIT binary patch
[stripped]
diff --git a/extlibs/jnr-constants-0.9.9.jar b/extlibs/jnr-constants-0.9.9.jar
deleted file mode 100644
index a877bc42b6df7755e5eab266139a1c5bd8076a4d..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/extlibs/jnr-ffi-2.1.7.jar b/extlibs/jnr-ffi-2.1.9.jar
rename from extlibs/jnr-ffi-2.1.7.jar
rename to extlibs/jnr-ffi-2.1.9.jar
index 23d7e51a9fa8850123ae31025680f074db289861..df68592b92a779289093cf4569c952ab31432a5f
GIT binary patch
[stripped]
diff --git a/extlibs/jnr-posix-3.0.44.jar b/extlibs/jnr-posix-3.0.49.jar
rename from extlibs/jnr-posix-3.0.44.jar
rename to extlibs/jnr-posix-3.0.49.jar
index 2435a0d267ad23bea132f9cba6c845e0b5f211cf..bb75e304f466390878396ed62bf746cf8286149c
GIT binary patch
[stripped]
--
Repository URL: https://hg.python.org/jython
More information about the Jython-checkins
mailing list