[Fedora-devel-java-list] More java-gcj-compat hacks

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hey Tom,

	The jogl build process expects to find $JAVA_HOME/lib/i386.   To be
honest, I'm not exactly sure why this is.  In any case, it probably
can't hurt to create this dir.  See attached patch.

AG

2005-02-13  Anthony Green  <green@xxxxxxxxxx>

	* configure.ac: Set the cpu so it will match the os.arch property.
	* Makefile.am (install-data-local): Create the architecture
	dependent library directory.


Index: configure.ac
===================================================================
RCS file: /cvs/rhug/java-gcj-compat/configure.ac,v
retrieving revision 1.18
diff -u -p -r1.18 configure.ac
--- configure.ac	9 Feb 2005 18:13:32 -0000	1.18
+++ configure.ac	14 Feb 2005 02:22:04 -0000
@@ -4,6 +4,7 @@ AC_PREREQ(2.59)
 AC_INIT(java-gcj-compat, 1.0.14, fitzsim@xxxxxxxxxx)
 AM_INIT_AUTOMAKE(1.9.2)
 AC_CONFIG_SRCDIR(com/sun/tools/javac/Main.java)
+AC_CANONICAL_HOST
 
 if test "x${prefix}" = "xNONE"
 then
@@ -93,6 +94,17 @@ JAVA_EXT_DIRS=${gcj_prefix}/lib/java-ext
 AC_SUBST(JAVA_EXT_DIRS)
 AC_MSG_RESULT(extensions directories: ${JAVA_EXT_DIRS})
 
+echo host is ${host}
+case ${host} in
+  *-mingw* | *-cygwin*) 
+    host_cpu=x86;;
+  i486-* | i586-* | i686-*) 
+    host_cpu=i386;;
+  *) ;;
+esac
+CPU=${host_cpu}
+AC_SUBST(CPU)
+
 AC_CONFIG_FILES(jar)
 AC_CONFIG_FILES(javac)
 AC_CONFIG_FILES(javadoc)
Index: Makefile.am
===================================================================
RCS file: /cvs/rhug/java-gcj-compat/Makefile.am,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile.am
--- Makefile.am	1 Feb 2005 20:53:05 -0000	1.9
+++ Makefile.am	14 Feb 2005 02:22:04 -0000
@@ -29,6 +29,7 @@ install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(JRE_BIN_DIR)
 	cp $(DESTDIR)$(SDK_BIN_DIR)/java $(DESTDIR)$(JRE_BIN_DIR)/java
 	cp $(DESTDIR)$(SDK_BIN_DIR)/rmiregistry $(DESTDIR)$(JRE_BIN_DIR)/rmiregistry
+	$(mkdir_p) $(DESTDIR)$(JAVA_HOME_DIR)/lib/@CPU@
 if INSTALL_SYMLINKS
 	$(mkinstalldirs) $(DESTDIR)$(prefix)/bin
 	ln -sf $(SDK_BIN_DIR)/jar $(DESTDIR)$(prefix)/bin/jar

[Index of Archives]     [Red Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]

  Powered by Linux