File project.diff of Package java-11-openjdk

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package java-11-openjdk (Revision d852d9db690a75f005b73cd45d2531c5)

Currently displaying revision d852d9db690a75f005b73cd45d2531c5 , Show latest

--- java-11-openjdk.changes.orig
+++ java-11-openjdk.changes
@@ -1,4 +1,378 @@
 -------------------------------------------------------------------
+Thu Jun 14 13:05:23 UTC 2018 - fstrba@suse.com
+
+- Update to upstream tag jdk-11+18
+  * Fixes:
+    + S6350055: (se) SelectionKey.interestOps variants to
+      atomically update interest ops
+    + S8174734: Safepoint sync time did not increase
+    + S8178374: Problematic ByteBuffer handling in
+      CipherSpi.bufferCrypt method
+    + S8190326: Robot.mouseMove uses scaling factor of main display
+      on unscaled second display
+    + S8194073: Invalid SunNativeProvider.INSTANCE initialization
+    + S8195097: Make it possible to process StringTable outside
+      safepoint
+    + S8196030: AWT Robot mouseMove fails on Windows 10 1709 with
+      HiDPI
+    + S8196141: Add GoDaddy root certificates
+    + S8196990: Resolve disabled warnings for libjli
+    + S8196993: Resolve disabled warnings for libunpack
+    + S8197930: JNI exception pending in initializeEncoding of
+      jni_util.c
+    + S8200132: Remove jre images and bundles
+    + S8200387: [Graal] fromTonga/nsk/jdi tests hang with Graal as
+      JIT
+    + S8201193: Use XMM/YMM for objects initialization
+    + S8201274: Launch Single-File Source-Code Programs
+    + S8201407: Files.move throws DirectoryNonEmptyException when
+      moving directory across file system
+    + S8201528: Add new test to check for package versioning
+      information in OpenJDK
+    + S8201608: fix broken links in javax/sql/rowset/package.html
+      and javax/sql/rowset/spi/package.html
+    + S8202049: G1: ReferenceProcessor doesn't handle mark stack
+      overflow
+    + S8202088: Japanese new era implementation
+    + S8202611: [GRAAL] Exclude CMS GC testing from runs with Graal
+    + S8202705: ARM32 build crashes on long JavaThread offsets
+    + S8202747: C2: assert(mode == ControlAroundStripMined && use
+      == sfpt) failed: missed a node
+    + S8202772: NMT thread stack tracking causes crashes on AIX
+    + S8202864: [TESTBUG] Need to replace the image used in two
+      Swing tests
+    + S8203033: [Testbug] vmTestbase/nsk/jdi/TypeComponent/
+      /isSynthetic/issynthetic002/TestDescription.java fails with
+      nestmates
+    + S8203172: Primitive heap access for interpreter
+      BarrierSetAssembler/aarch64
+    + S8203224: java.awt.desktop.*Event classes could not be
+      instantiated if Desktop feature is not supported
+    + S8203308: Remove the appletviewer classes
+    + S8203329: JDWP/JDI VM information string is incorrect
+    + S8203353: Fixup inferred decorators in the interpreter
+    + S8203367: Upgrade to freetype 2.9.1
+    + S8203425: assert(is_Loop()) failed: invalid node class
+    + S8203480: IncompatibleClassChangeError thrown at sites linked
+      to default interface methods
+    + S8203499: Uninitialised memory in WinAccessBridge.cpp
+    + S8203679: AssertionError in DeferredAttr with parenthesized
+      method reference
+    + S8203682: Add jcmd "VM.classloaders" command to print out
+      class loader hierarchy, details
+    + S8203796: Define API to support specifying ownership of print
+      dialogs
+    + S8203822: AIX version of jsig.c was not removed in JDK-8200298
+    + S8203839: API clarification: versioned jar entry verification
+      in multi-release jar file
+    + S8204081: Mismatch in rebuild policy and collection set
+      chooser causes remembered sets to be kept errorneously
+    + S8204084: Remove the G1RSBarrierRegionFilter develop flag
+    + S8204097: Simplify OopStorage::AllocateList block entry access
+    + S8204110: serviceability/sa/ClhsdbSymbol.java and
+      ClhsdbInspect.java failed when running in CDS mode
+    + S8204113: Upgrade linker used in AOT tests to be same version
+      as build toolchain
+    + S8204118: [macos] Nonsensical self == [super init] in
+      CFileDialog.m
+    + S8204126: MonospacedGlyphWidthTest.java failed again
+    + S8204127: Change bundle format on Windows to zip
+    + S8204180: Implementation: JEP 318: Epsilon, A No-Op Garbage
+      Collector
+    + S8204187: Remove proprietary JPEG code from javax.imageio
+    + S8204210: Implementation: JEP 333: ZGC: A Scalable
+      Low-Latency Garbage Collector (Experimental)
+    + S8204211: windows : handle potential C++ exception in
+      GDIRenderer
+    + S8204229: Formatter and String.format ignore the width with
+      the percent modifier (%5%)
+    + S8204243: remove Thread.destroy() and Thread.stop(Throwable)
+    + S8204287: Phase timings not updated correctly after
+      JDK-6672778
+    + S8204288: Matching the end of a string followed by an empty
+      greedy regex and a word boundary fails
+    + S8204290: Add check to limit number of capture groups
+    + S8204303: Add redirect for overview-summary.html
+    + S8204335: [ppc] Assembler::add_const_optimized incorrect for
+      some inputs
+    + S8204375: Add TimeUnit#convert(Duration)
+    + S8204377: Rename Object#wait parameter name from "timeout" to
+      "timeoutMillis"
+    + S8204444: java.time cleanup
+    + S8204474: Have instanceRefKlass use HeapAccess when loading
+      the referent
+    + S8204476: Add additional statistics to
+      CodeCache::print_summary
+    + S8204477: Count linkage errors and print in
+      Exceptions::print_exception_counts_on_error
+    + S8204479: Bitwise AND on byte value sometimes produces wrong
+      result
+    + S8204494: Fix for 8200530 triggered regression,
+      closed/test/jdk/security/infra/java/security/KeyStore/
+      /BouncyCastleInterop.java failed
+    + S8204496: backout fix for 8203796 which was pushed under
+      another ID
+    + S8204504: Fix for 8198285 breaks slowdebug builds
+    + S8204539: improve error messages in matchJavaTZ [windows]
+    + S8204549: [aix][testbug] signal tests fail because vm can not
+      start in primordial thread.
+    + S8204554: JFR TLAB tracing broken after 8202776
+    + S8204557: NMT: Linux os::committed_in_range() does not break
+      out outer loop when contiguous region is found
+    + S8204561: JVM_GetClassSigners: wrap signers oop in an
+      objArrayHandle for subsequent safepoint
+    + S8204563: UseAppCDS obsolete message confusing
+    + S8204565: (spec) Document java.{vm.}?specification.version
+      system properties' relation to $FEATURE
+    + S8204572: SetupJdkLibrary should setup SRC and -I flags
+      automatically
+    + S8204576: (fs) java/nio/file/Files/CopyAndMove.java does not
+      set isUnix = true on macOS
+    + S8204577: jittester generator doesn't kill processes on
+      timeout
+    + S8204584: jdeps generates illegal dot file containing
+      ranksep=0,600000
+    + S8204585: Remove IN_ARCHIVE_ROOT from Access API
+    + S8204588: Test failures after "Launch Single-File Source-Code
+      Programs"
+    + S8204589: ProblemList failing launcher tests
+    + S8204598: add more thread-related system settings info to
+      hs_error file on Linux
+    + S8204602: Add devkit for linux-arm32
+    + S8204606: [Aarch64] SIGSEGVs caused by C1 because of improper
+      register usage
+    + S8204610: Compiler confused by parenthesized "this" in final
+      fields assignments
+    + S8204617: ParallelGC parallel reference processing does not
+      set MT degree in reference processor
+    + S8204618: The parallel GC reference processing task executor
+      enqueues a wrong number of tasks into the queue
+    + S8204628: [AArch64] Assertion failure in
+      BarrierSetAssembler::load_at
+    + S8204648: test/jdk/tools/launchers/SourceMode.java fails with
+      long shebang line
+    + S8204652: [aix] fix thread stack allocation, too big stack
+      sizes not recognized
+    + S8204674: Inconsistent lambda parameter span
+    + S8204680: Disassembly does not display code strings in stubs
+    + S8204682: Parsing for LOG=report=none is broken when combined
+      with other keywords
+    + S8204684: [AIX] Build of libjli_static broken after change
+      8204572 (SetupJdkLibrary)
+    + S8204694: Add failed compiler/stable tests into
+      ProblemList-graal.txt
+    + S8204850: BarrierSet::make_* should be static
+    + S8204861: fix for 8196993 has broken the build on linux
+
+-------------------------------------------------------------------
+Thu Jun  7 10:48:31 UTC 2018 - fstrba@suse.com
+
+- Update tu upstream tag jdk-11+17
+  * Fixes:
+    + S5109146: PNGMetadata Background color initialization from
+      standard metadata is incomplete
+    + S8050818: Predicate::not - provide an easier way to negate a
+      predicate
+    + S8072996: Deprecate stream-based GSSContext methods
+    + S8150156: Update bugs.sun.com references to bugs.java.com
+    + S8153029: ChaCha20 Cipher Implementation
+    + S8154736: enhancement of cmpxchg and copy_to_survivor for
+      ppc64
+    + S8177276: MethodHandles.insertArguments doesn't specify
+      IllegalArgumentException on index mismatch
+    + S8187289: NotifyFramePop request is not cleared if
+      JVMTI_EVENT_FRAME_POP is disabled
+    + S8189335: javac exception when referencing private inner
+      class with same name as normal class with dollar_1
+    + S8189949: Remove Baltimore Cybertrust Code Signing CA
+    + S8190417: javadoc updates to java.util.regex.Matcher
+    + S8190875: modules not listed in overview/index page
+    + S8191031: Remove several Symantec Root CAs
+    + S8191522: Remove Bigelow&Holmes Lucida fonts from JDK sources
+    + S8193552: ISO 4217 amendment 165
+    + S8194327: [macos] AWT windows have incorrect main/key window
+      behaviors
+    + S8195624: Desktop API cannot be used without permission to
+      read "os.version"
+    + S8196373: Introspector does not see overridden generic setter
+      method
+    + S8197387: jcmd started by "root" must be allowed to access
+      all VM processes
+    + S8197989: java/util/zip/ZipFile/TestCleaner.java failed with
+      "cleaner failed to clean zipfile
+    + S8198285: More consistent Access API for arraycopy
+    + S8198378: javac crash when checking imports and a broken
+      class is present
+    + S8199150: Accessibility issues in java.desktop
+    + S8199268:
+      docs/api/jdk.javadoc/com/sun/javadoc/package-summary.html
+      contain low contrast text
+    + S8199371: [TESTBUG] Open source vm testbase JDWP tests
+    + S8199380: [TESTBUG] Open source VM testbase AOD tests
+    + S8199388: Test development for ChaCha20 and Poly1305
+      algorithms
+    + S8199530: Upgrade to harfbuzz 1.7.6
+    + S8199723: Test java/awt/TextComponent/
+      /DeselectionDuringDoSelectionNonVisibleTest/
+      /DeselectionDuringDoSelectionNonVisibleTest.java fails
+    + S8199882: compiler/uncommontrap/TestDeoptOOM.java failed w/
+      fatal error: ExceptionMark constructor expects no pending
+      exceptions
+    + S8199893: the javadoc tool generates pages with a low
+      constrast
+    + S8200052: libjavajpeg: Fix compile warning in jchuff.c
+    + S8200166: Repeating annotations refering to to-be-generated
+      classes don't work.
+    + S8200288: [SPARC] "assert(!(is_cti(prev) && is_cti(insn)))
+      failed: CTI-CTI not allowed"
+    + S8200530: '\r' is not supported as "newline" in
+      java.util.jar.Manifest
+    + S8200623: Primitive heap access for interpreter
+      BarrierSetAssembler/x86
+    + S8201279: javax.sound tests should not set java.home system
+      property
+    + S8201364: [macosx] Component.getLocation() gives inconsistent
+      coordinate for a component at (0,0)
+    + S8201429: Support AIX Input Method Editor (IME) for AWT Input
+      Method Framework (IMF)
+    + S8202026: ISO 4217 amendment 166
+    + S8202051: Address compilation warnings in libawt with VS2017
+    + S8202094: jdk/jfr/api/recording/event/TestEventTime.java
+      intermittently times out
+    + S8202095: JFR TestBiasedLockRevocationEvents should cope with
+      multiple events during a single safepoint
+    + S8202360: [TESTBUG] runtime/LoadClass/TestResize.java needs
+      to print output when it fails
+    + S8202547: Move G1 runtime calls used by generated code to
+      G1BarrierSetRuntime
+    + S8202627: javadoc generates broken links to deprecated items
+      when -nodeprecated is used
+    + S8202670: Update Graal
+    + S8202758: SIGSEGV calling
+      Class.forName(String,Boolean,ClassLoader) with mocked loader
+    + S8202776: Modularize GC allocations in runtime
+    + S8202812: [TESTBUG] Open source VM testbase compiler tests
+    + S8202913: loader constraint message for fields specifies
+      incorrect referring class
+    + S8203027: Open source tests for "java.awt.geom"
+    + S8203031: segfaults from jvmti_AddToBootstrapClassLoaderSearch
+    + S8203182: Release session if initialization of SunPKCS11
+      Signature fails
+    + S8203219: VM.metaspace jcmd should optionally show loaded
+      classes for loaders
+    + S8203237: JFR TestBiasedLockRevocationEvents should ignore
+      events unrelated to the test
+    + S8203319: JDK-8201487 disabled too much queue balancing
+    + S8203321: assert(current_query_index <
+      process_query_set->size) failed: invariant
+    + S8203324: Use out of scope in getMacOSXLocale of
+      java_props_macosx.c:120
+    + S8203380: Missing platform and bug information for
+      MouseModifiersInKeyEvent test
+    + S8203435: Circular nested dynamic constant test needed to
+      confirm JVMS resolution behavior
+    + S8203445: [TESTBUG] Remove
+      appcds/jigsaw/limitmods/LimitModsTests.java
+    + S8203474: Update description of "Cyrillic Supplementary"
+      block name in Character.UnicodeBlock class.
+    + S8203485: [freetype] text rotated on 180 degrees is too narrow
+    + S8203498: The specification for java.applet package should be
+      updated
+    + S8203669: PPC64: Fix jtreg RTM tests after "8203305: Improve
+      TM detection for enabling RTM on Linux / POWER9"
+    + S8203765: java/nio/channels/Selector/SelectAndClose: add some
+      prints and @intermittent tag
+    + S8203780: javadoc should be updated to use jquery 1.12.4,
+      jquery-ui 1.12.1 and jszip v3.1.5
+    + S8203787: Hotspot build broken on linux-sparc after 8202377
+    + S8203802: Jvmti test fails to build with VS2017
+    + S8203827: Upgrade JLine to 2.14.6
+    + S8203837: Split nmethod unloading from inline cache cleaning
+    + S8203872: Upgrading JDK with latest available LSR data from
+      IANA.
+    + S8203891: Upgrade JOpt Simple to 5.0.4
+    + S8203919: Remove "-add-modules" hint from error message
+    + S8203921: JFR thread sampling is missing fixes from
+      JDK-8194552
+    + S8203923: Add @requires feature to check flag values for the
+      running JVM
+    + S8203924: Zero: bootcycle-images build fails on x86_64
+    + S8203937: Not possible to read data from socket after write
+      detects connection reset
+    + S8203939: JVMFlag::printError missing ATTRIBUTE_PRINTF
+    + S8203945: Cleanup nashorn build
+    + S8203946: Move UnpackSecurity.gmk to closed
+    + S8203948: Expand JVMTI callback notion of "internal threads"
+    + S8203960: [TESTBUG] runtime/logging/DefaultMethodsTest.java
+      failed when running in CDS mode
+    + S8204055: SIGSEGV in java -XX:
+    + S8204085: avoid printing uninitialized pointer in
+      java.desktop/windows/native/libawt/java2d/windows/
+      /GDIWindowSurfaceData.cpp
+    + S8204087: C++ Interpreter code left over in MethodData
+    + S8204091: Configure broken on MIPS when uname returns mipsel
+      or mips64el
+    + S8204094: assert(worker_i < _length) failed: Worker 15 is
+      greater than max: 11 at ReferenceProcessorPhaseTimes
+    + S8204095: [TESTBUG] TestPrintReferences.java fails if
+      multiple concurrent mark happens
+    + S8204103: Mark test
+      serviceability/dcmd/compiler/CompilerQueueTest.java as
+      intermittent and exclude it from tier1
+    + S8204109: JDK-8203945 broke nashorn
+    + S8204122: Update harfbuzz.md
+    + S8204134: jtreg: Fix RTM abort provoker for various tests
+      after "8149159: Clean up Unsafe"
+    + S8204136: jtreg: Fix failing RTM test RTMSpinLoopCount
+    + S8204160: BiasedLockingTest needs -XX:+UseBiasedLocking
+    + S8204162: TestG1HeapRegion needs @requires vm.gc.G1
+    + S8204163: Also detect concurrent GCs in MetaspaceBaseGC.java
+    + S8204164: OOM-only logging in Metaspace
+    + S8204165: Filter out tests requiring class unloading when
+      ClassUnloading is disabled
+    + S8204167: Filter out tests requiring compressed oops when
+      CompressedOops is disabled
+    + S8204168: Increase small heap sizes in tests to accommodate
+      ZGC
+    + S8204173: Lower the minimum number of heap memory pools in
+      MemoryTest.java
+    + S8204179: [BACKOUT] OopStorage should use GlobalCounter
+    + S8204194: Lazily create
+      MethodHandleImpl$AsVarargsCollector.asCollectorCache
+    + S8204195: Clean up macroAssembler.inline.hpp and other
+      inline.hpp files included in .hpp files
+    + S8204199: Test fails after 8202670 Graal update
+    + S8204237: Clean up incorrectly included .inline.hpp files
+      from jvmciJavaClasses.hpp
+    + S8204250: Problem list pkcs11 tests on windows
+    + S8204269: ISO 4217 amendment 167
+    + S8204277: [testbug] fix DisassembleCodeBlobTest.
+    + S8204292: PPC64: Fix missing includes after 8204195
+    + S8204295: [BACKOUT] - JVMFlag::printError missing
+      ATTRIBUTE_PRINTF
+    + S8204301: Make OrderAccess functions available to hpp rather
+      than inline.hpp files
+    + S8204321: javadoc tests fail after JDK-8203780
+    + S8204322: "+=" applied to String operands can provoke side
+      effects
+    + S8204341: AArch64: AOT runtime does not need a workaround for
+      far calls
+    + S8204345: [s390]: no precompiled headers build broken
+    + S8204348: AArch64: Remove C2 address reshaping code
+
+-------------------------------------------------------------------
+Tue Jun  5 15:14:58 UTC 2018 - fstrba@suse.com
+
+- Change the alternatives priority from 0 to 2105, since OpenJDK 11
+  should now be in a shape to be able to be used.
+
+-------------------------------------------------------------------
+Tue Jun  5 09:38:41 UTC 2018 - fstrba@suse.com
+
+- Change build requirement to Java 10 or 11, since Java 9 cannot
+  build OpenJDK 11 any more.
+
+-------------------------------------------------------------------
 Thu May 31 10:04:18 UTC 2018 - fstrba@suse.com
 
 - Update to upstream tag jdk-11+16
--- java-11-openjdk.spec.orig
+++ java-11-openjdk.spec
@@ -34,18 +34,14 @@
 %global updatever       0
 %global patchver        0
 %global datever         2018-09-25
-%global buildver        16
+%global buildver        18
 %global hg_project      jdk
 %global hg_repository   jdk
-%global hg_revision     02934b0d661b
+%global hg_revision     e1b3def12624
 %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,6 +165,7 @@ Patch12:        adlc-parser.patch
 # Fix: implicit-pointer-decl
 Patch13:        implicit-pointer-decl.patch
 #
+Patch14:        generated-headers.patch
 Patch15:        system-pcsclite.patch
 #
 # OpenJDK specific patches
@@ -261,7 +258,7 @@ Provides:       jre1.7.x
 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,6 +423,7 @@ rm -rvf src/java.desktop/share/native/li
 %patch10 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 %if %{with_system_pcsc}
 %patch15 -p1
--- system-pcsclite.patch.orig
+++ system-pcsclite.patch
@@ -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 @@ diff -r 6668cc2fc54a make/autoconf/lib-b
 +
 +  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 @@ diff -r 6668cc2fc54a make/autoconf/spec.
  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 @@ diff -r 6668cc2fc54a make/lib/Lib-java.s
      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 @@ diff -r 6668cc2fc54a src/java.smartcardi
  #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.
   */

Places

File project.diff of Package java-11-openjdk (Revision d852d9db690a75f005b73cd45d2531c5)

Places