[icedtea patch] DISTRIBUTION_PATCHES / jni include dir

[Matthias Klose]

Matthias Klose schrieb:
> Lillian Angel schrieb:
>> @@ -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.

this one should be more robust. It only creates the symlinks for files and
directories that it does find. Note that gcj's jni.h includes jni_md.h which
apparently is not found on Fedora in /usr/lib/jvm/java-gcj/include, but needs to
be available in some system path. Not a problem if gcc version = gcj version.

Checked on Debian and Ubuntu.

  Matthias
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: include.diff
Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20071129/2066b4cb/include.diff