Hello community,
here is the log from the commit of package java-11-openjdk for openSUSE:Factory
checked in at 2018-06-25 11:39:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/java-11-openjdk (Old)
and /work/SRC/openSUSE:Factory/.java-11-openjdk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-11-openjdk"
Mon Jun 25 11:39:43 2018 rev:16 rq:618467 version:11.0.0.0~19
Changes:
--------
--- /work/SRC/openSUSE:Factory/java-11-openjdk/java-11-openjdk.changes
2018-06-02 12:15:06.413478783 +0200
+++ /work/SRC/openSUSE:Factory/.java-11-openjdk.new/java-11-openjdk.changes
2018-06-25 11:39:58.986835135 +0200
@@ -1,0 +2,622 @@
+Fri Jun 22 05:46:26 UTC 2018 - fst...@suse.com
+
+- Added patch:
+ * missing-return.patch
+ + fix no-return-in-nonvoid-function
+
+-------------------------------------------------------------------
+Thu Jun 21 09:48:25 UTC 2018 - fst...@suse.com
+
+- Update to upstream tag jdk-11+19
+ * Fixes:
+ + S6545967: sp05t003 failed ResumeThread() due to
+ THREAD_NOT_SUSPENDED
+ + S6608234: SwingWorker.get throws CancellationException
+ + S7183985: (ann) Class.getAnnotation() throws an
+ ArrayStoreException when the annotation class not present
+ + S8029250: [macosx] There is no tray icon shown in the system
+ tray area when case starts
+ + S8042131: DateTimeFormatterBuilder Mapped-values do not work
+ for JapaneseDate
+ + S8043575: Dynamically parallelize reference processing work
+ + S8149565: -locale option issues
+ + S8153107: enabling ObjectSynchronizer::quick_enter() on ARM64
+ causes hangs
+ + S8170159: Improve the performance of BitSet traversal
+ + S8177334: Update xmldsig implementation to Apache Santuario
+ 2.1.1
+ + S8178150: Regression in logic for handling inference stuck
+ constraints
+ + S8184349: There should be some verification that EnableJVMCI
+ is disabled if a GC not supporting JVMCI is selected
+ + S8191512: T2K font rasterizer code removal
+ + S8193302: Javac AssertionError: typeSig ERROR on usage of
+ @Generated
+ + S8194308: jdeprscan will need updates to deal with the
+ removal of the Java EE modules
+ + S8195115: G1 Old Gen MemoryPool CollectionUsage.used values
+ don't reflect mixed GC results
+ + S8195293: Issue more comprehensive warnings for use of
+ \"var\" in earlier source versions
+ + S8196618: Create API to list supported values for javac
+ --release option
+ + S8196988: Resolve disabled warnings for libjimage
+ + S8198669: Refactor annotation array value parsing to reduce
+ duplication
+ + S8198719: MethodHandleHelper.linkToStatic should drop MH arg
+ + S8199433: (se) select(Consumer<SelectionKey> action) as
+ alternative to selected-key set
+ + S8199435: Unsafe publication of java.util.Properties.map
+ + S8199441: Wrong caret position in multiline text components
+ on Windows with a screen resolution higher than 100%
+ + S8199871: Deprecate pack200 and unpack200 tools
+ + S8200115: System property java.vm.vendor value includes
+ quotation marks
+ + S8200121: Remove unused qualified exports in java.base
+ + S8200353: Shift or Capslock not working in Textfield after
+ accented keystrokes
+ + S8200605: Create test for GridBagLayoutDemo
+ + S8200867: Remove references to "jdk 9" in build system
+ + S8201276: (fs) Add methods to Files for reading/writing a
+ string from/to a file
+ + S8202199: Provide public, unsupported JDK API for
+ JavaFX/Swing interop
+ + S8202216: Add Buffer mismatch methods
+ + S8202537: CLDR33
+ + S8202559: Tests which start VM using JNI start failing after
+ compile upgrade to VC 2017
+ + S8202605: Standardize on ClassLoaderData::loader_name()
+ throughout the VM to obtain a class loader's name
+ + S8202624: javadoc generates references to enum constructors,
+ which are not documented
+ + S8202740: runtime/8176717/TestInheritFD.java fails with
+ java.lang.RuntimeException: could not match:
+ VM RESULT => RETAINS FD
+ + S8202768: [macos] Appkit thread slows when any Window Manager
+ active
+ + S8202845: Refactor reference processing for improved
+ parallelism
+ + S8202948: C2: assert(init_offset >= 0) failed: positive
+ offset from object start
+ + S8203030: Zero s390 31 bit size_t type conflicts in shared
+ code
+ + S8203157: Object equals abstraction for BarrierSetAssembler
+ + S8203197: C2: consider all paths in loop body for loop
+ predication
+ + S8203301: Linux-sparc fails to build after JDK-8199712
+ (Flight Recorder)
+ + S8203338: Unboxing in return from lambda miscompiled to throw
+ ClassCastException
+ + S8203343: VM.{metaspace|classloaders|classhierarchy...} jcmd
+ should show invocation targets for
+ Generated{Method|Constructor}AccessorImpl classes
+ + S8203344: Make C1 leal patchable on SPARC
+ + S8203357: Container Metrics
+ + S8203394: Implementation of JEP 331: Low-Overhead Heap
+ Profiling
+ + S8203479: JFR enabled ARM32 build assertion failure
+ + S8203491: [TESTBUG] Port heapdump tests into java
+ + S8203641: Refactor String Deduplication into shared
+ + S8203667: Platform specific include files in jdk image in
+ wrong sub directory
+ + S8203680: os::stat() on Posix platform does not need to copy
+ input path
+ + S8203691: Test /runtime/containers/cgroup/PlainRead.java fails
+ + S8203809: [Graal] JDI tests fail with:
+ JDITestRuntimeException : ** event IS NOT a breakpoint **
+ + S8203813: javac accepts an illegal name as a receiver
+ parameter name
+ + S8203838: javac performance regression in 11+11
+ + S8203915: Induction variable of over-unrolled loop conflicts
+ with range checks
+ + S8204152: SignedObject throws NullPointerException for null
+ keys with an initialized Signature object
+ + S8204166: TLH: Semaphore may not be destroy until signal have
+ returned.
+ + S8204169: Humongous continues region remembered set states do
+ not match the one from the corresponding humongous start
+ region
+ + S8204172: Predicate::not should explicitly mention
+ "NullPointerException - if target is null"
+ + S8204231: Update Graal
+ + S8204236: JFR unit test of thread CPU load should be enabled
+ + S8204240: Extend MDO to allow more reasons to be recorded per
+ bci
+ + S8204268: Improve some IncompatibleClassChangeError messages.
+ + S8204330: Javadoc IllegalArgumentException: HTML special
+ chars in constant value
+ + S8204342: methods in java.time s TCKZoneRules OpenJDK test
+ miss Test annotation
+ + S8204353: AARCH64: optimize FPU load and stores in
+ macroAssembler
+ + S8204454: Remove of sun.applet.AppletAudioClip
+ + S8204473: AARCH64: register post-index addressing mode is not
+ supported directly
+ + S8204509: Fix compilation error in harfbuzz 1.7.6 for Solaris
+ Developer Studio 12.6
+ + S8204531: Remove unused chars following '\0'
+ + S8204538: Split ScanClosure and ScanClosureWithParBarrier
+ + S8204571: Add support for launching multiple startup
+ recordings
+ + S8204613: StringTable: Calculates wrong number of uncleaned
+ items.
+ + S8204620: ModuleEntry::is_non_jdk_module() determination for
+ what is a jdk module is incorrect
+ + S8204654: [testbug] Fix pattern matching in jstat tests.
+ + S8204663: clean up remaining native parts after JDK-8187631
+ + S8204664: PrepareFailureLogs should be done after sequential
+ make targets
+ + S8204666: javadoc should be updated to use jQuery 3.3.1
+ + S8204668: Cleanup management of the java.vm.info System
+ property
+ + S8204679: HTTP Client refresh
+ + S8204685: Abstraction for TLAB dummy object
+ + S8204701: [TESTBUG] runtime/SharedArchiveFile/
+ /BootAppendTests.java should handle mapping failure
+ + S8204857: ConcurrentHashTable: Fix parallel processing
+ + S8204859: [macosx] Remove javax/swing/plaf/nimbus/8057791/
+ /bug8057791.java from the ProblemList.txt
+ + S8204915: (fs) Add some print diagnostics to
+ java/nio/file/Files/CopyAndMove.java
+ + S8204922: Create bootcycle jib profiles
+ + S8204923: Restore Symantec root verisignclass2g2ca
+ + S8204927: ZGC: assert(phase->idom(head) ==
+ head->in(LoopNode::EntryControl)) failed
+ + S8204929: Fonts with embedded bitmaps are not always rotated
+ + S8204935: [aix] TOC overflow in libjvm.so (release build)
+ + S8204939: Change Access nomenclature: root to native
+ + S8204941: Refactor TemplateTable::_new to use MacroAssembler
+ helpers for tlab and eden
+ + S8204943: Improve message of ArrayStoreException.
+ + S8204944: Remove java/util/Map/InPlaceOpsCollisions.java from
+ ProblemList
+ + S8204957: Remove TestBiasedLockRevocationEvents from
+ ProblemList.txt
+ + S8204958: Minor cleanups for the diagnostic framework
+ + S8204961: JVMTI jtreg tests build warnings on 32-bit platforms
+ + S8204965: Fix '--disable-cds' and disable CDS on AIX by
+ default
+ + S8204973: Add build support for filtering translations
+ + S8204978: [Graal] Disable Epsilon GC tests from running with
+ Graal
+ + S8205003: Replace selected link tags with linkplain in
+ java.lang.Class
+ + S8205006: Assertion failure when rehashing stringtable
+ + S8205020: ZGC: Apply workaround for buggy sem_post() in glibc
+ < 2.21
+ + S8205022: ZGC: SoftReferences not always cleared before
+ throwing OOME
+ + S8205024: ZGC: Worker threads boost mode not always enabled
+ when is should be
+ + S8205025: [AOT] make jdk.aot module upgradeable
+ + S8205028: ZGC: Remove incorrect comment in
+ ZHeap::object_iterate()
+ + S8205033: [REDO] Induction variable of over-unrolled loop
+ conflicts with range checks
+ + S8205034: [BACKOUT] Induction variable of over-unrolled loop
+ conflicts with range checks
++++ 425 more lines (skipped)
++++ between /work/SRC/openSUSE:Factory/java-11-openjdk/java-11-openjdk.changes
++++ and /work/SRC/openSUSE:Factory/.java-11-openjdk.new/java-11-openjdk.changes
Old:
----
02934b0d661b.tar.bz2
New:
----
fb8b3f467277.tar.bz2
generated-headers.patch
missing-return.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-11-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.9TxT0o/_old 2018-06-25 11:40:04.878617654 +0200
+++ /var/tmp/diff_new_pack.9TxT0o/_new 2018-06-25 11:40:04.890617211 +0200
@@ -34,18 +34,14 @@
%global updatever 0
%global patchver 0
%global datever 2018-09-25
-%global buildver 16
+%global buildver 19
%global hg_project jdk
%global hg_repository jdk
-%global hg_revision 02934b0d661b
+%global hg_revision fb8b3f467277
%global icedtea_sound_version 1.0.1
%global java_atk_wrapper_version 0.33.2
# priority must be 6 digits in total
-#%global priority 2105
-# While this is an early technolog preview,
-# assure nobody uses it by mistake.
-# Thus the priority 0
-%global priority 0
+%global priority 2105
%global javaver %{featurever}
# Standard JPackage directories and symbolic links.
%global sdklnk java-%{javaver}-openjdk
@@ -169,7 +165,9 @@
# Fix: implicit-pointer-decl
Patch13: implicit-pointer-decl.patch
#
+Patch14: generated-headers.patch
Patch15: system-pcsclite.patch
+Patch16: missing-return.patch
#
# OpenJDK specific patches
#
@@ -261,7 +259,7 @@
Provides: jre1.8.x
Provides: jre1.9.x
%if %{bootcycle}
-BuildRequires: java-devel >= 9
+BuildRequires: java-devel >= 10
BuildConflicts: java-devel >= 12
%else
BuildRequires: %{name}-devel
@@ -426,11 +424,14 @@
%patch10 -p1
%patch12 -p1
%patch13 -p1
+%patch14 -p1
%if %{with_system_pcsc}
%patch15 -p1
%endif
+%patch16 -p1
+
# s390 build fixes
%ifarch s390
@@ -1056,6 +1057,7 @@
%files devel
%dir %{_jvmdir}/%{sdkdir}/bin
%dir %{_jvmdir}/%{sdkdir}/include
+%dir %{_jvmdir}/%{sdkdir}/include/linux
%dir %{_jvmdir}/%{sdkdir}/lib
%if %{with_systemtap}
@@ -1096,10 +1098,8 @@
%{_jvmdir}/%{sdkdir}/bin/unpack200
%{_jvmdir}/%{sdkdir}/include/classfile_constants.h
%{_jvmdir}/%{sdkdir}/include/jawt.h
-%{_jvmdir}/%{sdkdir}/include/jawt_md.h
%{_jvmdir}/%{sdkdir}/include/jdwpTransport.h
%{_jvmdir}/%{sdkdir}/include/jni.h
-%{_jvmdir}/%{sdkdir}/include/jni_md.h
%{_jvmdir}/%{sdkdir}/include/jvmticmlr.h
%{_jvmdir}/%{sdkdir}/include/jvmti.h
%{_jvmdir}/%{sdkdir}/lib/ct.sym
@@ -1109,6 +1109,8 @@
%{_jvmdir}/%{sdkdir}/lib/libsaproc.so
%endif
%endif
+%{_jvmdir}/%{sdkdir}/include/linux/jawt_md.h
+%{_jvmdir}/%{sdkdir}/include/linux/jni_md.h
%if %{with_systemtap}
%{_jvmdir}/%{sdkdir}/tapset/*.stp
++++++ 02934b0d661b.tar.bz2 -> fb8b3f467277.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/java-11-openjdk/02934b0d661b.tar.bz2
/work/SRC/openSUSE:Factory/.java-11-openjdk.new/fb8b3f467277.tar.bz2 differ:
char 11, line 1
++++++ generated-headers.patch ++++++
--- jdk11/make/common/JdkNativeCompilation.gmk Wed Jun 20 19:46:44 2018 -0700
+++ jdk11/make/common/JdkNativeCompilation.gmk Thu Jun 21 10:10:16 2018 +0200
@@ -119,9 +119,11 @@
endif
ifneq ($$($1_HEADERS_FROM_SRC), false)
- $1_SRC_HEADER_FLAGS := $$(foreach dir, $$(wildcard $$($1_SRC) \
- $$(call GetJavaHeaderDir, $$(MODULE))), -I$$(dir))
+ $1_SRC_HEADER_FLAGS := $$(addprefix -I, $$(wildcard $$($1_SRC)))
endif
+ # Always add the java header dir
+ $1_SRC_HEADER_FLAGS += $$(addprefix -I, $$(call GetJavaHeaderDir,
$$(MODULE)))
+
ifneq ($$($1_EXTRA_HEADER_DIRS), )
$1_PROCESSED_EXTRA_HEADER_DIRS := $$(foreach dir,
$$($1_EXTRA_HEADER_DIRS), \
$$(call ProcessDir, $$(dir)))
++++++ java11-improved-fonts.patch ++++++
--- /var/tmp/diff_new_pack.9TxT0o/_old 2018-06-25 11:40:05.182606433 +0200
+++ /var/tmp/diff_new_pack.9TxT0o/_new 2018-06-25 11:40:05.190606137 +0200
@@ -1,6 +1,6 @@
---- jdk11/make/lib/Awt2dLibraries.gmk 2018-05-09 13:37:05.000000000 +0200
-+++ jdk11/make/lib/Awt2dLibraries.gmk 2018-05-11 10:30:40.226296101 +0200
-@@ -654,7 +654,7 @@
+--- jdk11/make/lib/Awt2dLibraries.gmk Wed Jun 20 19:46:44 2018 -0700
++++ jdk11/make/lib/Awt2dLibraries.gmk Thu Jun 21 10:20:34 2018 +0200
+@@ -628,7 +628,7 @@
LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
LDFLAGS_aix := -Wl$(COMMA)-berok, \
LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \
@@ -9,8 +9,8 @@
LIBS_macosx := -lawt_lwawt -framework CoreText -framework CoreFoundation \
-framework CoreGraphics, \
LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \
---- jdk11/src/java.desktop/share/native/libfontmanager/freetypeScaler.c
2018-05-09 13:37:05.000000000 +0200
-+++ jdk11/src/java.desktop/share/native/libfontmanager/freetypeScaler.c
2018-05-11 10:28:48.375716483 +0200
+--- jdk11/src/java.desktop/share/native/libfontmanager/freetypeScaler.c
Wed Jun 20 19:46:44 2018 -0700
++++ jdk11/src/java.desktop/share/native/libfontmanager/freetypeScaler.c
Thu Jun 21 10:20:34 2018 +0200
@@ -38,6 +38,10 @@
#include FT_SIZES_H
#include FT_OUTLINE_H
@@ -22,7 +22,7 @@
#include "fontscaler.h"
-@@ -652,6 +656,162 @@
+@@ -665,6 +669,162 @@
}
}
@@ -185,7 +185,7 @@
/*
* Class: sun_font_FreetypeFontScaler
-@@ -667,7 +827,9 @@
+@@ -680,7 +840,9 @@
UInt16 width, height;
GlyphInfo *glyphInfo;
int glyph_index;
@@ -195,7 +195,7 @@
FT_GlyphSlot ftglyph;
FTScalerContext* context =
-@@ -685,6 +847,11 @@
+@@ -698,6 +860,11 @@
return ptr_to_jlong(getNullGlyphImage());
}
@@ -204,10 +204,10 @@
+ readFontconfig((const FcChar8 *) scalerInfo->face->family_name,
+ context, &renderingProperties);
+#else
- /* if algorithmic styling is required then we do not request bitmap */
- if (context->doBold || context->doItalize) {
- renderFlags = FT_LOAD_DEFAULT;
-@@ -707,10 +874,17 @@
+ if (!context->useSbits) {
+ renderFlags |= FT_LOAD_NO_BITMAP;
+ }
+@@ -719,10 +886,17 @@
target = FT_LOAD_TARGET_LCD_V;
}
renderFlags |= target;
@@ -225,7 +225,7 @@
if (error) {
//do not destroy scaler yet.
//this can be problem of particular context (e.g. with bad transform)
-@@ -729,9 +903,13 @@
+@@ -741,9 +915,13 @@
/* generate bitmap if it is not done yet
e.g. if algorithmic styling is performed and style was added to outline
*/
@@ -239,7 +239,7 @@
width = (UInt16) ftglyph->bitmap.width;
height = (UInt16) ftglyph->bitmap.rows;
-@@ -945,7 +1123,9 @@
+@@ -957,7 +1135,9 @@
static FT_Outline* getFTOutline(JNIEnv* env, jobject font2D,
FTScalerContext *context, FTScalerInfo* scalerInfo,
jint glyphCode, jfloat xpos, jfloat ypos) {
@@ -249,7 +249,7 @@
int glyph_index;
FT_Error error;
FT_GlyphSlot ftglyph;
-@@ -960,11 +1140,22 @@
+@@ -972,11 +1152,22 @@
return NULL;
}
++++++ missing-return.patch ++++++
--- jdk11/src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp 2018-06-20
19:57:38.000000000 +0200
+++ jdk11/src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp 2018-06-22
07:55:03.696856365 +0200
@@ -456,6 +456,7 @@
long long unsigned int oldval,
long long unsigned int newval) {
ShouldNotCallThis();
+ return 0;
}
};
#endif // !_LP64
--- jdk11/src/hotspot/os_cpu/linux_zero/os_linux_zero.cpp 2018-06-20
19:57:38.000000000 +0200
+++ jdk11/src/hotspot/os_cpu/linux_zero/os_linux_zero.cpp 2018-06-22
07:55:03.696856365 +0200
@@ -500,6 +500,7 @@
long long unsigned int oldval,
long long unsigned int newval) {
ShouldNotCallThis();
+ return 0;
}
};
#endif // !_LP64
++++++ system-pcsclite.patch ++++++
--- /var/tmp/diff_new_pack.9TxT0o/_old 2018-06-25 11:40:05.514594178 +0200
+++ /var/tmp/diff_new_pack.9TxT0o/_new 2018-06-25 11:40:05.514594178 +0200
@@ -1,6 +1,5 @@
-diff -r 6668cc2fc54a make/autoconf/lib-bundled.m4
---- a/make/autoconf/lib-bundled.m4 Tue Apr 03 04:27:34 2018 +0000
-+++ b/make/autoconf/lib-bundled.m4 Tue Apr 03 13:54:16 2018 +0200
+--- jdk11/make/autoconf/lib-bundled.m4 2018-06-13 06:35:04.000000000 +0200
++++ jdk11/make/autoconf/lib-bundled.m4 2018-06-14 15:06:38.825090243 +0200
@@ -37,6 +37,7 @@
LIB_SETUP_LIBPNG
LIB_SETUP_ZLIB
@@ -51,10 +50,9 @@
+
+ AC_SUBST(USE_EXTERNAL_PCSCLITE)
+])
-diff -r 6668cc2fc54a make/autoconf/spec.gmk.in
---- a/make/autoconf/spec.gmk.in Tue Apr 03 04:27:34 2018 +0000
-+++ b/make/autoconf/spec.gmk.in Tue Apr 03 13:54:16 2018 +0200
-@@ -735,6 +735,7 @@
+--- jdk11/make/autoconf/spec.gmk.in 2018-06-13 06:35:04.000000000 +0200
++++ jdk11/make/autoconf/spec.gmk.in 2018-06-14 15:06:38.873090499 +0200
+@@ -730,6 +730,7 @@
ENABLE_INTREE_EC:=@ENABLE_INTREE_EC@
USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@
USE_EXTERNAL_LIBGIF:=@USE_EXTERNAL_LIBGIF@
@@ -62,20 +60,17 @@
USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@
LIBZ_CFLAGS:=@LIBZ_CFLAGS@
LIBZ_LIBS:=@LIBZ_LIBS@
-diff -r 6668cc2fc54a make/lib/Lib-java.smartcardio.gmk
---- a/make/lib/Lib-java.smartcardio.gmk Tue Apr 03 04:27:34 2018 +0000
-+++ b/make/lib/Lib-java.smartcardio.gmk Tue Apr 03 13:54:16 2018 +0200
-@@ -30,7 +30,7 @@
- LIBJ2PCSC_SRC := $(TOPDIR)/src/java.smartcardio/share/native/libj2pcsc \
- $(TOPDIR)/src/java.smartcardio/$(OPENJDK_TARGET_OS_TYPE)/native/libj2pcsc
- LIBJ2PCSC_CPPFLAGS := $(addprefix -I,$(LIBJ2PCSC_SRC)) \
--
-I$(TOPDIR)/src/java.smartcardio/$(OPENJDK_TARGET_OS_TYPE)/native/libj2pcsc/MUSCLE
\
-+ -I/usr/include/PCSC -DUSE_SYSTEM_LIBPCSCLITE \
- -I$(SUPPORT_OUTPUTDIR)/headers/java.smartcardio
-
+--- jdk11/make/lib/Lib-java.smartcardio.gmk 2018-06-13 06:35:04.000000000
+0200
++++ jdk11/make/lib/Lib-java.smartcardio.gmk 2018-06-14 15:09:10.281896734
+0200
+@@ -30,12 +30,12 @@
$(eval $(call SetupJdkLibrary, BUILD_LIBJ2PCSC, \
-@@ -41,7 +41,7 @@
- CFLAGS := $(CFLAGS_JDKLIB) $(LIBJ2PCSC_CPPFLAGS), \
+ NAME := j2pcsc, \
+ CFLAGS := $(CFLAGS_JDKLIB), \
+- CFLAGS_unix := -D__sun_jdk, \
+- EXTRA_HEADER_DIRS := libj2pcsc/MUSCLE, \
++ CFLAGS_unix := -D__sun_jdk -DUSE_SYSTEM_LIBPCSCLITE, \
++ EXTRA_HEADER_DIRS := /usr/include/PCSC, \
+ OPTIMIZATION := LOW, \
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
- LIBS_unix := $(LIBDL), \
@@ -83,9 +78,8 @@
LIBS_windows := winscard.lib, \
))
-diff -r 6668cc2fc54a src/java.smartcardio/unix/native/libj2pcsc/pcsc_md.c
---- a/src/java.smartcardio/unix/native/libj2pcsc/pcsc_md.c Tue Apr 03
04:27:34 2018 +0000
-+++ b/src/java.smartcardio/unix/native/libj2pcsc/pcsc_md.c Tue Apr 03
13:54:16 2018 +0200
+--- jdk11/src/java.smartcardio/unix/native/libj2pcsc/pcsc_md.c 2018-06-13
06:35:04.000000000 +0200
++++ jdk11/src/java.smartcardio/unix/native/libj2pcsc/pcsc_md.c 2018-06-14
15:06:38.877090521 +0200
@@ -36,6 +36,7 @@
#include "pcsc_md.h"
@@ -128,9 +122,8 @@
#endif // __APPLE__
+#endif
}
-diff -r 6668cc2fc54a src/java.smartcardio/unix/native/libj2pcsc/pcsc_md.h
---- a/src/java.smartcardio/unix/native/libj2pcsc/pcsc_md.h Tue Apr 03
04:27:34 2018 +0000
-+++ b/src/java.smartcardio/unix/native/libj2pcsc/pcsc_md.h Tue Apr 03
13:54:16 2018 +0200
+--- jdk11/src/java.smartcardio/unix/native/libj2pcsc/pcsc_md.h 2018-06-13
06:35:04.000000000 +0200
++++ jdk11/src/java.smartcardio/unix/native/libj2pcsc/pcsc_md.h 2018-06-14
15:06:38.877090521 +0200
@@ -23,6 +23,8 @@
* questions.
*/
