[icedtea patch] DISTRIBUTION_PATCHES / jni include dir

[Lillian Angel]

Matthias Klose wrote:
> 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?

Nope.

$ make stamps/bootstrap-directory-ecj.stamp
mkdir -p bootstrap/ecj/bin stamps/
ln -sf /usr/bin/gij bootstrap/ecj/bin/java
ln -sf /usr/bin/gjavah bootstrap/ecj/bin/javah
ln -sf /usr/bin/grmic bootstrap/ecj/bin/rmic
ln -sf /usr/bin/gjar bootstrap/ecj/bin/jar
ln -sf ../../../javac bootstrap/ecj/bin/javac
ln -sf ../../../javap bootstrap/ecj/bin/javap
mkdir -p bootstrap/ecj/lib/endorsed
ln -sf /usr/share/java/xalan-j2.jar 
bootstrap/ecj/lib/endorsed/xalan-j2.jar
ln -sf /usr/share/java/xalan-j2-serializer.jar \
           bootstrap/ecj/lib/endorsed/xalan-j2-serializer.jar
ln -sf /usr/share/java/xerces-j2.jar 
bootstrap/ecj/lib/endorsed/xerces-j2.jar
mkdir -p bootstrap/ecj/jre/lib
ln -sf /usr/lib/jvm/java-gcj/jre/lib/i386 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 `gcc -print-filename=include/$i` 
bootstrap/ecj/include/$i; \
         done
gcc: unrecognized option '-print-filename=include/jni.h'
gcc: no input files
gcc: unrecognized option '-print-filename=include/jni_md.h'
gcc: no input files
gcc: unrecognized option '-print-filename=include/gcj'
gcc: no input files
gcc: unrecognized option '-print-filename=include/linux'
gcc: no input files
if test -f bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
         then \
                 mkdir -p bootstrap/ecj/lib ; \
                 ln -sf 
/notnfs/langel/icedtea-b23/bootstrap/jdk1.7.0/jre/lib/tools.jar \
 
/notnfs/langel/icedtea-b23/bootstrap/ecj/lib/tools.jar; \
         fi
if test -f bootstrap/jdk1.7.0/jre/lib/rt-closed.jar ; \
         then \
                 cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
                         bootstrap/ecj/jre/lib/rt.jar; \
         fi
mkdir -p stamps
touch stamps/bootstrap-directory-ecj.stamp