[icedtea patch] DISTRIBUTION_PATCHES / jni include dir

[Matthias Klose]

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.

well, half of the symlinks in java-gcj-compat are created by the packaging
tools, which are different between distributions. So maybe it's better:

  ln -s `$(CC) -print-filename=include/$$i` bootstrap/ecj/include/$$i; \

Does this work for you?