On 2018-06-15 10:57, John Paul Adrian Glaubitz wrote:
Hi Fridrich!

I can help you getting this issue fixed. If I remember correctly, you said
that SUSE has signed Oracle's OCA, so I it should be fine if I submit the
patch with you as the author.

Let me have a look at the problem first though.

I think I understand the underlying issue but I'm not sure how to try reproduce a build problem from it.

Here's a better patch. Please try and see if it solves your problems. Unfortunately, I'm leaving on vacation for today and will be gone most of the summer, so I can't help sponsor this patch. But if it works, I'm sure someone else can take over it.

If it does not work, the original patch should at the very least be changed so that EXTRA_HEADER_DIRS gets an additional "$(call GetJavaHeaderDir, $(MODULE))", instead of the -I (which I've been trying hard to eradicate from the CFLAGS).

diff --git a/make/common/JdkNativeCompilation.gmk b/make/common/JdkNativeCompilation.gmk
--- a/make/common/JdkNativeCompilation.gmk
+++ b/make/common/JdkNativeCompilation.gmk
@@ -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)))


/Magnus




Adrian

On 06/15/2018 10:27 AM, Severin Gehwolf wrote:
Just for the completeness, this is a normal openSUSE package build with
--with-system-jpeg and --with-system-lcms. Maybe the
LIBJPEG_HEADERS_FROM_SRC := false is culprit. Some other people were
able to build jdk-11+18 with bundled jpeg and lcms without problems.

Cheers

Fridrich

On 15/06/18 09:31, Fridrich Strba wrote:
Hello, good people,

Since I cannot submit anything to bugzilla, I spam this list with this
patch that I needed to be able to build jdk-11+18.

I saw that http://hg.openjdk.java.net/jdk/jdk/rev/f0aeede1b855 changed
the way the headers are included, but in my analysis, the generated
headers in $(SUPPORT_OUTPUTDIR)/headers/java.desktop were not added by
the new way of doing. The patch makes it build for me. Do what you want
with it :)

Fridrich


Reply via email to