RFR: JDK-8145106: Still intermittent build error building jdk/src/demo/solaris/jni/Poller/Poller.c

[Erik Joelsson]

I accidentally posted diff against the wrong parent. Here is the correct 
diff:

diff --git a/make/CompileDemos.gmk b/make/CompileDemos.gmk
--- a/make/CompileDemos.gmk
+++ b/make/CompileDemos.gmk
@@ -459,7 +459,7 @@
    # We can only compile native code after java has been compiled (since we
    # depend on generated .h files)
    $(SUPPORT_OUTPUTDIR)/demos/native/jni/Poller/Poller.o: \
-      $(BUILD_DEMO_JAVA_Poller_COMPILE_TARGET)
+      $(BUILD_DEMO_JAVA_Poller)

    # Copy to image
    $(SUPPORT_OUTPUTDIR)/demos/image/jni/Poller/README.txt: \

/Erik

On 2015-12-10 14:39, Erik Joelsson wrote:
> Unfortunately, this fix failed. Depending on 
> $(BUILD_DEMO_JAVA_POLLER_COMPILE_TARGETS) doesn't guarantee that the 
> header file is there in all cases. There is a separate copy step of 
> headers inside SetupJavaCompilation. The simple solution to this is to 
> just depend on $(BUILD_DEMO_JAVA_Poller) instead. Not ideal for 
> efficiency, but in this small case it hardly matters.
>
> Bug: https://bugs.openjdk.java.net/browse/JDK-8145106
> Patch:
> diff --git a/make/CompileDemos.gmk b/make/CompileDemos.gmk
> --- a/make/CompileDemos.gmk
> +++ b/make/CompileDemos.gmk
> @@ -459,7 +459,7 @@
>    # We can only compile native code after java has been compiled 
> (since we
>    # depend on generated .h files)
>    $(SUPPORT_OUTPUTDIR)/demos/native/jni/Poller/Poller.o: \
> -      $(BUILD_DEMO_JAVA_POLLER_COMPILE_TARGETS)
> +      $(BUILD_DEMO_JAVA_Poller)
>
>    # Copy to image
>    $(SUPPORT_OUTPUTDIR)/demos/image/jni/Poller/README.txt: \
>
> /Erik
>
> On 2015-12-08 11:46, David Holmes wrote:
>> Looks good!
>>
>> Thanks,
>> David
>>
>> On 8/12/2015 8:31 PM, Erik Joelsson wrote:
>>> Hello,
>>>
>>> Please review this small fix for a misspelled dependency causing a race
>>> when building on Solaris.
>>>
>>> Bug: https://bugs.openjdk.java.net/browse/JDK-8144857
>>> Patch:
>>> diff --git a/make/CompileDemos.gmk b/make/CompileDemos.gmk
>>> --- a/make/CompileDemos.gmk
>>> +++ b/make/CompileDemos.gmk
>>> @@ -459,7 +459,7 @@
>>>     # We can only compile native code after java has been compiled
>>> (since we
>>>     # depend on generated .h files)
>>>     $(SUPPORT_OUTPUTDIR)/demos/native/jni/Poller/Poller.o: \
>>> -      $(BUILD_DEMO_JAVA_POLLER_COMPILE_TARGETS)
>>> +      $(BUILD_DEMO_JAVA_Poller_COMPILE_TARGET)
>>>
>>>     # Copy to image
>>>     $(SUPPORT_OUTPUTDIR)/demos/image/jni/Poller/README.txt: \
>>>
>>>
>>> /Erik
>