* Re: feedback on --enable-java-home
[not found] <18692.17172.411022.614084@gargle.gargle.HOWL>
@ 2008-10-31 17:13 ` Andrew Haley
2008-10-31 21:25 ` Andrew John Hughes
0 siblings, 1 reply; 11+ messages in thread
From: Andrew Haley @ 2008-10-31 17:13 UTC (permalink / raw)
To: Matthias Klose; +Cc: Joshua Sumali, Java Patch List
Matthias Klose wrote:
> b) The symlinks for the header files are wrong, when installed with
> DESTDIR set.
>
> h) Why are the additional symlinks to the rt.jar required?
>
> i) The versioned jar links point to the bin directory, not to the
> lib directory.
>
> j) The versioned jar links are created in the "toplevel" dir, not
> in the lib directory.
All fixed.
Andrew.
2008-10-31 Andrew Haley <aph@redhat.com>
* Makefile.am (install-data-local): Correct symlink paths for
SDK-style installed JARs.
Correct symlinks for headers when DESTDIR is set.
Index: Makefile.am
===================================================================
--- Makefile.am (revision 141430)
+++ Makefile.am (working copy)
@@ -612,11 +612,15 @@
version=$(JAVA_VERSION).$(BUILD_VERSION); \
working_dir=`pwd`; \
cd $(DESTDIR)$(JVM_JAR_DIR); \
+ RELATIVE=$$(relative $(DESTDIR)$(JRE_LIB_DIR) \
+ $(DESTDIR)$(JVM_JAR_DIR)); \
for jarname in jaas jce jdbc-stdext jndi jndi-cos jndi-dns \
jndi-ldap jndi-rmi jsse sasl; \
do \
- ln -s $$RELATIVE/$$jarname.jar $$jarname-$$version.jar; \
+ ln -sf $$RELATIVE/rt.jar $$jarname-$$version.jar; \
done; \
+ RELATIVE=$$(relative $(DESTDIR)$(jardir) \
+ $(DESTDIR)$(JVM_JAR_DIR)); \
for jar in *-$$version.jar; \
do \
ln -sf $$jar $$(echo $$jar | sed "s|-$$version.jar|-$(JAVA_VERSION).jar|g"); \
@@ -633,14 +637,7 @@
$(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/client; \
$(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/server; \
$(mkinstalldirs) $(DESTDIR)$(SDK_LIB_DIR); \
- cd $(DESTDIR)$(JRE_LIB_DIR); \
- for jarname in jaas jce jdbc-stdext jndi jndi-cos jndi-dns \
- jndi-ldap jndi-rmi jsse sasl; \
- do \
- ln -s rt.jar $$jarname.jar; \
- done; \
- cd $$working_dir; \
- RELATIVE=$$(relative $(DESTDIR)$(datarootdir)/java \
+ RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
$(DESTDIR)$(JRE_LIB_DIR)); \
ln -sf $$RELATIVE/libgcj-$(gcc_version).jar \
$(DESTDIR)$(JRE_LIB_DIR)/rt.jar; \
@@ -656,14 +653,14 @@
$(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/server); \
ln -sf $$RELATIVE/libjvm.so \
$(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/server/libjvm.so; \
- RELATIVE=$$(relative $(DESTDIR)$(datarootdir)/java \
+ RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
$(DESTDIR)$(SDK_LIB_DIR)); \
ln -sf $$RELATIVE/libgcj-tools-$(gcc_version).jar \
$(DESTDIR)$(SDK_LIB_DIR)/tools.jar; \
for headername in jawt jni; do \
DIRECTORY=$$(dirname $$($(DESTDIR)$(bindir)/gcj \
-print-file-name=include/$$headername.h)); \
- RELATIVE=$$(relative $(DESTDIR)$$DIRECTORY \
+ RELATIVE=$$(relative $$DIRECTORY \
$(DESTDIR)$(SDK_INCLUDE_DIR)); \
ln -sf $$RELATIVE/$$headername.h \
$(DESTDIR)$(SDK_INCLUDE_DIR)/$$headername.h; \
@@ -671,12 +668,12 @@
for headername in jawt_md jni_md; do \
DIRECTORY=$$(dirname $$($(DESTDIR)$(bindir)/gcj \
-print-file-name=include/$$headername.h)); \
- RELATIVE=$$(relative $(DESTDIR)$$DIRECTORY \
+ RELATIVE=$$(relative $$DIRECTORY \
$(DESTDIR)$(SDK_INCLUDE_DIR)/linux); \
ln -sf $$RELATIVE/$$headername.h \
$(DESTDIR)$(SDK_INCLUDE_DIR)/linux/$$headername.h; \
done; \
- RELATIVE=$$(relative $(DESTDIR)$(datarootdir)/java \
+ RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
$(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)); \
ln -sf $$RELATIVE/src-$(gcc_version).zip \
$(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)/src.zip;
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: feedback on --enable-java-home
2008-10-31 17:13 ` feedback on --enable-java-home Andrew Haley
@ 2008-10-31 21:25 ` Andrew John Hughes
2008-11-01 10:38 ` Andrew Haley
0 siblings, 1 reply; 11+ messages in thread
From: Andrew John Hughes @ 2008-10-31 21:25 UTC (permalink / raw)
To: Andrew Haley; +Cc: Matthias Klose, Joshua Sumali, Java Patch List
2008/10/31 Andrew Haley <aph@redhat.com>:
> Matthias Klose wrote:
>
>> b) The symlinks for the header files are wrong, when installed with
>> DESTDIR set.
>>
>> h) Why are the additional symlinks to the rt.jar required?
>>
>> i) The versioned jar links point to the bin directory, not to the
>> lib directory.
>>
>> j) The versioned jar links are created in the "toplevel" dir, not
>> in the lib directory.
>
> All fixed.
>
> Andrew.
>
>
> 2008-10-31 Andrew Haley <aph@redhat.com>
>
> * Makefile.am (install-data-local): Correct symlink paths for
> SDK-style installed JARs.
> Correct symlinks for headers when DESTDIR is set.
>
> Index: Makefile.am
> ===================================================================
> --- Makefile.am (revision 141430)
> +++ Makefile.am (working copy)
> @@ -612,11 +612,15 @@
> version=$(JAVA_VERSION).$(BUILD_VERSION); \
> working_dir=`pwd`; \
> cd $(DESTDIR)$(JVM_JAR_DIR); \
> + RELATIVE=$$(relative $(DESTDIR)$(JRE_LIB_DIR) \
> + $(DESTDIR)$(JVM_JAR_DIR)); \
> for jarname in jaas jce jdbc-stdext jndi jndi-cos jndi-dns \
> jndi-ldap jndi-rmi jsse sasl; \
> do \
> - ln -s $$RELATIVE/$$jarname.jar $$jarname-$$version.jar; \
> + ln -sf $$RELATIVE/rt.jar $$jarname-$$version.jar; \
> done; \
> + RELATIVE=$$(relative $(DESTDIR)$(jardir) \
> + $(DESTDIR)$(JVM_JAR_DIR)); \
> for jar in *-$$version.jar; \
> do \
> ln -sf $$jar $$(echo $$jar | sed "s|-$$version.jar|-$(JAVA_VERSION).jar|g"); \
> @@ -633,14 +637,7 @@
> $(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/client; \
> $(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/server; \
> $(mkinstalldirs) $(DESTDIR)$(SDK_LIB_DIR); \
> - cd $(DESTDIR)$(JRE_LIB_DIR); \
> - for jarname in jaas jce jdbc-stdext jndi jndi-cos jndi-dns \
> - jndi-ldap jndi-rmi jsse sasl; \
> - do \
> - ln -s rt.jar $$jarname.jar; \
> - done; \
> - cd $$working_dir; \
> - RELATIVE=$$(relative $(DESTDIR)$(datarootdir)/java \
> + RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
> $(DESTDIR)$(JRE_LIB_DIR)); \
> ln -sf $$RELATIVE/libgcj-$(gcc_version).jar \
> $(DESTDIR)$(JRE_LIB_DIR)/rt.jar; \
> @@ -656,14 +653,14 @@
> $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/server); \
> ln -sf $$RELATIVE/libjvm.so \
> $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/server/libjvm.so; \
> - RELATIVE=$$(relative $(DESTDIR)$(datarootdir)/java \
> + RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
> $(DESTDIR)$(SDK_LIB_DIR)); \
> ln -sf $$RELATIVE/libgcj-tools-$(gcc_version).jar \
> $(DESTDIR)$(SDK_LIB_DIR)/tools.jar; \
> for headername in jawt jni; do \
> DIRECTORY=$$(dirname $$($(DESTDIR)$(bindir)/gcj \
> -print-file-name=include/$$headername.h)); \
> - RELATIVE=$$(relative $(DESTDIR)$$DIRECTORY \
> + RELATIVE=$$(relative $$DIRECTORY \
> $(DESTDIR)$(SDK_INCLUDE_DIR)); \
> ln -sf $$RELATIVE/$$headername.h \
> $(DESTDIR)$(SDK_INCLUDE_DIR)/$$headername.h; \
> @@ -671,12 +668,12 @@
> for headername in jawt_md jni_md; do \
> DIRECTORY=$$(dirname $$($(DESTDIR)$(bindir)/gcj \
> -print-file-name=include/$$headername.h)); \
> - RELATIVE=$$(relative $(DESTDIR)$$DIRECTORY \
> + RELATIVE=$$(relative $$DIRECTORY \
> $(DESTDIR)$(SDK_INCLUDE_DIR)/linux); \
> ln -sf $$RELATIVE/$$headername.h \
> $(DESTDIR)$(SDK_INCLUDE_DIR)/linux/$$headername.h; \
> done; \
> - RELATIVE=$$(relative $(DESTDIR)$(datarootdir)/java \
> + RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
> $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)); \
> ln -sf $$RELATIVE/src-$(gcc_version).zip \
> $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)/src.zip;
>
Just built and installed trunk with:
$GCC_HOME/configure --prefix=$GCC_INSTALL --disable-multilib
--enable-languages=c,c++,java \
--enable-java-awt=gtk,xlib,qt --enable-gconf-peer
--enable-gstreamer-peer \
--enable-java-maintainer-mode --with-java-home=$GCC_INSTALL
--enable-java-home \
--with-jvm-root-dir=$GCC_INSTALL/jdk
--with-jvm-jar-dir=$GCC_INSTALL/jvm-exports
There still seem to be some issues with the result:
* I'm not sure of the point of specifying --with-java-home. I would
have assumed that would give the root dir but this is done by
--with-jvm-root-dir. What use case am I missing?
* --with-jvm-root-dir does not set the root dir, but instead is a
directory in which a 'java-1.5.0-gcj-1.5.0.0' directory is created.
Can jvm root dir not be used directly so the user gets full choice
over what the directory is called? This naming is Fedora specific.
* There is still a broken src.zip symlink:
-- src.zip -> ../../share/java/src-4.4.0.zip
* There is still a broken javac symlink, though it does make some
sense if ecj will be installed in $prefix/bin later. Given gcj has
ecj.jar and creates ecj1, could it not create $prefix/bin/ecj?
* In jre/lib/security, we have a broken symlink: java.security ->
../../../../../lib/security/classpath.security. This is in lib64
here.
My build includes gjdoc so I don't know if that issue is fixed.
Running make DESTDIR=/tmp/gcj install gave a working include
directory, so that issue seems to be fixed.
--
Andrew :-)
Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: feedback on --enable-java-home
2008-10-31 21:25 ` Andrew John Hughes
@ 2008-11-01 10:38 ` Andrew Haley
2008-11-02 0:58 ` Andrew John Hughes
0 siblings, 1 reply; 11+ messages in thread
From: Andrew Haley @ 2008-11-01 10:38 UTC (permalink / raw)
To: Andrew John Hughes; +Cc: Matthias Klose, Joshua Sumali, Java Patch List
Andrew John Hughes wrote:
> 2008/10/31 Andrew Haley <aph@redhat.com>:
>> Matthias Klose wrote:
>>
>>> b) The symlinks for the header files are wrong, when installed with
>>> DESTDIR set.
>>>
>>> h) Why are the additional symlinks to the rt.jar required?
>>>
>>> i) The versioned jar links point to the bin directory, not to the
>>> lib directory.
>>>
>>> j) The versioned jar links are created in the "toplevel" dir, not
>>> in the lib directory.
>> All fixed.
>>
>> Andrew.
>>
>>
>> 2008-10-31 Andrew Haley <aph@redhat.com>
>>
>> * Makefile.am (install-data-local): Correct symlink paths for
>> SDK-style installed JARs.
>> Correct symlinks for headers when DESTDIR is set.
>>
>> Index: Makefile.am
>> ===================================================================
>> --- Makefile.am (revision 141430)
>> +++ Makefile.am (working copy)
>> @@ -612,11 +612,15 @@
>> version=$(JAVA_VERSION).$(BUILD_VERSION); \
>> working_dir=`pwd`; \
>> cd $(DESTDIR)$(JVM_JAR_DIR); \
>> + RELATIVE=$$(relative $(DESTDIR)$(JRE_LIB_DIR) \
>> + $(DESTDIR)$(JVM_JAR_DIR)); \
>> for jarname in jaas jce jdbc-stdext jndi jndi-cos jndi-dns \
>> jndi-ldap jndi-rmi jsse sasl; \
>> do \
>> - ln -s $$RELATIVE/$$jarname.jar $$jarname-$$version.jar; \
>> + ln -sf $$RELATIVE/rt.jar $$jarname-$$version.jar; \
>> done; \
>> + RELATIVE=$$(relative $(DESTDIR)$(jardir) \
>> + $(DESTDIR)$(JVM_JAR_DIR)); \
>> for jar in *-$$version.jar; \
>> do \
>> ln -sf $$jar $$(echo $$jar | sed "s|-$$version.jar|-$(JAVA_VERSION).jar|g"); \
>> @@ -633,14 +637,7 @@
>> $(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/client; \
>> $(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/server; \
>> $(mkinstalldirs) $(DESTDIR)$(SDK_LIB_DIR); \
>> - cd $(DESTDIR)$(JRE_LIB_DIR); \
>> - for jarname in jaas jce jdbc-stdext jndi jndi-cos jndi-dns \
>> - jndi-ldap jndi-rmi jsse sasl; \
>> - do \
>> - ln -s rt.jar $$jarname.jar; \
>> - done; \
>> - cd $$working_dir; \
>> - RELATIVE=$$(relative $(DESTDIR)$(datarootdir)/java \
>> + RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
>> $(DESTDIR)$(JRE_LIB_DIR)); \
>> ln -sf $$RELATIVE/libgcj-$(gcc_version).jar \
>> $(DESTDIR)$(JRE_LIB_DIR)/rt.jar; \
>> @@ -656,14 +653,14 @@
>> $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/server); \
>> ln -sf $$RELATIVE/libjvm.so \
>> $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/server/libjvm.so; \
>> - RELATIVE=$$(relative $(DESTDIR)$(datarootdir)/java \
>> + RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
>> $(DESTDIR)$(SDK_LIB_DIR)); \
>> ln -sf $$RELATIVE/libgcj-tools-$(gcc_version).jar \
>> $(DESTDIR)$(SDK_LIB_DIR)/tools.jar; \
>> for headername in jawt jni; do \
>> DIRECTORY=$$(dirname $$($(DESTDIR)$(bindir)/gcj \
>> -print-file-name=include/$$headername.h)); \
>> - RELATIVE=$$(relative $(DESTDIR)$$DIRECTORY \
>> + RELATIVE=$$(relative $$DIRECTORY \
>> $(DESTDIR)$(SDK_INCLUDE_DIR)); \
>> ln -sf $$RELATIVE/$$headername.h \
>> $(DESTDIR)$(SDK_INCLUDE_DIR)/$$headername.h; \
>> @@ -671,12 +668,12 @@
>> for headername in jawt_md jni_md; do \
>> DIRECTORY=$$(dirname $$($(DESTDIR)$(bindir)/gcj \
>> -print-file-name=include/$$headername.h)); \
>> - RELATIVE=$$(relative $(DESTDIR)$$DIRECTORY \
>> + RELATIVE=$$(relative $$DIRECTORY \
>> $(DESTDIR)$(SDK_INCLUDE_DIR)/linux); \
>> ln -sf $$RELATIVE/$$headername.h \
>> $(DESTDIR)$(SDK_INCLUDE_DIR)/linux/$$headername.h; \
>> done; \
>> - RELATIVE=$$(relative $(DESTDIR)$(datarootdir)/java \
>> + RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
>> $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)); \
>> ln -sf $$RELATIVE/src-$(gcc_version).zip \
>> $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)/src.zip;
>>
>
>
> Just built and installed trunk with:
>
> $GCC_HOME/configure --prefix=$GCC_INSTALL --disable-multilib
> --enable-languages=c,c++,java \
> --enable-java-awt=gtk,xlib,qt --enable-gconf-peer
> --enable-gstreamer-peer \
> --enable-java-maintainer-mode --with-java-home=$GCC_INSTALL
> --enable-java-home \
> --with-jvm-root-dir=$GCC_INSTALL/jdk
> --with-jvm-jar-dir=$GCC_INSTALL/jvm-exports
>
> There still seem to be some issues with the result:
>
> * I'm not sure of the point of specifying --with-java-home. I would
> have assumed that would give the root dir but this is done by
> --with-jvm-root-dir. What use case am I missing?
I didn't change this.
> * --with-jvm-root-dir does not set the root dir, but instead is a
> directory in which a 'java-1.5.0-gcj-1.5.0.0' directory is created.
> Can jvm root dir not be used directly so the user gets full choice
> over what the directory is called? This naming is Fedora specific.
I can see no reason why not.
> * There is still a broken src.zip symlink:
> -- src.zip -> ../../share/java/src-4.4.0.zip
I didn't change this.
> * There is still a broken javac symlink, though it does make some
> sense if ecj will be installed in $prefix/bin later. Given gcj has
> ecj.jar and creates ecj1, could it not create $prefix/bin/ecj?
Possibly, yes. The problem is that on distros $prefix/bin/ecj is
owned by Eclipse's ecj package, so it would conflict. I can't see
any purpose to creating ecj in the jvm root dir. It would
be worth fixing the javac symlink, though, to point to a working
javac.
> * In jre/lib/security, we have a broken symlink: java.security ->
> ../../../../../lib/security/classpath.security. This is in lib64
> here.
OK, this needs fixing.
To be clear: as the mail said, I only fixed items b, h, i, and j from
Doko's list. It would be nice to change the configury options, but not
critical.
Andrew.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: feedback on --enable-java-home
2008-11-01 10:38 ` Andrew Haley
@ 2008-11-02 0:58 ` Andrew John Hughes
2009-02-13 15:26 ` Andrew Haley
0 siblings, 1 reply; 11+ messages in thread
From: Andrew John Hughes @ 2008-11-02 0:58 UTC (permalink / raw)
To: Andrew Haley; +Cc: Matthias Klose, Joshua Sumali, Java Patch List
2008/11/1 Andrew Haley <aph@redhat.com>:
> Andrew John Hughes wrote:
>> 2008/10/31 Andrew Haley <aph@redhat.com>:
>>> Matthias Klose wrote:
>>>
>>>> b) The symlinks for the header files are wrong, when installed with
>>>> DESTDIR set.
>>>>
>>>> h) Why are the additional symlinks to the rt.jar required?
>>>>
>>>> i) The versioned jar links point to the bin directory, not to the
>>>> lib directory.
>>>>
>>>> j) The versioned jar links are created in the "toplevel" dir, not
>>>> in the lib directory.
>>> All fixed.
>>>
>>> Andrew.
>>>
>>>
>>> 2008-10-31 Andrew Haley <aph@redhat.com>
>>>
>>> * Makefile.am (install-data-local): Correct symlink paths for
>>> SDK-style installed JARs.
>>> Correct symlinks for headers when DESTDIR is set.
>>>
>>> Index: Makefile.am
>>> ===================================================================
>>> --- Makefile.am (revision 141430)
>>> +++ Makefile.am (working copy)
>>> @@ -612,11 +612,15 @@
>>> version=$(JAVA_VERSION).$(BUILD_VERSION); \
>>> working_dir=`pwd`; \
>>> cd $(DESTDIR)$(JVM_JAR_DIR); \
>>> + RELATIVE=$$(relative $(DESTDIR)$(JRE_LIB_DIR) \
>>> + $(DESTDIR)$(JVM_JAR_DIR)); \
>>> for jarname in jaas jce jdbc-stdext jndi jndi-cos jndi-dns \
>>> jndi-ldap jndi-rmi jsse sasl; \
>>> do \
>>> - ln -s $$RELATIVE/$$jarname.jar $$jarname-$$version.jar; \
>>> + ln -sf $$RELATIVE/rt.jar $$jarname-$$version.jar; \
>>> done; \
>>> + RELATIVE=$$(relative $(DESTDIR)$(jardir) \
>>> + $(DESTDIR)$(JVM_JAR_DIR)); \
>>> for jar in *-$$version.jar; \
>>> do \
>>> ln -sf $$jar $$(echo $$jar | sed "s|-$$version.jar|-$(JAVA_VERSION).jar|g"); \
>>> @@ -633,14 +637,7 @@
>>> $(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/client; \
>>> $(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/server; \
>>> $(mkinstalldirs) $(DESTDIR)$(SDK_LIB_DIR); \
>>> - cd $(DESTDIR)$(JRE_LIB_DIR); \
>>> - for jarname in jaas jce jdbc-stdext jndi jndi-cos jndi-dns \
>>> - jndi-ldap jndi-rmi jsse sasl; \
>>> - do \
>>> - ln -s rt.jar $$jarname.jar; \
>>> - done; \
>>> - cd $$working_dir; \
>>> - RELATIVE=$$(relative $(DESTDIR)$(datarootdir)/java \
>>> + RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
>>> $(DESTDIR)$(JRE_LIB_DIR)); \
>>> ln -sf $$RELATIVE/libgcj-$(gcc_version).jar \
>>> $(DESTDIR)$(JRE_LIB_DIR)/rt.jar; \
>>> @@ -656,14 +653,14 @@
>>> $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/server); \
>>> ln -sf $$RELATIVE/libjvm.so \
>>> $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/server/libjvm.so; \
>>> - RELATIVE=$$(relative $(DESTDIR)$(datarootdir)/java \
>>> + RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
>>> $(DESTDIR)$(SDK_LIB_DIR)); \
>>> ln -sf $$RELATIVE/libgcj-tools-$(gcc_version).jar \
>>> $(DESTDIR)$(SDK_LIB_DIR)/tools.jar; \
>>> for headername in jawt jni; do \
>>> DIRECTORY=$$(dirname $$($(DESTDIR)$(bindir)/gcj \
>>> -print-file-name=include/$$headername.h)); \
>>> - RELATIVE=$$(relative $(DESTDIR)$$DIRECTORY \
>>> + RELATIVE=$$(relative $$DIRECTORY \
>>> $(DESTDIR)$(SDK_INCLUDE_DIR)); \
>>> ln -sf $$RELATIVE/$$headername.h \
>>> $(DESTDIR)$(SDK_INCLUDE_DIR)/$$headername.h; \
>>> @@ -671,12 +668,12 @@
>>> for headername in jawt_md jni_md; do \
>>> DIRECTORY=$$(dirname $$($(DESTDIR)$(bindir)/gcj \
>>> -print-file-name=include/$$headername.h)); \
>>> - RELATIVE=$$(relative $(DESTDIR)$$DIRECTORY \
>>> + RELATIVE=$$(relative $$DIRECTORY \
>>> $(DESTDIR)$(SDK_INCLUDE_DIR)/linux); \
>>> ln -sf $$RELATIVE/$$headername.h \
>>> $(DESTDIR)$(SDK_INCLUDE_DIR)/linux/$$headername.h; \
>>> done; \
>>> - RELATIVE=$$(relative $(DESTDIR)$(datarootdir)/java \
>>> + RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
>>> $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)); \
>>> ln -sf $$RELATIVE/src-$(gcc_version).zip \
>>> $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)/src.zip;
>>>
>>
>>
>> Just built and installed trunk with:
>>
>> $GCC_HOME/configure --prefix=$GCC_INSTALL --disable-multilib
>> --enable-languages=c,c++,java \
>> --enable-java-awt=gtk,xlib,qt --enable-gconf-peer
>> --enable-gstreamer-peer \
>> --enable-java-maintainer-mode --with-java-home=$GCC_INSTALL
>> --enable-java-home \
>> --with-jvm-root-dir=$GCC_INSTALL/jdk
>> --with-jvm-jar-dir=$GCC_INSTALL/jvm-exports
>>
>> There still seem to be some issues with the result:
>>
>> * I'm not sure of the point of specifying --with-java-home. I would
>> have assumed that would give the root dir but this is done by
>> --with-jvm-root-dir. What use case am I missing?
>
> I didn't change this.
>
>> * --with-jvm-root-dir does not set the root dir, but instead is a
>> directory in which a 'java-1.5.0-gcj-1.5.0.0' directory is created.
>> Can jvm root dir not be used directly so the user gets full choice
>> over what the directory is called? This naming is Fedora specific.
>
> I can see no reason why not.
>
>> * There is still a broken src.zip symlink:
>> -- src.zip -> ../../share/java/src-4.4.0.zip
>
> I didn't change this.
>
>> * There is still a broken javac symlink, though it does make some
>> sense if ecj will be installed in $prefix/bin later. Given gcj has
>> ecj.jar and creates ecj1, could it not create $prefix/bin/ecj?
>
> Possibly, yes. The problem is that on distros $prefix/bin/ecj is
> owned by Eclipse's ecj package, so it would conflict. I can't see
> any purpose to creating ecj in the jvm root dir. It would
> be worth fixing the javac symlink, though, to point to a working
> javac.
>
>> * In jre/lib/security, we have a broken symlink: java.security ->
>> ../../../../../lib/security/classpath.security. This is in lib64
>> here.
>
> OK, this needs fixing.
>
> To be clear: as the mail said, I only fixed items b, h, i, and j from
> Doko's list. It would be nice to change the configury options, but not
> critical.
>
> Andrew.
>
I know; I just wanted to clarify the remaining issues and also point
out the classpath.security issue which was missed by doko. I think
the broken symlinks need to be fixed at least. I'm happy to look at
this later this week when I'm back from Munich.
--
Andrew :-)
Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: feedback on --enable-java-home
2008-11-02 0:58 ` Andrew John Hughes
@ 2009-02-13 15:26 ` Andrew Haley
2009-03-03 9:55 ` Andrew John Hughes
0 siblings, 1 reply; 11+ messages in thread
From: Andrew Haley @ 2009-02-13 15:26 UTC (permalink / raw)
To: Andrew John Hughes; +Cc: Matthias Klose, Java Patch List
Andrew John Hughes wrote:
> 2008/11/1 Andrew Haley <aph@redhat.com>:
>> Andrew John Hughes wrote:
>>> 2008/10/31 Andrew Haley <aph@redhat.com>:
>>>> Matthias Klose wrote:
>>>>
>>>>> b) The symlinks for the header files are wrong, when installed with
>>>>> DESTDIR set.
>>>>>
>>>>> h) Why are the additional symlinks to the rt.jar required?
>>>>>
>>>>> i) The versioned jar links point to the bin directory, not to the
>>>>> lib directory.
>>>>>
>>>>> j) The versioned jar links are created in the "toplevel" dir, not
>>>>> in the lib directory.
>>>> All fixed.
>>> Just built and installed trunk with:
>>>
>>> $GCC_HOME/configure --prefix=$GCC_INSTALL --disable-multilib
>>> --enable-languages=c,c++,java \
>>> --enable-java-awt=gtk,xlib,qt --enable-gconf-peer
>>> --enable-gstreamer-peer \
>>> --enable-java-maintainer-mode --with-java-home=$GCC_INSTALL
>>> --enable-java-home \
>>> --with-jvm-root-dir=$GCC_INSTALL/jdk
>>> --with-jvm-jar-dir=$GCC_INSTALL/jvm-exports
>>>
>>> There still seem to be some issues with the result:
>>>
>>> * I'm not sure of the point of specifying --with-java-home. I would
>>> have assumed that would give the root dir but this is done by
>>> --with-jvm-root-dir. What use case am I missing?
>> I didn't change this.
>>
>>> * --with-jvm-root-dir does not set the root dir, but instead is a
>>> directory in which a 'java-1.5.0-gcj-1.5.0.0' directory is created.
>>> Can jvm root dir not be used directly so the user gets full choice
>>> over what the directory is called? This naming is Fedora specific.
>> I can see no reason why not.
I don't intend to do anything about this. If someone else wants to,
feel free.
>>> * There is still a broken src.zip symlink:
>>> -- src.zip -> ../../share/java/src-4.4.0.zip
>> I didn't change this.
Or this. There's no way that gcc should install a bunch of .java files into
src.zip in the install tree. It's just not the gcc way.
>>> * There is still a broken javac symlink, though it does make some
>>> sense if ecj will be installed in $prefix/bin later. Given gcj has
>>> ecj.jar and creates ecj1, could it not create $prefix/bin/ecj?
>> Possibly, yes. The problem is that on distros $prefix/bin/ecj is
>> owned by Eclipse's ecj package, so it would conflict. I can't see
>> any purpose to creating ecj in the jvm root dir. It would
>> be worth fixing the javac symlink, though, to point to a working
>> javac.
I wonder if we should simply not generate the javac symlink. We don't
have a javac, after all.
>>> * In jre/lib/security, we have a broken symlink: java.security ->
>>> ../../../../../lib/security/classpath.security. This is in lib64
>>> here.
>> OK, this needs fixing.
I'll do this. I take it, then, that classpath.security should always
be in $LIBDIR/security/classpath.security. Is that right?
Andrew.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: feedback on --enable-java-home
2009-02-13 15:26 ` Andrew Haley
@ 2009-03-03 9:55 ` Andrew John Hughes
2009-03-03 10:57 ` Andrew Haley
0 siblings, 1 reply; 11+ messages in thread
From: Andrew John Hughes @ 2009-03-03 9:55 UTC (permalink / raw)
To: Andrew Haley; +Cc: Matthias Klose, Java Patch List
[-- Attachment #1: Type: text/plain, Size: 6409 bytes --]
2009/2/13 Andrew Haley <aph@redhat.com>:
> Andrew John Hughes wrote:
>> 2008/11/1 Andrew Haley <aph@redhat.com>:
>>> Andrew John Hughes wrote:
>>>> 2008/10/31 Andrew Haley <aph@redhat.com>:
>>>>> Matthias Klose wrote:
>>>>>
>>>>>> b) The symlinks for the header files are wrong, when installed with
>>>>>> DESTDIR set.
>>>>>>
>>>>>> h) Why are the additional symlinks to the rt.jar required?
>>>>>>
>>>>>> i) The versioned jar links point to the bin directory, not to the
>>>>>> lib directory.
>>>>>>
>>>>>> j) The versioned jar links are created in the "toplevel" dir, not
>>>>>> in the lib directory.
>>>>> All fixed.
>
>>>> Just built and installed trunk with:
>>>>
>>>> $GCC_HOME/configure --prefix=$GCC_INSTALL --disable-multilib
>>>> --enable-languages=c,c++,java \
>>>> --enable-java-awt=gtk,xlib,qt --enable-gconf-peer
>>>> --enable-gstreamer-peer \
>>>> --enable-java-maintainer-mode --with-java-home=$GCC_INSTALL
>>>> --enable-java-home \
>>>> --with-jvm-root-dir=$GCC_INSTALL/jdk
>>>> --with-jvm-jar-dir=$GCC_INSTALL/jvm-exports
>>>>
>>>> There still seem to be some issues with the result:
>>>>
>>>> * I'm not sure of the point of specifying --with-java-home. I would
>>>> have assumed that would give the root dir but this is done by
>>>> --with-jvm-root-dir. What use case am I missing?
>>> I didn't change this.
>>>
>>>> * --with-jvm-root-dir does not set the root dir, but instead is a
>>>> directory in which a 'java-1.5.0-gcj-1.5.0.0' directory is created.
>>>> Can jvm root dir not be used directly so the user gets full choice
>>>> over what the directory is called? This naming is Fedora specific.
>>> I can see no reason why not.
>
> I don't intend to do anything about this. If someone else wants to,
> feel free.
>
>>>> * There is still a broken src.zip symlink:
>>>> -- src.zip -> ../../share/java/src-4.4.0.zip
>>> I didn't change this.
>
> Or this. There's no way that gcc should install a bunch of .java files into
> src.zip in the install tree. It's just not the gcc way.
>
>>>> * There is still a broken javac symlink, though it does make some
>>>> sense if ecj will be installed in $prefix/bin later. Given gcj has
>>>> ecj.jar and creates ecj1, could it not create $prefix/bin/ecj?
>>> Possibly, yes. The problem is that on distros $prefix/bin/ecj is
>>> owned by Eclipse's ecj package, so it would conflict. I can't see
>>> any purpose to creating ecj in the jvm root dir. It would
>>> be worth fixing the javac symlink, though, to point to a working
>>> javac.
>
> I wonder if we should simply not generate the javac symlink. We don't
> have a javac, after all.
>
>>>> * In jre/lib/security, we have a broken symlink: java.security ->
>>>> ../../../../../lib/security/classpath.security. This is in lib64
>>>> here.
>>> OK, this needs fixing.
>
> I'll do this. I take it, then, that classpath.security should always
> be in $LIBDIR/security/classpath.security. Is that right?
>
> Andrew.
>
The attached patch fixes the following issues:
* Removes the dangling javac and ecj symlinks
* Removes the hardcoded java-1.5.0-gcj-1.5.0 prefix
* Maps x86_64 to amd64 as used by OpenJDK.
Prior to the latter fix, CPU was empty on my build, resulting in
client and server directories being added to jre/lib rather than
jre/lib/${arch}. I don't know if this is the case on other
architectures; x86 builds are mapped to i386 explicitly, other archs
should use ${host_cpu} but if this worked, I should have got an
(incorrect) x86_64 directory not nothing. Is this a known issue with
the version of autotools used by gcj?
With this patch, my JDK tree now looks like this:
/home/andrew/build/gcj/jdk/
/home/andrew/build/gcj/jdk/bin
/home/andrew/build/gcj/jdk/bin/jar
/home/andrew/build/gcj/jdk/bin/java
/home/andrew/build/gcj/jdk/bin/orbd
/home/andrew/build/gcj/jdk/bin/rmic
/home/andrew/build/gcj/jdk/bin/rmid
/home/andrew/build/gcj/jdk/bin/serialver
/home/andrew/build/gcj/jdk/bin/keytool
/home/andrew/build/gcj/jdk/bin/javah
/home/andrew/build/gcj/jdk/bin/native2ascii
/home/andrew/build/gcj/jdk/bin/appletviewer
/home/andrew/build/gcj/jdk/bin/tnameserv
/home/andrew/build/gcj/jdk/bin/jarsigner
/home/andrew/build/gcj/jdk/bin/javadoc
/home/andrew/build/gcj/jdk/bin/rmiregistry
/home/andrew/build/gcj/jdk/jre
/home/andrew/build/gcj/jdk/jre/bin
/home/andrew/build/gcj/jdk/jre/bin/java
/home/andrew/build/gcj/jdk/jre/bin/orbd
/home/andrew/build/gcj/jdk/jre/bin/rmid
/home/andrew/build/gcj/jdk/jre/bin/keytool
/home/andrew/build/gcj/jdk/jre/bin/tnameserv
/home/andrew/build/gcj/jdk/jre/bin/rmiregistry
/home/andrew/build/gcj/jdk/jre/lib
/home/andrew/build/gcj/jdk/jre/lib/amd64
/home/andrew/build/gcj/jdk/jre/lib/amd64/client
/home/andrew/build/gcj/jdk/jre/lib/amd64/client/libjvm.so
/home/andrew/build/gcj/jdk/jre/lib/amd64/libjawt.so
/home/andrew/build/gcj/jdk/jre/lib/amd64/server
/home/andrew/build/gcj/jdk/jre/lib/amd64/server/libjvm.so
/home/andrew/build/gcj/jdk/jre/lib/security
/home/andrew/build/gcj/jdk/jre/lib/security/java.security
/home/andrew/build/gcj/jdk/jre/lib/rt.jar
/home/andrew/build/gcj/jdk/lib
/home/andrew/build/gcj/jdk/lib/tools.jar
/home/andrew/build/gcj/jdk/include
/home/andrew/build/gcj/jdk/include/jni.h
/home/andrew/build/gcj/jdk/include/linux
/home/andrew/build/gcj/jdk/include/linux/jawt_md.h
/home/andrew/build/gcj/jdk/include/linux/jni_md.h
/home/andrew/build/gcj/jdk/include/jawt.h
which looks right to me, compared with the jdk/java-1.5.0-gcj-1.5.0.0
hierarchy currently produced by trunk.
ChangeLog:
2009-03-03 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
Remove dangling src.zip and javac symlinks.
* Makefile.in,
* configure: Regenerated.
* configure.ac: Drop hard-coded prefix,
thus removing sdk_dir and making jre_dir="jre".
Map x86_64 to amd64 as used by OpenJDK.
* gcj/Makefile.in,
* include/Makefile.in,
* testsuite/Makefile.in: Regenerated.
Ok for trunk?
--
Andrew :-)
Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)
Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
[-- Attachment #2: java_home-01.diff --]
[-- Type: text/plain, Size: 16081 bytes --]
Index: libjava/Makefile.in
===================================================================
--- libjava/Makefile.in (revision 144570)
+++ libjava/Makefile.in (working copy)
@@ -743,7 +743,6 @@
PLATFORM = @PLATFORM@
RANLIB = @RANLIB@
SDK_BIN_DIR = @SDK_BIN_DIR@
-SDK_DIR = @SDK_DIR@
SDK_INCLUDE_DIR = @SDK_INCLUDE_DIR@
SDK_LIB_DIR = @SDK_LIB_DIR@
SDK_LNK = @SDK_LNK@
@@ -12434,7 +12433,6 @@
@CREATE_JAVA_HOME_TRUE@ $(DESTDIR)$(SDK_BIN_DIR)/rmic; \
@CREATE_JAVA_HOME_TRUE@ ln -sf $$RELATIVE/`echo gjavah | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
@CREATE_JAVA_HOME_TRUE@ $(DESTDIR)$(SDK_BIN_DIR)/javah; \
-@CREATE_JAVA_HOME_TRUE@ ln -sf $$RELATIVE/ecj $(DESTDIR)$(SDK_BIN_DIR)/javac; \
@CREATE_JAVA_HOME_TRUE@ ln -sf $$RELATIVE/`echo gappletviewer | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
@CREATE_JAVA_HOME_TRUE@ $(DESTDIR)$(SDK_BIN_DIR)/appletviewer; \
@CREATE_JAVA_HOME_TRUE@ ln -sf $$RELATIVE/`echo gjarsigner | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
@@ -12532,9 +12530,7 @@
@CREATE_JAVA_HOME_TRUE@ $(DESTDIR)$(SDK_INCLUDE_DIR)/linux/$$headername.h; \
@CREATE_JAVA_HOME_TRUE@ done; \
@CREATE_JAVA_HOME_TRUE@ RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
-@CREATE_JAVA_HOME_TRUE@ $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)); \
-@CREATE_JAVA_HOME_TRUE@ ln -sf $$RELATIVE/src-$(gcc_version).zip \
-@CREATE_JAVA_HOME_TRUE@ $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)/src.zip;
+@CREATE_JAVA_HOME_TRUE@ $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR));
maintainer-check: libgcj.la
$(NM) .libs/libgcj.a | grep ' T ' \
Index: libjava/configure.ac
===================================================================
--- libjava/configure.ac (revision 144570)
+++ libjava/configure.ac (working copy)
@@ -1809,8 +1809,7 @@
AC_SUBST(BUILD_VERSION)
AC_MSG_RESULT(Java version: ${JAVA_VERSION})
- jre_dir=java-${JAVA_VERSION}-${origin_name}-${JAVA_VERSION}.${BUILD_VERSION}${arch_suffix}/jre
- sdk_dir=java-${JAVA_VERSION}-${origin_name}-${JAVA_VERSION}.${BUILD_VERSION}${arch_suffix}
+ jre_dir=jre
jre_lnk=jre-${JAVA_VERSION}-${origin_name}
sdk_lnk=java-${JAVA_VERSION}-${origin_name}
@@ -1822,31 +1821,28 @@
AC_SUBST(JVM_JAR_ROOT_DIR)
AC_MSG_RESULT(JVM JAR ROOT directory: ${JVM_JAR_ROOT_DIR})
- JVM_JAR_DIR=${jvm_jar_dir}/${sdk_dir}
+ JVM_JAR_DIR=${jvm_jar_dir}
AC_SUBST(JVM_JAR_DIR)
AC_MSG_RESULT(JVM JAR directory: ${JVM_JAR_DIR})
JRE_DIR=${jre_dir}
AC_SUBST(JRE_DIR)
- SDK_DIR=${sdk_dir}
- AC_SUBST(SDK_DIR)
-
JRE_LNK=${jre_lnk}
AC_SUBST(JRE_LNK)
SDK_LNK=${sdk_lnk}
AC_SUBST(SDK_LNK)
- SDK_BIN_DIR=${jvm_root_dir}/${sdk_dir}/bin
+ SDK_BIN_DIR=${jvm_root_dir}/bin
AC_SUBST(SDK_BIN_DIR)
AC_MSG_RESULT(SDK tools directory: ${SDK_BIN_DIR})
- SDK_LIB_DIR=${jvm_root_dir}/${sdk_dir}/lib
+ SDK_LIB_DIR=${jvm_root_dir}/lib
AC_SUBST(SDK_LIB_DIR)
AC_MSG_RESULT(SDK jar directory: ${SDK_LIB_DIR})
- SDK_INCLUDE_DIR=${jvm_root_dir}/${sdk_dir}/include
+ SDK_INCLUDE_DIR=${jvm_root_dir}/include
AC_SUBST(SDK_INCLUDE_DIR)
AC_MSG_RESULT(SDK include directory: ${SDK_INCLUDE_DIR})
@@ -1868,7 +1864,7 @@
AC_SUBST(GCJ_BIN_DIR)
AC_MSG_RESULT(GCJ tools directory: ${GCJ_BIN_DIR})
- echo host is ${host}
+ AC_MSG_RESULT(host is ${host})
if test "x${host_cpu}" = "x"
then
case ${host} in
@@ -1876,6 +1872,8 @@
host_cpu=x86;;
i486-* | i586-* | i686-*)
host_cpu=i386;;
+ x86_64-*)
+ host_cpu=amd64;;
*)
host_cpu=${host_cpu};;
esac
Index: libjava/include/Makefile.in
===================================================================
--- libjava/include/Makefile.in (revision 144570)
+++ libjava/include/Makefile.in (working copy)
@@ -240,7 +240,6 @@
PLATFORM = @PLATFORM@
RANLIB = @RANLIB@
SDK_BIN_DIR = @SDK_BIN_DIR@
-SDK_DIR = @SDK_DIR@
SDK_INCLUDE_DIR = @SDK_INCLUDE_DIR@
SDK_LIB_DIR = @SDK_LIB_DIR@
SDK_LNK = @SDK_LNK@
Index: libjava/testsuite/Makefile.in
===================================================================
--- libjava/testsuite/Makefile.in (revision 144570)
+++ libjava/testsuite/Makefile.in (working copy)
@@ -229,7 +229,6 @@
PLATFORM = @PLATFORM@
RANLIB = @RANLIB@
SDK_BIN_DIR = @SDK_BIN_DIR@
-SDK_DIR = @SDK_DIR@
SDK_INCLUDE_DIR = @SDK_INCLUDE_DIR@
SDK_LIB_DIR = @SDK_LIB_DIR@
SDK_LNK = @SDK_LNK@
Index: libjava/configure
===================================================================
--- libjava/configure (revision 144570)
+++ libjava/configure (working copy)
@@ -459,7 +459,7 @@
#endif"
ac_subdirs_all="$ac_subdirs_all classpath libltdl"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_libsubdir build_subdir host_subdir target_subdir multi_basedir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs ANTLR_JAR CREATE_GJDOC_TRUE CREATE_GJDOC_FALSE JAVA_MAINTAINER_MODE_TRUE JAVA_MAINTAINER_MODE_FALSE CC ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CFLAGS CXXFLAGS LDFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB JAR ZIP UNZIP MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC LIBGCJ_LD_SYMBOLIC_FUNCTIONS LIBGCJDEBUG TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE X_AWT_TRUE X_AWT_FALSE GCJ_FOR_ECJX GCJH host_exeext INCLTDL LIBLTDL DIRLTDL LIBTOOL SED EGREP FGREP GREP DUMPBIN ac_ct_DUMPBIN NM OBJDUMP ac_ct_OBJDUMP lt_ECHO DSYMUTIL ac_ct_DSYMUTIL NMEDIT ac_ct_NMEDIT LIPO ac_ct_LIPO OTOOL ac_ct_OTOOL OTOOL64 ac_ct_OTOOL64 CPP CPPFLAGS CXXCPP GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs TESTSUBDIR_TRUE TESTSUBDIR_FALSE ECJ_BUILD_JAR ECJ_JAR BUILD_ECJ1_TRUE BUILD_ECJ1_FALSE INSTALL_ECJ_JAR_TRUE INSTALL_ECJ_JAR_FALSE JAVA_HOME_SET_TRUE JAVA_HOME_SET_FALSE JAVA_HOME SUPPRESS_LIBGCJ_BC_TRUE SUPPRESS_LIBGCJ_BC_FALSE BUILD_LIBGCJ_REDUCED_REFLECTION_TRUE BUILD_LIBGCJ_REDUCED_REFLECTION_FALSE INTERPRETER INTERPRETER_TRUE INTERPRETER_FALSE LIBFFI LIBFFIINCS PLATFORM USING_WIN32_PLATFORM_TRUE USING_WIN32_PLATFORM_FALSE USING_POSIX_PLATFORM_TRUE USING_POSIX_PLATFORM_FALSE USING_DARWIN_CRT_TRUE USING_DARWIN_CRT_FALSE SYSTEMSPEC ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS extra_ldflags_libjava extra_gij_ldflags extra_ldflags LIBSTDCXXSPEC LIBGCJTESTSPEC GCLIBS GCINCS GCDEPS GCSPEC JC1GCSPEC GCTESTSPEC USING_BOEHMGC_TRUE USING_BOEHMGC_FALSE USING_NOGC_TRUE USING_NOGC_FALSE THREADLIBS THREADINCS THREADDEPS THREADSPEC THREADSTARTFILESPEC THREADLDFLAGS THREADCXXFLAGS USING_POSIX_THREADS_TRUE USING_POSIX_THREADS_FALSE USING_WIN32_THREADS_TRUE USING_WIN32_THREADS_FALSE USING_NO_THREADS_TRUE USING_NO_THREADS_FALSE USE_LIBGCJ_BC_TRUE USE_LIBGCJ_BC_FALSE LIBGCJ_SPEC HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE LIBICONV LTLIBICONV PKG_CONFIG GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS LIBART_CFLAGS LIBART_LIBS CLASSPATH_SEPARATOR ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC BACKTRACESPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE ENABLE_SHARED_TRUE ENABLE_SHARED_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE INSTALL_BINARIES_TRUE INSTALL_BINARIES_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir GCJVERSION dbexecdir gcjsubdir gxx_include_dir libstdcxx_incdir PERL SYSDEP_SOURCES ANONVERSCRIPT_TRUE ANONVERSCRIPT_FALSE LD_START_STATIC_SPEC LD_FINISH_STATIC_SPEC here python_mod_dir python_mod_dir_expanded MAKE INSTALL_AOT_RPM_TRUE INSTALL_AOT_RPM_FALSE CREATE_JAVA_HOME_TRUE CREATE_JAVA_HOME_FALSE gcc_suffix JAVA_VERSION BUILD_VERSION JVM_ROOT_DIR JVM_JAR_ROOT_DIR JVM_JAR_DIR JRE_DIR SDK_DIR JRE_LNK SDK_LNK SDK_BIN_DIR SDK_LIB_DIR SDK_INCLUDE_DIR JRE_BIN_DIR JRE_LIB_DIR GCJ_BIN_DIR CPU OS LIBDIR LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_libsubdir build_subdir host_subdir target_subdir multi_basedir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs ANTLR_JAR CREATE_GJDOC_TRUE CREATE_GJDOC_FALSE JAVA_MAINTAINER_MODE_TRUE JAVA_MAINTAINER_MODE_FALSE CC ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CFLAGS CXXFLAGS LDFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB JAR ZIP UNZIP MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC LIBGCJ_LD_SYMBOLIC_FUNCTIONS LIBGCJDEBUG TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE X_AWT_TRUE X_AWT_FALSE GCJ_FOR_ECJX GCJH host_exeext INCLTDL LIBLTDL DIRLTDL LIBTOOL SED EGREP FGREP GREP DUMPBIN ac_ct_DUMPBIN NM OBJDUMP ac_ct_OBJDUMP lt_ECHO DSYMUTIL ac_ct_DSYMUTIL NMEDIT ac_ct_NMEDIT LIPO ac_ct_LIPO OTOOL ac_ct_OTOOL OTOOL64 ac_ct_OTOOL64 CPP CPPFLAGS CXXCPP GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs TESTSUBDIR_TRUE TESTSUBDIR_FALSE ECJ_BUILD_JAR ECJ_JAR BUILD_ECJ1_TRUE BUILD_ECJ1_FALSE INSTALL_ECJ_JAR_TRUE INSTALL_ECJ_JAR_FALSE JAVA_HOME_SET_TRUE JAVA_HOME_SET_FALSE JAVA_HOME SUPPRESS_LIBGCJ_BC_TRUE SUPPRESS_LIBGCJ_BC_FALSE BUILD_LIBGCJ_REDUCED_REFLECTION_TRUE BUILD_LIBGCJ_REDUCED_REFLECTION_FALSE INTERPRETER INTERPRETER_TRUE INTERPRETER_FALSE LIBFFI LIBFFIINCS PLATFORM USING_WIN32_PLATFORM_TRUE USING_WIN32_PLATFORM_FALSE USING_POSIX_PLATFORM_TRUE USING_POSIX_PLATFORM_FALSE USING_DARWIN_CRT_TRUE USING_DARWIN_CRT_FALSE SYSTEMSPEC ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS extra_ldflags_libjava extra_gij_ldflags extra_ldflags LIBSTDCXXSPEC LIBGCJTESTSPEC GCLIBS GCINCS GCDEPS GCSPEC JC1GCSPEC GCTESTSPEC USING_BOEHMGC_TRUE USING_BOEHMGC_FALSE USING_NOGC_TRUE USING_NOGC_FALSE THREADLIBS THREADINCS THREADDEPS THREADSPEC THREADSTARTFILESPEC THREADLDFLAGS THREADCXXFLAGS USING_POSIX_THREADS_TRUE USING_POSIX_THREADS_FALSE USING_WIN32_THREADS_TRUE USING_WIN32_THREADS_FALSE USING_NO_THREADS_TRUE USING_NO_THREADS_FALSE USE_LIBGCJ_BC_TRUE USE_LIBGCJ_BC_FALSE LIBGCJ_SPEC HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE LIBICONV LTLIBICONV PKG_CONFIG GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS LIBART_CFLAGS LIBART_LIBS CLASSPATH_SEPARATOR ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC BACKTRACESPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE ENABLE_SHARED_TRUE ENABLE_SHARED_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE INSTALL_BINARIES_TRUE INSTALL_BINARIES_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir GCJVERSION dbexecdir gcjsubdir gxx_include_dir libstdcxx_incdir PERL SYSDEP_SOURCES ANONVERSCRIPT_TRUE ANONVERSCRIPT_FALSE LD_START_STATIC_SPEC LD_FINISH_STATIC_SPEC here python_mod_dir python_mod_dir_expanded MAKE INSTALL_AOT_RPM_TRUE INSTALL_AOT_RPM_FALSE CREATE_JAVA_HOME_TRUE CREATE_JAVA_HOME_FALSE gcc_suffix JAVA_VERSION BUILD_VERSION JVM_ROOT_DIR JVM_JAR_ROOT_DIR JVM_JAR_DIR JRE_DIR JRE_LNK SDK_LNK SDK_BIN_DIR SDK_LIB_DIR SDK_INCLUDE_DIR JRE_BIN_DIR JRE_LIB_DIR GCJ_BIN_DIR CPU OS LIBDIR LIBOBJS LTLIBOBJS'
ac_subst_files=''
ac_pwd=`pwd`
@@ -28198,8 +28198,7 @@
echo "$as_me:$LINENO: result: Java version: ${JAVA_VERSION}" >&5
echo "${ECHO_T}Java version: ${JAVA_VERSION}" >&6
- jre_dir=java-${JAVA_VERSION}-${origin_name}-${JAVA_VERSION}.${BUILD_VERSION}${arch_suffix}/jre
- sdk_dir=java-${JAVA_VERSION}-${origin_name}-${JAVA_VERSION}.${BUILD_VERSION}${arch_suffix}
+ jre_dir=jre
jre_lnk=jre-${JAVA_VERSION}-${origin_name}
sdk_lnk=java-${JAVA_VERSION}-${origin_name}
@@ -28213,7 +28212,7 @@
echo "$as_me:$LINENO: result: JVM JAR ROOT directory: ${JVM_JAR_ROOT_DIR}" >&5
echo "${ECHO_T}JVM JAR ROOT directory: ${JVM_JAR_ROOT_DIR}" >&6
- JVM_JAR_DIR=${jvm_jar_dir}/${sdk_dir}
+ JVM_JAR_DIR=${jvm_jar_dir}
echo "$as_me:$LINENO: result: JVM JAR directory: ${JVM_JAR_DIR}" >&5
echo "${ECHO_T}JVM JAR directory: ${JVM_JAR_DIR}" >&6
@@ -28221,26 +28220,23 @@
JRE_DIR=${jre_dir}
- SDK_DIR=${sdk_dir}
-
-
JRE_LNK=${jre_lnk}
SDK_LNK=${sdk_lnk}
- SDK_BIN_DIR=${jvm_root_dir}/${sdk_dir}/bin
+ SDK_BIN_DIR=${jvm_root_dir}/bin
echo "$as_me:$LINENO: result: SDK tools directory: ${SDK_BIN_DIR}" >&5
echo "${ECHO_T}SDK tools directory: ${SDK_BIN_DIR}" >&6
- SDK_LIB_DIR=${jvm_root_dir}/${sdk_dir}/lib
+ SDK_LIB_DIR=${jvm_root_dir}/lib
echo "$as_me:$LINENO: result: SDK jar directory: ${SDK_LIB_DIR}" >&5
echo "${ECHO_T}SDK jar directory: ${SDK_LIB_DIR}" >&6
- SDK_INCLUDE_DIR=${jvm_root_dir}/${sdk_dir}/include
+ SDK_INCLUDE_DIR=${jvm_root_dir}/include
echo "$as_me:$LINENO: result: SDK include directory: ${SDK_INCLUDE_DIR}" >&5
echo "${ECHO_T}SDK include directory: ${SDK_INCLUDE_DIR}" >&6
@@ -28266,7 +28262,8 @@
echo "$as_me:$LINENO: result: GCJ tools directory: ${GCJ_BIN_DIR}" >&5
echo "${ECHO_T}GCJ tools directory: ${GCJ_BIN_DIR}" >&6
- echo host is ${host}
+ echo "$as_me:$LINENO: result: host is ${host}" >&5
+echo "${ECHO_T}host is ${host}" >&6
if test "x${host_cpu}" = "x"
then
case ${host} in
@@ -28274,6 +28271,8 @@
host_cpu=x86;;
i486-* | i586-* | i686-*)
host_cpu=i386;;
+ x86_64-*)
+ host_cpu=amd64;;
*)
host_cpu=${host_cpu};;
esac
@@ -29925,7 +29924,6 @@
s,@JVM_JAR_ROOT_DIR@,$JVM_JAR_ROOT_DIR,;t t
s,@JVM_JAR_DIR@,$JVM_JAR_DIR,;t t
s,@JRE_DIR@,$JRE_DIR,;t t
-s,@SDK_DIR@,$SDK_DIR,;t t
s,@JRE_LNK@,$JRE_LNK,;t t
s,@SDK_LNK@,$SDK_LNK,;t t
s,@SDK_BIN_DIR@,$SDK_BIN_DIR,;t t
Index: libjava/gcj/Makefile.in
===================================================================
--- libjava/gcj/Makefile.in (revision 144570)
+++ libjava/gcj/Makefile.in (working copy)
@@ -241,7 +241,6 @@
PLATFORM = @PLATFORM@
RANLIB = @RANLIB@
SDK_BIN_DIR = @SDK_BIN_DIR@
-SDK_DIR = @SDK_DIR@
SDK_INCLUDE_DIR = @SDK_INCLUDE_DIR@
SDK_LIB_DIR = @SDK_LIB_DIR@
SDK_LNK = @SDK_LNK@
Index: libjava/Makefile.am
===================================================================
--- libjava/Makefile.am (revision 144570)
+++ libjava/Makefile.am (working copy)
@@ -586,7 +586,6 @@
$(DESTDIR)$(SDK_BIN_DIR)/rmic; \
ln -sf $$RELATIVE/`echo gjavah | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
$(DESTDIR)$(SDK_BIN_DIR)/javah; \
- ln -sf $$RELATIVE/ecj $(DESTDIR)$(SDK_BIN_DIR)/javac; \
ln -sf $$RELATIVE/`echo gappletviewer | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
$(DESTDIR)$(SDK_BIN_DIR)/appletviewer; \
ln -sf $$RELATIVE/`echo gjarsigner | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
@@ -684,9 +683,7 @@
$(DESTDIR)$(SDK_INCLUDE_DIR)/linux/$$headername.h; \
done; \
RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
- $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)); \
- ln -sf $$RELATIVE/src-$(gcc_version).zip \
- $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)/src.zip;
+ $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR));
endif
## ################################################################
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: feedback on --enable-java-home
2009-03-03 9:55 ` Andrew John Hughes
@ 2009-03-03 10:57 ` Andrew Haley
2009-03-03 11:04 ` Andrew John Hughes
0 siblings, 1 reply; 11+ messages in thread
From: Andrew Haley @ 2009-03-03 10:57 UTC (permalink / raw)
To: Andrew John Hughes; +Cc: Matthias Klose, Java Patch List
Andrew John Hughes wrote:
> 2009-03-03 Andrew John Hughes <ahughes@redhat.com>
>
> * Makefile.am:
> Remove dangling src.zip and javac symlinks.
> * Makefile.in,
> * configure: Regenerated.
> * configure.ac: Drop hard-coded prefix,
> thus removing sdk_dir and making jre_dir="jre".
> Map x86_64 to amd64 as used by OpenJDK.
> * gcj/Makefile.in,
> * include/Makefile.in,
> * testsuite/Makefile.in: Regenerated.
>
>
> Ok for trunk?
I'm having difficulty with this since there seem to be a bunch
of autogenerated files mixed in. Can you please resubmit for
the list?
Thanks,
Andrew.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: feedback on --enable-java-home
2009-03-03 10:57 ` Andrew Haley
@ 2009-03-03 11:04 ` Andrew John Hughes
2009-03-03 14:29 ` Andrew John Hughes
0 siblings, 1 reply; 11+ messages in thread
From: Andrew John Hughes @ 2009-03-03 11:04 UTC (permalink / raw)
To: Andrew Haley; +Cc: Matthias Klose, Java Patch List
[-- Attachment #1: Type: text/plain, Size: 1171 bytes --]
2009/3/3 Andrew Haley <aph@redhat.com>:
> Andrew John Hughes wrote:
>
>> 2009-03-03 Andrew John Hughes <ahughes@redhat.com>
>>
>> * Makefile.am:
>> Remove dangling src.zip and javac symlinks.
>> * Makefile.in,
>> * configure: Regenerated.
>> * configure.ac: Drop hard-coded prefix,
>> thus removing sdk_dir and making jre_dir="jre".
>> Map x86_64 to amd64 as used by OpenJDK.
>> * gcj/Makefile.in,
>> * include/Makefile.in,
>> * testsuite/Makefile.in: Regenerated.
>>
>>
>> Ok for trunk?
>
> I'm having difficulty with this since there seem to be a bunch
> of autogenerated files mixed in. Can you please resubmit for
> the list?
>
> Thanks,
> Andrew.
>
>
The diff for just configure.ac and Makefile.am is attached.
--
Andrew :-)
Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)
Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
[-- Attachment #2: java_home-short.diff --]
[-- Type: text/plain, Size: 2992 bytes --]
Index: libjava/configure.ac
===================================================================
--- libjava/configure.ac (revision 144570)
+++ libjava/configure.ac (working copy)
@@ -1809,8 +1809,7 @@
AC_SUBST(BUILD_VERSION)
AC_MSG_RESULT(Java version: ${JAVA_VERSION})
- jre_dir=java-${JAVA_VERSION}-${origin_name}-${JAVA_VERSION}.${BUILD_VERSION}${arch_suffix}/jre
- sdk_dir=java-${JAVA_VERSION}-${origin_name}-${JAVA_VERSION}.${BUILD_VERSION}${arch_suffix}
+ jre_dir=jre
jre_lnk=jre-${JAVA_VERSION}-${origin_name}
sdk_lnk=java-${JAVA_VERSION}-${origin_name}
@@ -1822,31 +1821,28 @@
AC_SUBST(JVM_JAR_ROOT_DIR)
AC_MSG_RESULT(JVM JAR ROOT directory: ${JVM_JAR_ROOT_DIR})
- JVM_JAR_DIR=${jvm_jar_dir}/${sdk_dir}
+ JVM_JAR_DIR=${jvm_jar_dir}
AC_SUBST(JVM_JAR_DIR)
AC_MSG_RESULT(JVM JAR directory: ${JVM_JAR_DIR})
JRE_DIR=${jre_dir}
AC_SUBST(JRE_DIR)
- SDK_DIR=${sdk_dir}
- AC_SUBST(SDK_DIR)
-
JRE_LNK=${jre_lnk}
AC_SUBST(JRE_LNK)
SDK_LNK=${sdk_lnk}
AC_SUBST(SDK_LNK)
- SDK_BIN_DIR=${jvm_root_dir}/${sdk_dir}/bin
+ SDK_BIN_DIR=${jvm_root_dir}/bin
AC_SUBST(SDK_BIN_DIR)
AC_MSG_RESULT(SDK tools directory: ${SDK_BIN_DIR})
- SDK_LIB_DIR=${jvm_root_dir}/${sdk_dir}/lib
+ SDK_LIB_DIR=${jvm_root_dir}/lib
AC_SUBST(SDK_LIB_DIR)
AC_MSG_RESULT(SDK jar directory: ${SDK_LIB_DIR})
- SDK_INCLUDE_DIR=${jvm_root_dir}/${sdk_dir}/include
+ SDK_INCLUDE_DIR=${jvm_root_dir}/include
AC_SUBST(SDK_INCLUDE_DIR)
AC_MSG_RESULT(SDK include directory: ${SDK_INCLUDE_DIR})
@@ -1868,7 +1864,7 @@
AC_SUBST(GCJ_BIN_DIR)
AC_MSG_RESULT(GCJ tools directory: ${GCJ_BIN_DIR})
- echo host is ${host}
+ AC_MSG_RESULT(host is ${host})
if test "x${host_cpu}" = "x"
then
case ${host} in
@@ -1876,6 +1872,8 @@
host_cpu=x86;;
i486-* | i586-* | i686-*)
host_cpu=i386;;
+ x86_64-*)
+ host_cpu=amd64;;
*)
host_cpu=${host_cpu};;
esac
Index: libjava/Makefile.am
===================================================================
--- libjava/Makefile.am (revision 144570)
+++ libjava/Makefile.am (working copy)
@@ -586,7 +586,6 @@
$(DESTDIR)$(SDK_BIN_DIR)/rmic; \
ln -sf $$RELATIVE/`echo gjavah | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
$(DESTDIR)$(SDK_BIN_DIR)/javah; \
- ln -sf $$RELATIVE/ecj $(DESTDIR)$(SDK_BIN_DIR)/javac; \
ln -sf $$RELATIVE/`echo gappletviewer | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
$(DESTDIR)$(SDK_BIN_DIR)/appletviewer; \
ln -sf $$RELATIVE/`echo gjarsigner | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
@@ -684,9 +683,7 @@
$(DESTDIR)$(SDK_INCLUDE_DIR)/linux/$$headername.h; \
done; \
RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
- $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)); \
- ln -sf $$RELATIVE/src-$(gcc_version).zip \
- $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)/src.zip;
+ $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR));
endif
## ################################################################
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: feedback on --enable-java-home
2009-03-03 11:04 ` Andrew John Hughes
@ 2009-03-03 14:29 ` Andrew John Hughes
2009-03-03 15:06 ` Andrew Haley
0 siblings, 1 reply; 11+ messages in thread
From: Andrew John Hughes @ 2009-03-03 14:29 UTC (permalink / raw)
To: Andrew Haley; +Cc: Matthias Klose, Java Patch List
[-- Attachment #1: Type: text/plain, Size: 1696 bytes --]
2009/3/3 Andrew John Hughes <gnu_andrew@member.fsf.org>:
> 2009/3/3 Andrew Haley <aph@redhat.com>:
>> Andrew John Hughes wrote:
>>
>>> 2009-03-03 Andrew John Hughes <ahughes@redhat.com>
>>>
>>> * Makefile.am:
>>> Remove dangling src.zip and javac symlinks.
>>> * Makefile.in,
>>> * configure: Regenerated.
>>> * configure.ac: Drop hard-coded prefix,
>>> thus removing sdk_dir and making jre_dir="jre".
>>> Map x86_64 to amd64 as used by OpenJDK.
>>> * gcj/Makefile.in,
>>> * include/Makefile.in,
>>> * testsuite/Makefile.in: Regenerated.
>>>
>>>
>>> Ok for trunk?
>>
>> I'm having difficulty with this since there seem to be a bunch
>> of autogenerated files mixed in. Can you please resubmit for
>> the list?
>>
>> Thanks,
>> Andrew.
>>
>>
>
> The diff for just configure.ac and Makefile.am is attached.
> --
> Andrew :-)
>
> Free Java Software Engineer
> Red Hat, Inc. (http://www.redhat.com)
>
> Support Free Java!
> Contribute to GNU Classpath and the OpenJDK
> http://www.gnu.org/software/classpath
> http://openjdk.java.net
>
> PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
> Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
>
New version attached with the additional change to the java.security symlink.
--
Andrew :-)
Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)
Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
[-- Attachment #2: java_home-short.diff --]
[-- Type: text/plain, Size: 3360 bytes --]
Index: libjava/configure.ac
===================================================================
--- libjava/configure.ac (revision 144571)
+++ libjava/configure.ac (working copy)
@@ -1809,8 +1809,7 @@
AC_SUBST(BUILD_VERSION)
AC_MSG_RESULT(Java version: ${JAVA_VERSION})
- jre_dir=java-${JAVA_VERSION}-${origin_name}-${JAVA_VERSION}.${BUILD_VERSION}${arch_suffix}/jre
- sdk_dir=java-${JAVA_VERSION}-${origin_name}-${JAVA_VERSION}.${BUILD_VERSION}${arch_suffix}
+ jre_dir=jre
jre_lnk=jre-${JAVA_VERSION}-${origin_name}
sdk_lnk=java-${JAVA_VERSION}-${origin_name}
@@ -1822,31 +1821,28 @@
AC_SUBST(JVM_JAR_ROOT_DIR)
AC_MSG_RESULT(JVM JAR ROOT directory: ${JVM_JAR_ROOT_DIR})
- JVM_JAR_DIR=${jvm_jar_dir}/${sdk_dir}
+ JVM_JAR_DIR=${jvm_jar_dir}
AC_SUBST(JVM_JAR_DIR)
AC_MSG_RESULT(JVM JAR directory: ${JVM_JAR_DIR})
JRE_DIR=${jre_dir}
AC_SUBST(JRE_DIR)
- SDK_DIR=${sdk_dir}
- AC_SUBST(SDK_DIR)
-
JRE_LNK=${jre_lnk}
AC_SUBST(JRE_LNK)
SDK_LNK=${sdk_lnk}
AC_SUBST(SDK_LNK)
- SDK_BIN_DIR=${jvm_root_dir}/${sdk_dir}/bin
+ SDK_BIN_DIR=${jvm_root_dir}/bin
AC_SUBST(SDK_BIN_DIR)
AC_MSG_RESULT(SDK tools directory: ${SDK_BIN_DIR})
- SDK_LIB_DIR=${jvm_root_dir}/${sdk_dir}/lib
+ SDK_LIB_DIR=${jvm_root_dir}/lib
AC_SUBST(SDK_LIB_DIR)
AC_MSG_RESULT(SDK jar directory: ${SDK_LIB_DIR})
- SDK_INCLUDE_DIR=${jvm_root_dir}/${sdk_dir}/include
+ SDK_INCLUDE_DIR=${jvm_root_dir}/include
AC_SUBST(SDK_INCLUDE_DIR)
AC_MSG_RESULT(SDK include directory: ${SDK_INCLUDE_DIR})
@@ -1868,7 +1864,7 @@
AC_SUBST(GCJ_BIN_DIR)
AC_MSG_RESULT(GCJ tools directory: ${GCJ_BIN_DIR})
- echo host is ${host}
+ AC_MSG_RESULT(host is ${host})
if test "x${host_cpu}" = "x"
then
case ${host} in
@@ -1876,6 +1872,8 @@
host_cpu=x86;;
i486-* | i586-* | i686-*)
host_cpu=i386;;
+ x86_64-*)
+ host_cpu=amd64;;
*)
host_cpu=${host_cpu};;
esac
Index: libjava/Makefile.am
===================================================================
--- libjava/Makefile.am (revision 144571)
+++ libjava/Makefile.am (working copy)
@@ -586,7 +586,6 @@
$(DESTDIR)$(SDK_BIN_DIR)/rmic; \
ln -sf $$RELATIVE/`echo gjavah | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
$(DESTDIR)$(SDK_BIN_DIR)/javah; \
- ln -sf $$RELATIVE/ecj $(DESTDIR)$(SDK_BIN_DIR)/javac; \
ln -sf $$RELATIVE/`echo gappletviewer | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
$(DESTDIR)$(SDK_BIN_DIR)/appletviewer; \
ln -sf $$RELATIVE/`echo gjarsigner | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
@@ -638,7 +637,7 @@
done; \
cd $$working_dir; \
$(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/security; \
- RELATIVE=$$(relative $(DESTDIR)$(libdir)/security \
+ RELATIVE=$$(relative $(DESTDIR)$(toolexeclibdir)/security \
$(DESTDIR)$(JRE_LIB_DIR)/security); \
cd $(DESTDIR)$(JRE_LIB_DIR)/security; \
ln -sf $$RELATIVE/classpath.security java.security; \
@@ -684,9 +683,7 @@
$(DESTDIR)$(SDK_INCLUDE_DIR)/linux/$$headername.h; \
done; \
RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
- $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)); \
- ln -sf $$RELATIVE/src-$(gcc_version).zip \
- $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)/src.zip;
+ $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR));
endif
## ################################################################
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: feedback on --enable-java-home
2009-03-03 14:29 ` Andrew John Hughes
@ 2009-03-03 15:06 ` Andrew Haley
2009-03-03 17:05 ` Andrew John Hughes
0 siblings, 1 reply; 11+ messages in thread
From: Andrew Haley @ 2009-03-03 15:06 UTC (permalink / raw)
To: Andrew John Hughes; +Cc: Matthias Klose, Java Patch List
Andrew John Hughes wrote:
> 2009/3/3 Andrew John Hughes <gnu_andrew@member.fsf.org>:
>> 2009/3/3 Andrew Haley <aph@redhat.com>:
>>> Andrew John Hughes wrote:
>>>
>>>> 2009-03-03 Andrew John Hughes <ahughes@redhat.com>
>>>>
>>>> * Makefile.am:
>>>> Remove dangling src.zip and javac symlinks.
>>>> * Makefile.in,
>>>> * configure: Regenerated.
>>>> * configure.ac: Drop hard-coded prefix,
>>>> thus removing sdk_dir and making jre_dir="jre".
>>>> Map x86_64 to amd64 as used by OpenJDK.
>>>> * gcj/Makefile.in,
>>>> * include/Makefile.in,
>>>> * testsuite/Makefile.in: Regenerated.
> New version attached with the additional change to the java.security symlink.
OK with a suitably changed ChangeLog.
I hope that this is the last change before we release.
Thanks,
Andrew.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: feedback on --enable-java-home
2009-03-03 15:06 ` Andrew Haley
@ 2009-03-03 17:05 ` Andrew John Hughes
0 siblings, 0 replies; 11+ messages in thread
From: Andrew John Hughes @ 2009-03-03 17:05 UTC (permalink / raw)
To: Andrew Haley; +Cc: Matthias Klose, Java Patch List
2009/3/3 Andrew Haley <aph@redhat.com>:
> Andrew John Hughes wrote:
>> 2009/3/3 Andrew John Hughes <gnu_andrew@member.fsf.org>:
>>> 2009/3/3 Andrew Haley <aph@redhat.com>:
>>>> Andrew John Hughes wrote:
>>>>
>>>>> 2009-03-03 Andrew John Hughes <ahughes@redhat.com>
>>>>>
>>>>> * Makefile.am:
>>>>> Remove dangling src.zip and javac symlinks.
>>>>> * Makefile.in,
>>>>> * configure: Regenerated.
>>>>> * configure.ac: Drop hard-coded prefix,
>>>>> thus removing sdk_dir and making jre_dir="jre".
>>>>> Map x86_64 to amd64 as used by OpenJDK.
>>>>> * gcj/Makefile.in,
>>>>> * include/Makefile.in,
>>>>> * testsuite/Makefile.in: Regenerated.
>
>> New version attached with the additional change to the java.security symlink.
>
> OK with a suitably changed ChangeLog.
>
Committed as:
2009-03-03 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
Remove dangling src.zip and javac symlinks.
Fix java.security symlink to use toolexeclibdir
as classpath/resource/Makefile.am does.
* Makefile.in,
* configure: Regenerated.
* configure.ac: Drop hard-coded prefix,
thus removing sdk_dir and making jre_dir="jre".
Map x86_64 to amd64 as used by OpenJDK.
* gcj/Makefile.in,
* include/Makefile.in,
* testsuite/Makefile.in: Regenerated.
> I hope that this is the last change before we release.
>
It is from me.
> Thanks,
> Andrew.
>
Thanks,
--
Andrew :-)
Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)
Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2009-03-03 17:05 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <18692.17172.411022.614084@gargle.gargle.HOWL>
2008-10-31 17:13 ` feedback on --enable-java-home Andrew Haley
2008-10-31 21:25 ` Andrew John Hughes
2008-11-01 10:38 ` Andrew Haley
2008-11-02 0:58 ` Andrew John Hughes
2009-02-13 15:26 ` Andrew Haley
2009-03-03 9:55 ` Andrew John Hughes
2009-03-03 10:57 ` Andrew Haley
2009-03-03 11:04 ` Andrew John Hughes
2009-03-03 14:29 ` Andrew John Hughes
2009-03-03 15:06 ` Andrew Haley
2009-03-03 17:05 ` Andrew John Hughes
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).