[icedtea patch] DISTRIBUTION_PATCHES / jni include dir

[Lillian Angel]

Lillian Angel wrote:
> 
> 
> Matthias Klose wrote:
>> Matthias Klose schrieb:
>>>  - when building with gcc version != gcj version, the jni headers are
>>>    not found. maybe this should become a new configure flag
>>>    --with-jni-include=<dir>
>>
>> This is an updated patch for the current b23 build. The second chunk 
>> adds the
>> symlinks for the stage1 build (using ecj), the first chunk adds it for 
>> the
>> stage2 build. Without the latter one, we still build using the jni 
>> headers from
>> gcj, not the ones from the stage1 build.
> 
> Thanks for this patch, I will test it out and commit it for you.


@@ -363,6 +366,11 @@
  	ln -sf $(XERCES2_JAR) bootstrap/ecj/lib/endorsed/xerces-j2.jar
  	mkdir -p bootstrap/ecj/jre/lib
  	ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(INSTALL_ARCH_DIR) 
bootstrap/ecj/jre/lib/
+	mkdir -p bootstrap/ecj/include
+	for i in jni.h jni_md.h gcj linux; do \
+	  rm -f bootstrap/ecj/include/$$i; \
+	  ln -s $(SYSTEM_GCJ_DIR)/include/$$i bootstrap/ecj/include/$$i; \
+	done
  	if test -f bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
  	then \
  		mkdir -p bootstrap/ecj/lib ; \

This actually creates broken links. jni_md.h does not exist under 
$(SYSTEM_GCJ_DIR)/include, nor does gcj under 
$(SYSTEM_GCJ_DIR)/include. I am not sure this is a good idea- I think 
the patch needs more stringent conditions.

Thanks,
Lillian