From e8c76b35182a24385949e28c76c56db0d86bb7b0 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 1 Apr 2011 16:40:24 +0200
Subject: add a java build tool directory

following build tools seem to be required to cross-compile
OpenJDK:
 - fastjar
 - classpath
 - gcj
 - jamvm
 - ecj

Maybe cacao is better, maybe ant is required, too.
... hacking...
---
 jtools/Makefile           | 29 +++++++++++++++++++++++++++++
 jtools/cacao/Makefile     | 35 +++++++++++++++++++++++++++++++++++
 jtools/classpath/Makefile | 36 ++++++++++++++++++++++++++++++++++++
 jtools/ecj/Makefile       | 21 +++++++++++++++++++++
 jtools/fastjar/Makefile   | 27 +++++++++++++++++++++++++++
 jtools/gcj/Makefile       | 41 +++++++++++++++++++++++++++++++++++++++++
 jtools/jamvm/Makefile     | 27 +++++++++++++++++++++++++++
 jtools/rules.mk           |  7 +++++++
 8 files changed, 223 insertions(+)
 create mode 100644 jtools/Makefile
 create mode 100644 jtools/cacao/Makefile
 create mode 100644 jtools/classpath/Makefile
 create mode 100644 jtools/ecj/Makefile
 create mode 100644 jtools/fastjar/Makefile
 create mode 100644 jtools/gcj/Makefile
 create mode 100644 jtools/jamvm/Makefile
 create mode 100644 jtools/rules.mk

(limited to 'jtools')

diff --git a/jtools/Makefile b/jtools/Makefile
new file mode 100644
index 000000000..932cd298f
--- /dev/null
+++ b/jtools/Makefile
@@ -0,0 +1,29 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+TARGETS:=
+ifneq ($(ADK_PACKAGE_OPENJDK),)
+TARGETS+=fastjar gcj classpath jamvm ecj
+endif
+
+TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS))
+TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
+
+all: install
+compile:
+install: $(TARGETS_INSTALL)
+clean: $(TARGETS_CLEAN)
+
+%-compile: $(TOOLS_BUILD_DIR)
+	$(TRACE) "jtools/$(patsubst %-compile,%,$@)/compile "
+	$(MAKE) -C $(patsubst %-compile,%,$@) compile
+
+%-install:
+	$(TRACE) "jtools/$(patsubst %-install,%,$@)/install "
+	$(MAKE) -C $(patsubst %-install,%,$@) install
+
+%-clean:
+	$(TRACE) "jtools/$(patsubst %-clean,%,$@)/clean "
+	$(MAKE) -C $(patsubst %-clean,%,$@) clean
diff --git a/jtools/cacao/Makefile b/jtools/cacao/Makefile
new file mode 100644
index 000000000..6d4b76d1f
--- /dev/null
+++ b/jtools/cacao/Makefile
@@ -0,0 +1,35 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		cacao
+PKG_VERSION:=		0.99.4
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		63220327925ace13756ae334c55a3baa
+PKG_SITES:=		http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.99.4/
+
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+
+include ../rules.mk
+
+install: ${STAGING_HOST_DIR}/usr/bin/cacao
+
+$(WRKBUILD)/.configured: ${WRKDIST}/.prepared
+	(cd $(WRKBUILD); ./configure --prefix=/usr --disable-libjvm --enable-debug \
+		--with-vm-zip=$(STAGING_HOST_DIR)/usr/share/cacao/vm.zip \
+		--with-java-runtime-library=gnuclasspath \
+		--with-java-runtime-library-classes=$(STAGING_HOST_DIR)/usr/share/classpath/glibj.zip \
+		--with-java-runtime-library-prefix=$(STAGING_HOST_DIR)/usr \
+		--with-jni_md_h=$(STAGING_HOST_DIR)/usr/include \
+	);
+	touch $@
+
+$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
+	${MAKE} -C ${WRKBUILD} $(MAKE_TRACE)
+	touch $@
+
+${STAGING_HOST_DIR}/usr/bin/cacao: $(WRKBUILD)/.compiled
+	${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_HOST_DIR) install $(MAKE_TRACE)
+
+include $(TOPDIR)/mk/tools.mk
diff --git a/jtools/classpath/Makefile b/jtools/classpath/Makefile
new file mode 100644
index 000000000..059790565
--- /dev/null
+++ b/jtools/classpath/Makefile
@@ -0,0 +1,36 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		classpath
+PKG_VERSION:=		0.98
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		90c6571b8b0309e372faa0f9f6255ea9
+PKG_SITES:=		${MASTER_SITE_GNU:=classpath/}
+
+include ../rules.mk
+
+install: ${STAGING_JAVA_HOST_DIR}/usr/share/classpath/glibj.zip
+
+$(WRKBUILD)/.configured: ${WRKDIST}/.prepared
+	(cd $(WRKBUILD); ./configure --prefix=/usr \
+		--disable-local-sockets \
+		--disable-alsa \
+		--disable-gconf-peer \
+		--disable-gtk-peer \
+		--disable-qt-peer \
+		--disable-dssi \
+		--disable-plugin \
+		--disable-examples \
+		--disable-Werror)
+	touch $@
+
+$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
+	${MAKE} -C ${WRKBUILD}
+	touch $@
+
+${STAGING_JAVA_HOST_DIR}/usr/share/classpath/glibj.zip: $(WRKBUILD)/.compiled
+	${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install
+
+include $(TOPDIR)/mk/tools.mk
diff --git a/jtools/ecj/Makefile b/jtools/ecj/Makefile
new file mode 100644
index 000000000..504c97350
--- /dev/null
+++ b/jtools/ecj/Makefile
@@ -0,0 +1,21 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		ecj
+PKG_VERSION:=		1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		63220327925ace13756ae334c55a3baa
+
+include ../rules.mk
+
+install: ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj
+
+${STAGING_JAVA_HOST_DIR}/usr/bin/ecj:
+	$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj -g -static -O2 -m64 -Wl,-Bsymbolic -findirect-dispatch \
+		-o ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj --main=org.eclipse.jdt.internal.compiler.batch.Main \
+		$(TOPDIR)/jtools_build/gcc-4.5.2/ecj.jar
+	$(CP) $(TOPDIR)/jtools_build/gcc-4.5.2/ecj.jar ${STAGING_JAVA_HOST_DIR}/usr/share/ecj.jar
+
+include $(TOPDIR)/mk/tools.mk
diff --git a/jtools/fastjar/Makefile b/jtools/fastjar/Makefile
new file mode 100644
index 000000000..744776eac
--- /dev/null
+++ b/jtools/fastjar/Makefile
@@ -0,0 +1,27 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		fastjar
+PKG_VERSION:=		0.94
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		14d4bdfac236e347d806c6743dba48c6
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=fastjar/}
+
+include ../rules.mk
+
+install: ${STAGING_JAVA_HOST_DIR}/usr/bin/fastjar
+
+$(WRKBUILD)/.configured: ${WRKDIST}/.prepared
+	(cd $(WRKBUILD); ./configure --prefix=/usr);
+	touch $@
+
+$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
+	${MAKE} -C ${WRKBUILD} $(MAKE_TRACE)
+	touch $@
+
+${STAGING_JAVA_HOST_DIR}/usr/bin/fastjar: $(WRKBUILD)/.compiled
+	${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE)
+
+include $(TOPDIR)/mk/tools.mk
diff --git a/jtools/gcj/Makefile b/jtools/gcj/Makefile
new file mode 100644
index 000000000..ba31c27ea
--- /dev/null
+++ b/jtools/gcj/Makefile
@@ -0,0 +1,41 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		gcj
+PKG_VERSION:=		4.5.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		d6559145853fbaaa0fd7556ed93bce9a
+PKG_SITES:=		${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/}
+DISTFILES:=		gcc-$(PKG_VERSION).tar.bz2
+
+WRKDIST=		${WRKDIR}/gcc-${PKG_VERSION}
+
+include ../rules.mk
+
+install: ${STAGING_JAVA_HOST_DIR}/usr/bin/gcj
+
+$(WRKBUILD)/.configured: ${WRKDIST}/.prepared
+	(cd $(WRKBUILD); \
+		wget -O ecj.jar ftp://sourceware.org/pub/java/ecj-latest.jar; \
+		./configure --prefix=/usr --enable-java-home --enable-languages=java --with-ffi \
+			--with-mpc=$(STAGING_HOST_DIR) --with-mpfr=$(STAGING_HOST_DIR) \
+			--with-gmp=$(STAGING_HOST_DIR) \
+			--disable-libmudflap \
+                        --disable-libgomp \
+                        --disable-biarch \
+                        --disable-decimal-float \
+                        --disable-multilib \
+	);
+	touch $@
+
+$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
+	${MAKE} -C ${WRKBUILD} $(MAKE_TRACE)
+	touch $@
+
+${STAGING_JAVA_HOST_DIR}/usr/bin/gcj: $(WRKBUILD)/.compiled
+	$(INSTALL_DIR) ${STAGING_JAVA_HOST_DIR}
+	${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE)
+
+include $(TOPDIR)/mk/tools.mk
diff --git a/jtools/jamvm/Makefile b/jtools/jamvm/Makefile
new file mode 100644
index 000000000..f02450fb0
--- /dev/null
+++ b/jtools/jamvm/Makefile
@@ -0,0 +1,27 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		jamvm
+PKG_VERSION:=		1.5.4
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		63220327925ace13756ae334c55a3baa
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=jamvm/}
+
+include ../rules.mk
+
+install: ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm
+
+$(WRKBUILD)/.configured: ${WRKDIST}/.prepared
+	(cd $(WRKBUILD); ./configure --prefix=/usr --with-classpath-install-dir=$(STAGING_JAVA_HOST_DIR) );
+	touch $@
+
+$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
+	${MAKE} -C ${WRKBUILD} $(MAKE_TRACE)
+	touch $@
+
+${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm: $(WRKBUILD)/.compiled
+	${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE)
+
+include $(TOPDIR)/mk/tools.mk
diff --git a/jtools/rules.mk b/jtools/rules.mk
new file mode 100644
index 000000000..7b1d8e866
--- /dev/null
+++ b/jtools/rules.mk
@@ -0,0 +1,7 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+WRKDIR_BASE=    ${JTOOLS_BUILD_DIR}
+WRKDIR=		${WRKDIR_BASE}
+
+include ${TOPDIR}/mk/buildhlp.mk
-- 
cgit v1.2.3


From 828b812f7e09b018a6c5e2e4045029e1676c1867 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 1 Apr 2011 22:15:57 +0200
Subject: now icedtea starts with compile....

---
 jtools/classpath/Makefile                          |   4 +-
 jtools/ecj/Makefile                                |   4 +-
 package/openjdk/Makefile                           |   3 +-
 .../openjdk/patches/patch-icedtea6-1_10_configure  | 171 ++++++++++++++++++++-
 4 files changed, 170 insertions(+), 12 deletions(-)

(limited to 'jtools')

diff --git a/jtools/classpath/Makefile b/jtools/classpath/Makefile
index 059790565..253f9604d 100644
--- a/jtools/classpath/Makefile
+++ b/jtools/classpath/Makefile
@@ -14,7 +14,7 @@ include ../rules.mk
 install: ${STAGING_JAVA_HOST_DIR}/usr/share/classpath/glibj.zip
 
 $(WRKBUILD)/.configured: ${WRKDIST}/.prepared
-	(cd $(WRKBUILD); ./configure --prefix=/usr \
+	(cd $(WRKBUILD); ./configure --prefix=${STAGING_JAVA_HOST_DIR}/usr \
 		--disable-local-sockets \
 		--disable-alsa \
 		--disable-gconf-peer \
@@ -31,6 +31,6 @@ $(WRKBUILD)/.compiled: ${WRKDIST}/.configured
 	touch $@
 
 ${STAGING_JAVA_HOST_DIR}/usr/share/classpath/glibj.zip: $(WRKBUILD)/.compiled
-	${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install
+	${MAKE} -C ${WRKBUILD} install
 
 include $(TOPDIR)/mk/tools.mk
diff --git a/jtools/ecj/Makefile b/jtools/ecj/Makefile
index 504c97350..ffa6cd43e 100644
--- a/jtools/ecj/Makefile
+++ b/jtools/ecj/Makefile
@@ -13,7 +13,9 @@ include ../rules.mk
 install: ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj
 
 ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj:
-	$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj -g -static -O2 -m64 -Wl,-Bsymbolic -findirect-dispatch \
+	env LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib64 \
+	PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$$PATH \
+	$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj -g -O2 -Wl,-Bsymbolic -findirect-dispatch \
 		-o ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj --main=org.eclipse.jdt.internal.compiler.batch.Main \
 		$(TOPDIR)/jtools_build/gcc-4.5.2/ecj.jar
 	$(CP) $(TOPDIR)/jtools_build/gcc-4.5.2/ecj.jar ${STAGING_JAVA_HOST_DIR}/usr/share/ecj.jar
diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile
index e3bb8d17f..2f861e053 100644
--- a/package/openjdk/Makefile
+++ b/package/openjdk/Makefile
@@ -62,8 +62,7 @@ do-extract:
 
 pre-configure:
 	(cd ${WRKBUILD}/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION); rm -rf config.{cache,status};\
-		export PATH="${PATH}:${STAGING_JAVA_HOST_DIR}/usr/bin"; \
-		export CLASSPATH="${STAGING_JAVA_HOST_DIR}/usr/share/java/libgcj-4.5.2.jar:${STAGING_JAVA_HOST_DIR}/usr/share/java/ecj.jar";\
+		env JAVACFLAGS="-cp ${STAGING_JAVA_HOST_DIR}/usr/share/java/libgcj-4.5.2.jar" \
 		./configure \
 			--enable-bootstrap \
 			--enable-zero \
diff --git a/package/openjdk/patches/patch-icedtea6-1_10_configure b/package/openjdk/patches/patch-icedtea6-1_10_configure
index 6611e470e..d9b96d1d4 100644
--- a/package/openjdk/patches/patch-icedtea6-1_10_configure
+++ b/package/openjdk/patches/patch-icedtea6-1_10_configure
@@ -1,6 +1,7 @@
 --- w-openjdk-6-1.orig/icedtea6-1.10/configure	2011-03-02 20:48:44.321157333 +0100
-+++ w-openjdk-6-1/icedtea6-1.10/configure	2011-04-01 16:12:33.091819347 +0200
-@@ -10803,25 +10803,9 @@ else
++++ w-openjdk-6-1/icedtea6-1.10/configure	2011-03-28 15:30:08.791808629 +0200
+@@ -10805,22 +10805,6 @@ fi
+ 
  
  
 -for ac_header in cups/cups.h cups/ppd.h
@@ -19,10 +20,9 @@
 -fi
 -
 -done
--
+ 
  for ac_header in X11/X.h
  do :
-   ac_fn_c_check_header_mongrel "$LINENO" "X11/X.h" "ac_cv_header_X11_X_h" "$ac_includes_default"
 @@ -10879,46 +10863,6 @@ else
    as_fn_error $? "\"libjpeg not found - try installing libjpeg-devel\"" "$LINENO" 5
  fi
@@ -70,7 +70,164 @@
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lz" >&5
  $as_echo_n "checking for main in -lz... " >&6; }
-@@ -11271,83 +11215,6 @@ fi
+@@ -11040,156 +10984,9 @@ fi
+ 
+ 
+ 
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XT" >&5
+-$as_echo_n "checking for XT... " >&6; }
+-
+-if test -n "$XT_CFLAGS"; then
+-    pkg_cv_XT_CFLAGS="$XT_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xt\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "xt") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_XT_CFLAGS=`$PKG_CONFIG --cflags "xt" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-if test -n "$XT_LIBS"; then
+-    pkg_cv_XT_LIBS="$XT_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xt\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "xt") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_XT_LIBS=`$PKG_CONFIG --libs "xt" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        XT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xt" 2>&1`
+-        else
+-	        XT_PKG_ERRORS=`$PKG_CONFIG --print-errors "xt" 2>&1`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$XT_PKG_ERRORS" >&5
+-
+-	XT_FOUND=no
+-elif test $pkg_failed = untried; then
+-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-	XT_FOUND=no
+-else
+-	XT_CFLAGS=$pkg_cv_XT_CFLAGS
+-	XT_LIBS=$pkg_cv_XT_LIBS
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-	XT_FOUND=yes
+-fi
+-if test "x${XT_FOUND}" = xno
+-then
+-  as_fn_error $? "Could not find Xt - \
+-  Try installing libXt-devel." "$LINENO" 5
+-fi
+-
+-
+-
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XP" >&5
+-$as_echo_n "checking for XP... " >&6; }
+-
+-if test -n "$XP_CFLAGS"; then
+-    pkg_cv_XP_CFLAGS="$XP_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xp\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "xp") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_XP_CFLAGS=`$PKG_CONFIG --cflags "xp" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-if test -n "$XP_LIBS"; then
+-    pkg_cv_XP_LIBS="$XP_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xp\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "xp") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_XP_LIBS=`$PKG_CONFIG --libs "xp" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-
+-
+ 
+-if test $pkg_failed = yes; then
+-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+ 
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        XP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xp" 2>&1`
+-        else
+-	        XP_PKG_ERRORS=`$PKG_CONFIG --print-errors "xp" 2>&1`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$XP_PKG_ERRORS" >&5
+ 
+-	XP_FOUND=no
+-elif test $pkg_failed = untried; then
+-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-	XP_FOUND=no
+-else
+-	XP_CFLAGS=$pkg_cv_XP_CFLAGS
+-	XP_LIBS=$pkg_cv_XP_LIBS
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-	XP_FOUND=yes
+-fi
+-if test "x${XP_FOUND}" = xno
+-then
+-  as_fn_error $? "Could not find Xp - \
+-  Try installing libXp-devel." "$LINENO" 5
+-fi
+ 
+ 
+ 
+@@ -11271,83 +11068,6 @@ fi
  
  
  
@@ -154,7 +311,7 @@
  if test "x${ENABLE_XRENDER}" = "xyes"
  then
  
-@@ -11610,79 +11477,6 @@ fi
+@@ -11610,79 +11330,6 @@ fi
  
  
  
@@ -234,7 +391,7 @@
  
  
  
-@@ -11764,85 +11558,6 @@ fi
+@@ -11764,85 +11411,6 @@ fi
  
  
  
-- 
cgit v1.2.3


From 10a925546005b9fdce4e660d62004782a0067461 Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sat, 2 Apr 2011 13:21:36 +0000
Subject: speed up building gcj by disabling gcc bootstrap (since gcc from here
 is not used anyway, pointless)

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---
 jtools/gcj/Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'jtools')

diff --git a/jtools/gcj/Makefile b/jtools/gcj/Makefile
index ba31c27ea..60cf4fca7 100644
--- a/jtools/gcj/Makefile
+++ b/jtools/gcj/Makefile
@@ -27,6 +27,7 @@ $(WRKBUILD)/.configured: ${WRKDIST}/.prepared
                         --disable-biarch \
                         --disable-decimal-float \
                         --disable-multilib \
+			--disable-bootstrap \
 	);
 	touch $@
 
-- 
cgit v1.2.3


From ca1f81baa087bd0003db4d9417cef1bc849c5c5d Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sat, 2 Apr 2011 13:58:10 +0000
Subject: unbreak build on the Macintosh by specifying explicit fastjar
 location

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---
 jtools/gcj/Makefile | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'jtools')

diff --git a/jtools/gcj/Makefile b/jtools/gcj/Makefile
index 60cf4fca7..873e6c21c 100644
--- a/jtools/gcj/Makefile
+++ b/jtools/gcj/Makefile
@@ -19,14 +19,22 @@ install: ${STAGING_JAVA_HOST_DIR}/usr/bin/gcj
 $(WRKBUILD)/.configured: ${WRKDIST}/.prepared
 	(cd $(WRKBUILD); \
 		wget -O ecj.jar ftp://sourceware.org/pub/java/ecj-latest.jar; \
-		./configure --prefix=/usr --enable-java-home --enable-languages=java --with-ffi \
-			--with-mpc=$(STAGING_HOST_DIR) --with-mpfr=$(STAGING_HOST_DIR) \
+		export ac_cv_prog_JAR=$(STAGING_JAVA_HOST_DIR)/usr/bin/fastjar; \
+		export JAR=$(STAGING_JAVA_HOST_DIR)/usr/bin/fastjar; \
+		./configure \
+			--prefix=/usr \
+			--enable-java-home \
+			--enable-languages=java \
+			--with-ffi \
+			--with-mpc=$(STAGING_HOST_DIR) \
+			--with-mpfr=$(STAGING_HOST_DIR) \
 			--with-gmp=$(STAGING_HOST_DIR) \
+			--with-jar=$(STAGING_JAVA_HOST_DIR)/usr/bin/fastjar \
 			--disable-libmudflap \
-                        --disable-libgomp \
-                        --disable-biarch \
-                        --disable-decimal-float \
-                        --disable-multilib \
+			--disable-libgomp \
+			--disable-biarch \
+			--disable-decimal-float \
+			--disable-multilib \
 			--disable-bootstrap \
 	);
 	touch $@
-- 
cgit v1.2.3


From d0e8617911c7b0a072c07c9da3a3a8c4ab357e0b Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sat, 2 Apr 2011 15:49:08 +0000
Subject: use environment for configure, make and make install
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

just to be sure it’s picked up correctly at all times

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---
 jtools/gcj/Makefile | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'jtools')

diff --git a/jtools/gcj/Makefile b/jtools/gcj/Makefile
index 873e6c21c..0c29e3124 100644
--- a/jtools/gcj/Makefile
+++ b/jtools/gcj/Makefile
@@ -14,14 +14,15 @@ WRKDIST=		${WRKDIR}/gcc-${PKG_VERSION}
 
 include ../rules.mk
 
+GCJ_ENV+=		ac_cv_prog_JAR=$(STAGING_JAVA_HOST_DIR)/usr/bin/fastjar
+GCJ_ENV+=		JAR=$(STAGING_JAVA_HOST_DIR)/usr/bin/fastjar
+
 install: ${STAGING_JAVA_HOST_DIR}/usr/bin/gcj
 
 $(WRKBUILD)/.configured: ${WRKDIST}/.prepared
 	(cd $(WRKBUILD); \
 		wget -O ecj.jar ftp://sourceware.org/pub/java/ecj-latest.jar; \
-		export ac_cv_prog_JAR=$(STAGING_JAVA_HOST_DIR)/usr/bin/fastjar; \
-		export JAR=$(STAGING_JAVA_HOST_DIR)/usr/bin/fastjar; \
-		./configure \
+		env ${GCJ_ENV} ./configure \
 			--prefix=/usr \
 			--enable-java-home \
 			--enable-languages=java \
@@ -40,11 +41,12 @@ $(WRKBUILD)/.configured: ${WRKDIST}/.prepared
 	touch $@
 
 $(WRKBUILD)/.compiled: ${WRKDIST}/.configured
-	${MAKE} -C ${WRKBUILD} $(MAKE_TRACE)
+	env ${GCJ_ENV} ${MAKE} -C ${WRKBUILD} $(MAKE_TRACE)
 	touch $@
 
 ${STAGING_JAVA_HOST_DIR}/usr/bin/gcj: $(WRKBUILD)/.compiled
 	$(INSTALL_DIR) ${STAGING_JAVA_HOST_DIR}
-	${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE)
+	env ${GCJ_ENV} ${MAKE} -C ${WRKBUILD} \
+	    DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE)
 
 include $(TOPDIR)/mk/tools.mk
-- 
cgit v1.2.3


From a6d93f95b95369531b703146842373cf575ed9f3 Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sat, 2 Apr 2011 17:40:56 +0000
Subject: apparently, fastjar is also broken ⇒ use zip/unzip
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---
 jtools/gcj/Makefile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'jtools')

diff --git a/jtools/gcj/Makefile b/jtools/gcj/Makefile
index 0c29e3124..ea41ca671 100644
--- a/jtools/gcj/Makefile
+++ b/jtools/gcj/Makefile
@@ -14,8 +14,7 @@ WRKDIST=		${WRKDIR}/gcc-${PKG_VERSION}
 
 include ../rules.mk
 
-GCJ_ENV+=		ac_cv_prog_JAR=$(STAGING_JAVA_HOST_DIR)/usr/bin/fastjar
-GCJ_ENV+=		JAR=$(STAGING_JAVA_HOST_DIR)/usr/bin/fastjar
+GCJ_ENV+=		JAR=no
 
 install: ${STAGING_JAVA_HOST_DIR}/usr/bin/gcj
 
@@ -30,7 +29,6 @@ $(WRKBUILD)/.configured: ${WRKDIST}/.prepared
 			--with-mpc=$(STAGING_HOST_DIR) \
 			--with-mpfr=$(STAGING_HOST_DIR) \
 			--with-gmp=$(STAGING_HOST_DIR) \
-			--with-jar=$(STAGING_JAVA_HOST_DIR)/usr/bin/fastjar \
 			--disable-libmudflap \
 			--disable-libgomp \
 			--disable-biarch \
-- 
cgit v1.2.3


From 7f60e6cf0e0bf73ffd396f7198627c8922d4865b Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sat, 2 Apr 2011 19:55:04 +0000
Subject: fix ecj build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

• -Bsymbolic is only for GNU ld on ELF creating DLLs,
  not for Apple ld on Mach-O creating binaries
• /usr/lib64 doesn’t exist on some OSes, I might have heard…
• indent

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---
 jtools/ecj/Makefile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'jtools')

diff --git a/jtools/ecj/Makefile b/jtools/ecj/Makefile
index ffa6cd43e..e87354132 100644
--- a/jtools/ecj/Makefile
+++ b/jtools/ecj/Makefile
@@ -13,10 +13,12 @@ include ../rules.mk
 install: ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj
 
 ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj:
-	env LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib64 \
-	PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$$PATH \
-	$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj -g -O2 -Wl,-Bsymbolic -findirect-dispatch \
-		-o ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj --main=org.eclipse.jdt.internal.compiler.batch.Main \
+	env \
+		LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \
+		PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$$PATH \
+	$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj -g -O2 -findirect-dispatch \
+		-o ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj \
+		--main=org.eclipse.jdt.internal.compiler.batch.Main \
 		$(TOPDIR)/jtools_build/gcc-4.5.2/ecj.jar
 	$(CP) $(TOPDIR)/jtools_build/gcc-4.5.2/ecj.jar ${STAGING_JAVA_HOST_DIR}/usr/share/ecj.jar
 
-- 
cgit v1.2.3


From afc6a2ce6bfdb25f47a0303f94c872aadbbb7e8c Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sat, 2 Apr 2011 20:53:19 +0000
Subject: help gcj/ecj both to find their dylibs on Mac as well as others

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---
 jtools/ecj/Makefile      | 1 +
 package/openjdk/Makefile | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'jtools')

diff --git a/jtools/ecj/Makefile b/jtools/ecj/Makefile
index e87354132..32cfdeb53 100644
--- a/jtools/ecj/Makefile
+++ b/jtools/ecj/Makefile
@@ -14,6 +14,7 @@ install: ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj
 
 ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj:
 	env \
+		DYLD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \
 		LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \
 		PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$$PATH \
 	$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj -g -O2 -findirect-dispatch \
diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile
index 2f861e053..5b1a8fa2c 100644
--- a/package/openjdk/Makefile
+++ b/package/openjdk/Makefile
@@ -61,8 +61,10 @@ do-extract:
 	(cd $(WRKBUILD); tar xzf $(TOPDIR)/dl/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz)
 
 pre-configure:
-	(cd ${WRKBUILD}/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION); rm -rf config.{cache,status};\
+	cd ${WRKBUILD}/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION); rm -rf config.{cache,status};\
 		env JAVACFLAGS="-cp ${STAGING_JAVA_HOST_DIR}/usr/share/java/libgcj-4.5.2.jar" \
+		DYLD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \
+		LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \
 		./configure \
 			--enable-bootstrap \
 			--enable-zero \
@@ -80,8 +82,7 @@ pre-configure:
 			--without-rhino \
 			--disable-xrender \
 			--disable-nss \
-	);
-	(cd $(WRKBUILD)/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION) ; ${MAKE})
+		&& ${MAKE}
 
 openjdk-install:
 	$(INSTALL_DIR) $(IDIR_OPENJDK)/usr/bin
-- 
cgit v1.2.3


From f2cf68a6765c7f2d7442ccdba1c9e9db114828e5 Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sat, 2 Apr 2011 21:02:18 +0000
Subject: disable gjdoc to make classpath build

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---
 jtools/classpath/Makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'jtools')

diff --git a/jtools/classpath/Makefile b/jtools/classpath/Makefile
index 253f9604d..e165c4d1c 100644
--- a/jtools/classpath/Makefile
+++ b/jtools/classpath/Makefile
@@ -23,6 +23,7 @@ $(WRKBUILD)/.configured: ${WRKDIST}/.prepared
 		--disable-dssi \
 		--disable-plugin \
 		--disable-examples \
+		--disable-gjdoc \
 		--disable-Werror)
 	touch $@
 
-- 
cgit v1.2.3


From 4fd507e900d3741e6981a853de91944c43c59a0a Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sat, 2 Apr 2011 21:03:06 +0000
Subject: make jamvm build on the Macintosh…
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

… where uname -p = i386 even on a system that is 64-bit

Apple #FAIL

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---
 jtools/jamvm/Makefile | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'jtools')

diff --git a/jtools/jamvm/Makefile b/jtools/jamvm/Makefile
index f02450fb0..639b7d875 100644
--- a/jtools/jamvm/Makefile
+++ b/jtools/jamvm/Makefile
@@ -9,12 +9,22 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		63220327925ace13756ae334c55a3baa
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=jamvm/}
 
+ifeq (Darwin,${OStype})
+CC_FOR_BUILD:=${CC_FOR_BUILD} -m32
+CXX_FOR_BUILD:=${CXX_FOR_BUILD} -m32
+endif
+
 include ../rules.mk
 
 install: ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm
 
 $(WRKBUILD)/.configured: ${WRKDIST}/.prepared
-	(cd $(WRKBUILD); ./configure --prefix=/usr --with-classpath-install-dir=$(STAGING_JAVA_HOST_DIR) );
+	cd $(WRKBUILD); env \
+		CC='${CC_FOR_BUILD}' \
+		CXX='${CXX_FOR_BUILD}' \
+	    ./configure \
+		--prefix=/usr \
+		--with-classpath-install-dir=$(STAGING_JAVA_HOST_DIR)
 	touch $@
 
 $(WRKBUILD)/.compiled: ${WRKDIST}/.configured
-- 
cgit v1.2.3


From d76426c353f096f1312c4df605b1d6d855171192 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 3 Apr 2011 00:47:14 +0200
Subject: more steps toward an IcedTea (or so we hope), still fails, though…
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jtools/classpath/Makefile |  1 +
 package/openjdk/Makefile  | 56 +++++++++++++++++++++++++++--------------------
 toolchain/Config.in       | 12 +++++-----
 3 files changed, 39 insertions(+), 30 deletions(-)

(limited to 'jtools')

diff --git a/jtools/classpath/Makefile b/jtools/classpath/Makefile
index e165c4d1c..d4421bf9a 100644
--- a/jtools/classpath/Makefile
+++ b/jtools/classpath/Makefile
@@ -24,6 +24,7 @@ $(WRKBUILD)/.configured: ${WRKDIST}/.prepared
 		--disable-plugin \
 		--disable-examples \
 		--disable-gjdoc \
+		--with-jar=no \
 		--disable-Werror)
 	touch $@
 
diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile
index 993b9e779..cf81f7cab 100644
--- a/package/openjdk/Makefile
+++ b/package/openjdk/Makefile
@@ -38,6 +38,7 @@ DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz \
 			${XALAN_NAME}_${XALAN_VERSION}-bin.tar.gz
 NO_DISTFILES:=		1
 WRKDIST=		${WRKDIR}
+WRKSRC=			${WRKDIST}/${ICEDTEA_NAME}-${ICEDTEA_VERSION}
 
 PKG_SUBPKGS:=		OPENJDK
 PKG_CFLINE_OPENJDK:=	select ADK_TOOLCHAIN_GCC_JAVA
@@ -57,49 +58,56 @@ ifeq ($(ADK_PACKAGE_OPENJDK_ZERO),y)
 CONFIGURE_ARGS+=	--enable-zero
 endif
 ifeq ($(ADK_PACKAGE_OPENJDK_SHARK),y)
-CONFIGURE_ARGS+=	--enable-shark 
+CONFIGURE_ARGS+=	--enable-shark
 endif
 
 CONFIGURE_ARGS+=	--disable-docs \
 			--enable-bootstrap \
-			--disable-openjdk-cross-compilation \
-			--with-jdk-home=$(STAGING_HOST_DIR)/lib/jvm \
-			--with-xalan2-jar=${WRKBUILD}/${XALAN_NAME}_${XALAN_VERSION}/xalan.jar \
-			--with-xalan2-serializer-jar=${WRKBUILD}/${XALAN_NAME}_${XALAN_VERSION}/serializer.jar \
-			--with-xerces2-jar=${WRKBUILD}/${XALAN_NAME}_${XALAN_VERSION}/xercesImpl.jar \
-			--with-ecj-jar=$(TOPDIR)/dl/ecj.jar \
+			--enable-openjdk-cross-compilation \
+			--with-jdk-home=${STAGING_JAVA_HOST_DIR}/usr/lib/jvm \
+		--with-java=$(STAGING_JAVA_HOST_DIR)/usr/bin/jamvm \
+		--with-javac=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj \
+		--with-gcj=$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj \
+			--with-openjdk-src-dir=$(WRKDIST)/$(PKG_NAME)-$(PKG_VERSION) \
+			--with-xalan2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xalan.jar \
+			--with-xalan2-serializer-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/serializer.jar \
+			--with-xerces2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xercesImpl.jar \
+			--with-ecj-jar=${STAGING_JAVA_HOST_DIR}/usr/share/ecj.jar \
 			--without-rhino \
 			--disable-xrender \
 			--disable-nss
 
+OPENJDK_BUILD_ENV+=	JAVACFLAGS="-cp ${STAGING_JAVA_HOST_DIR}/usr/share/java/libgcj-4.5.2.jar"
+OPENJDK_BUILD_ENV+=	DYLD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64
+OPENJDK_BUILD_ENV+=	LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64
+OPENJDK_BUILD_ENV+=	ADK_ECJ=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj
+CONFIGURE_ENV+=		${OPENJDK_BUILD_ENV}
+MAKE_ENV+=		${OPENJDK_BUILD_ENV}
+
 do-extract:
-	(cd ${WRKBUILD}; mkdir $(PKG_NAME)-$(PKG_VERSION) ; tar xzf $(TOPDIR)/dl/$(PKG_NAME)-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz -C $(PKG_NAME)-$(PKG_VERSION))
-	(cd $(WRKBUILD); tar xzf $(TOPDIR)/dl/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz)
-	cd ${WRKBUILD}; tar xzf ${TOPDIR}/dl/${XALAN_NAME}_${XALAN_VERSION}-bin.tar.gz
+	(cd ${WRKDIST}; mkdir $(PKG_NAME)-$(PKG_VERSION) ; tar xzf $(TOPDIR)/dl/$(PKG_NAME)-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz -C $(PKG_NAME)-$(PKG_VERSION))
+	(cd $(WRKDIST); tar xzf $(TOPDIR)/dl/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz)
+	cd ${WRKDIST}; tar xzf ${TOPDIR}/dl/${XALAN_NAME}_${XALAN_VERSION}-bin.tar.gz
+	mkdir -p ${WRKBUILD}/drops
 	cd ${TOPDIR}/dl; cp jaxp144_01.zip jdk6-jaf-b20.zip jdk6-jaxws-b20.zip \
-	    ${WRKBUILD}/${ICEDTEA_NAME}-${ICEDTEA_VERSION}/drops/
-
-pre-configure:
-	cd ${WRKBUILD}/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION); rm -rf config.{cache,status};\
-	export \
-	    JAVACFLAGS="-cp ${STAGING_JAVA_HOST_DIR}/usr/share/java/libgcj-4.5.2.jar" \
-	    DYLD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \
-	    LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \
-	    ADK_ECJ=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj \
-	; ./configure \
+	    ${WRKBUILD}/drops/
+
+x-pre-configure:
+	cd ${WRKBUILD}; rm -rf config.{cache,status};\
+	export ${OPENJDK_BUILD_ENV}; ./configure \
 		--enable-bootstrap \
 		--enable-zero \
 		--with-jdk-home=$(STAGING_JAVA_HOST_DIR)/usr/lib/jvm \
 		--with-java=$(STAGING_JAVA_HOST_DIR)/usr/bin/jamvm \
 		--with-javac=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj \
 		--with-gcj=$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj \
-		--with-openjdk-src-dir=$(WRKBUILD)/$(PKG_NAME)-$(PKG_VERSION) \
+		--with-openjdk-src-dir=$(WRKDIST)/$(PKG_NAME)-$(PKG_VERSION) \
 		--with-ecj-jar=${STAGING_JAVA_HOST_DIR}/usr/share/ecj.jar \
 		--disable-docs \
 		--disable-openjdk-cross-compilation \
-		--with-xalan2-jar=${WRKBUILD}/${XALAN_NAME}_${XALAN_VERSION}/xalan.jar \
-		--with-xalan2-serializer-jar=${WRKBUILD}/${XALAN_NAME}_${XALAN_VERSION}/serializer.jar \
-		--with-xerces2-jar=${WRKBUILD}/${XALAN_NAME}_${XALAN_VERSION}/xercesImpl.jar \
+		--with-xalan2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xalan.jar \
+		--with-xalan2-serializer-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/serializer.jar \
+		--with-xerces2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xercesImpl.jar \
 		--without-rhino \
 		--disable-xrender \
 		--disable-nss \
diff --git a/toolchain/Config.in b/toolchain/Config.in
index dd0e5ab34..0b5e1dc8a 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -10,12 +10,12 @@ config ADK_TOOLCHAIN_GCC_CXX
 	boolean
 	default y
 
-config ADK_TOOLCHAIN_GCC_JAVA
-	prompt "Enable building of GCJ (Java language support in GCC)"
-	boolean
-	select ADK_PACKAGE_LIBGCJ
-	default n
-
+#config ADK_TOOLCHAIN_GCC_JAVA
+#	prompt "Enable building of GCJ (Java language support in GCC)"
+#	boolean
+#	select ADK_PACKAGE_LIBGCJ
+#	default n
+#
 #config ADK_TOOLCHAIN_GCC_OBJC
 #	prompt "Enable building of Objective C compiler"
 #	boolean
-- 
cgit v1.2.3


From 8a75e236880e3c426edd1af19a052fae3e1fd270 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 3 Apr 2011 17:44:46 +0200
Subject: merge some changes, cosmetic fixes

---
 jtools/cacao/Makefile    | 19 +++++++++----------
 package/openjdk/Makefile | 12 +++++++-----
 2 files changed, 16 insertions(+), 15 deletions(-)

(limited to 'jtools')

diff --git a/jtools/cacao/Makefile b/jtools/cacao/Makefile
index 6d4b76d1f..7b5262dcc 100644
--- a/jtools/cacao/Makefile
+++ b/jtools/cacao/Makefile
@@ -7,29 +7,28 @@ PKG_NAME:=		cacao
 PKG_VERSION:=		0.99.4
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		63220327925ace13756ae334c55a3baa
-PKG_SITES:=		http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.99.4/
+PKG_SITES:=		http://www.complang.tuwien.ac.at/cacaojvm/download/$(PKG_NAME)-$(PKG_VERSION)/
 
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 
 include ../rules.mk
 
-install: ${STAGING_HOST_DIR}/usr/bin/cacao
+install: ${STAGING_JAVA_HOST_DIR}/usr/bin/cacao
 
 $(WRKBUILD)/.configured: ${WRKDIST}/.prepared
-	(cd $(WRKBUILD); ./configure --prefix=/usr --disable-libjvm --enable-debug \
-		--with-vm-zip=$(STAGING_HOST_DIR)/usr/share/cacao/vm.zip \
+	cd $(WRKBUILD); ./configure --prefix=/usr --disable-libjvm --enable-debug \
+		--with-vm-zip=$(STAGING_JAVA_HOST_DIR)/usr/share/cacao/vm.zip \
 		--with-java-runtime-library=gnuclasspath \
-		--with-java-runtime-library-classes=$(STAGING_HOST_DIR)/usr/share/classpath/glibj.zip \
-		--with-java-runtime-library-prefix=$(STAGING_HOST_DIR)/usr \
-		--with-jni_md_h=$(STAGING_HOST_DIR)/usr/include \
-	);
+		--with-java-runtime-library-classes=$(STAGING_JAVA_HOST_DIR)/usr/share/classpath/glibj.zip \
+		--with-java-runtime-library-prefix=$(STAGING_JAVA_HOST_DIR)/usr \
+		--with-jni_md_h=$(STAGING_JAVA_HOST_DIR)/usr/include \
 	touch $@
 
 $(WRKBUILD)/.compiled: ${WRKDIST}/.configured
 	${MAKE} -C ${WRKBUILD} $(MAKE_TRACE)
 	touch $@
 
-${STAGING_HOST_DIR}/usr/bin/cacao: $(WRKBUILD)/.compiled
-	${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_HOST_DIR) install $(MAKE_TRACE)
+${STAGING_JAVA_HOST_DIR}/usr/bin/cacao: $(WRKBUILD)/.compiled
+	${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE)
 
 include $(TOPDIR)/mk/tools.mk
diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile
index cf81f7cab..ff606bee3 100644
--- a/package/openjdk/Makefile
+++ b/package/openjdk/Makefile
@@ -85,15 +85,17 @@ CONFIGURE_ENV+=		${OPENJDK_BUILD_ENV}
 MAKE_ENV+=		${OPENJDK_BUILD_ENV}
 
 do-extract:
-	(cd ${WRKDIST}; mkdir $(PKG_NAME)-$(PKG_VERSION) ; tar xzf $(TOPDIR)/dl/$(PKG_NAME)-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz -C $(PKG_NAME)-$(PKG_VERSION))
-	(cd $(WRKDIST); tar xzf $(TOPDIR)/dl/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz)
+	cd ${WRKDIST}; mkdir $(PKG_NAME)-$(PKG_VERSION) ; \
+		tar xzf $(TOPDIR)/dl/$(PKG_NAME)-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz \
+		-C $(PKG_NAME)-$(PKG_VERSION)
+	cd $(WRKDIST); tar xzf $(TOPDIR)/dl/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz
 	cd ${WRKDIST}; tar xzf ${TOPDIR}/dl/${XALAN_NAME}_${XALAN_VERSION}-bin.tar.gz
 	mkdir -p ${WRKBUILD}/drops
 	cd ${TOPDIR}/dl; cp jaxp144_01.zip jdk6-jaf-b20.zip jdk6-jaxws-b20.zip \
-	    ${WRKBUILD}/drops/
+	    ${WRKBUILD}/drops
 
-x-pre-configure:
-	cd ${WRKBUILD}; rm -rf config.{cache,status};\
+pre-configure:
+	cd ${WRKBUILD}; rm -rf config.{cache,status}; \
 	export ${OPENJDK_BUILD_ENV}; ./configure \
 		--enable-bootstrap \
 		--enable-zero \
-- 
cgit v1.2.3


From ecf189dbe827549ea7e12f939cc410f5996b3d2b Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 4 Apr 2011 17:33:11 +0200
Subject: first bootstrap compiler successfully works.

the AWT requires all the X11 and graphic libraries.
Jamvm is not required, we can just use gij from gcj.
---
 jtools/Makefile                                    |   2 +-
 package/openjdk/Makefile                           |  34 +-
 .../openjdk/patches/patch-icedtea6-1_10_configure  | 479 ---------------------
 3 files changed, 15 insertions(+), 500 deletions(-)
 delete mode 100644 package/openjdk/patches/patch-icedtea6-1_10_configure

(limited to 'jtools')

diff --git a/jtools/Makefile b/jtools/Makefile
index 932cd298f..23c90534f 100644
--- a/jtools/Makefile
+++ b/jtools/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 TARGETS:=
 ifneq ($(ADK_PACKAGE_OPENJDK),)
-TARGETS+=fastjar gcj classpath jamvm ecj
+TARGETS+=fastjar gcj classpath ecj
 endif
 
 TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS))
diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile
index 20c231abe..09345b198 100644
--- a/package/openjdk/Makefile
+++ b/package/openjdk/Makefile
@@ -15,7 +15,7 @@ PKG_MD5SUM:=		2d2bbbb0f9b81f1fec41ec730da8a933 \
 			d526d0848c88607ce4e3a0a4edb75d50
 PKG_DESCR:=		OpenJDK Java VM
 PKG_SECTION:=		lang
-PKG_BUILDDEP:=		xproto jpeg zlib libX11 libpng freetype
+PKG_BUILDDEP:=		xproto jpeg zlib libX11 libpng freetype cups
 PKG_URL:=		http://openjdk.org/
 PKG_SITES:=		http://download.java.net/openjdk/jdk6/promoted/b22/ \
 			http://mirror.netcologne.de/apache.org/xml/xalan-j/binaries/ \
@@ -43,8 +43,6 @@ WRKDIST=		${WRKDIR}
 WRKSRC=			${WRKDIST}/${ICEDTEA_NAME}-${ICEDTEA_VERSION}
 
 PKG_SUBPKGS:=		OPENJDK
-PKG_CFLINE_OPENJDK:=	select ADK_TOOLCHAIN_GCC_JAVA
-
 PKG_CHOICES_OPENJDK:=	ZERO SHARK CACAO JAMVM
 PKGCD_ZERO:=		zero-assembly backend
 PKGCD_SHARK:=		JIT backend
@@ -66,25 +64,23 @@ endif
 CONFIGURE_ARGS+=	--disable-docs \
 			--enable-bootstrap \
 			--enable-openjdk-cross-compilation \
-			--with-jdk-home=${STAGING_JAVA_HOST_DIR}/usr/lib/jvm \
-		--with-java=$(STAGING_JAVA_HOST_DIR)/usr/bin/jamvm \
-		--with-javac=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj \
-		--with-gcj=$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj \
 			--with-openjdk-src-dir=$(WRKDIST)/$(PKG_NAME)-$(PKG_VERSION) \
 			--with-xalan2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xalan.jar \
 			--with-xalan2-serializer-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/serializer.jar \
 			--with-xerces2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xercesImpl.jar \
-			--with-ecj-jar=${STAGING_JAVA_HOST_DIR}/usr/share/ecj.jar \
-			--without-rhino \
-			--disable-xrender \
-			--disable-nss
+			--with-jdk-home=$(WRKSRC)/openjdk.build/j2sdk-image \
+			--with-java=$(WRKSRC)/openjdk.build/j2sdk-image/bin/java \
+			--with-javac=$(WRKSRC)/openjdk.build/j2sdk-image/bin/javac \
+			--with-javah=$(WRKSRC)/openjdk.build/j2sdk-image/bin/javah \
+			--with-jar=$(WRKSRC)/openjdk.build/j2sdk-image/bin/jar \
+			--with-rmic=$(WRKSRC)/openjdk.build/j2sdk-image/bin/rmic \
+			--with-native2ascii=$(WRKSRC)/openjdk.build/j2sdk-image/bin/native2ascii \
+			--without-rhino
 
 OPENJDK_BUILD_ENV+=	JAVACFLAGS="-cp ${STAGING_JAVA_HOST_DIR}/usr/share/java/libgcj-4.5.2.jar"
 OPENJDK_BUILD_ENV+=	DYLD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64
 OPENJDK_BUILD_ENV+=	LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64
 OPENJDK_BUILD_ENV+=	ADK_ECJ=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj
-CONFIGURE_ENV+=		${OPENJDK_BUILD_ENV}
-MAKE_ENV+=		${OPENJDK_BUILD_ENV}
 
 do-extract:
 	cd ${WRKDIST}; mkdir $(PKG_NAME)-$(PKG_VERSION) ; \
@@ -100,21 +96,19 @@ pre-configure:
 	export ${OPENJDK_BUILD_ENV}; ./configure \
 		--enable-bootstrap \
 		--enable-zero \
+		--disable-openjdk-cross-compilation \
+		--with-openjdk-src-dir=$(WRKDIST)/$(PKG_NAME)-$(PKG_VERSION) \
 		--with-jdk-home=$(STAGING_JAVA_HOST_DIR)/usr/lib/jvm \
-		--with-java=$(STAGING_JAVA_HOST_DIR)/usr/bin/jamvm \
+		--with-java=$(STAGING_JAVA_HOST_DIR)/usr/bin/gij \
 		--with-javac=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj \
 		--with-gcj=$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj \
-		--with-openjdk-src-dir=$(WRKDIST)/$(PKG_NAME)-$(PKG_VERSION) \
 		--with-ecj-jar=${STAGING_JAVA_HOST_DIR}/usr/share/ecj.jar \
-		--disable-docs \
-		--disable-openjdk-cross-compilation \
 		--with-xalan2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xalan.jar \
 		--with-xalan2-serializer-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/serializer.jar \
 		--with-xerces2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xercesImpl.jar \
 		--without-rhino \
-		--disable-xrender \
-		--disable-nss \
-	&& ${MAKE}
+		--disable-docs \
+	;${MAKE}
 
 openjdk-install:
 	$(INSTALL_DIR) $(IDIR_OPENJDK)/usr/bin
diff --git a/package/openjdk/patches/patch-icedtea6-1_10_configure b/package/openjdk/patches/patch-icedtea6-1_10_configure
deleted file mode 100644
index d9b96d1d4..000000000
--- a/package/openjdk/patches/patch-icedtea6-1_10_configure
+++ /dev/null
@@ -1,479 +0,0 @@
---- w-openjdk-6-1.orig/icedtea6-1.10/configure	2011-03-02 20:48:44.321157333 +0100
-+++ w-openjdk-6-1/icedtea6-1.10/configure	2011-03-28 15:30:08.791808629 +0200
-@@ -10805,22 +10805,6 @@ fi
- 
- 
- 
--for ac_header in cups/cups.h cups/ppd.h
--do :
--  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
--ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
--if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
--  cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
--
--
--else
--  as_fn_error $? "\"CUPS headers were not found -
--	try installing cups-devel.\"" "$LINENO" 5
--fi
--
--done
- 
- for ac_header in X11/X.h
- do :
-@@ -10879,46 +10863,6 @@ else
-   as_fn_error $? "\"libjpeg not found - try installing libjpeg-devel\"" "$LINENO" 5
- fi
- 
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgif" >&5
--$as_echo_n "checking for main in -lgif... " >&6; }
--if ${ac_cv_lib_gif_main+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lgif  $LIBS"
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--
--int
--main ()
--{
--return main ();
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_c_try_link "$LINENO"; then :
--  ac_cv_lib_gif_main=yes
--else
--  ac_cv_lib_gif_main=no
--fi
--rm -f core conftest.err conftest.$ac_objext \
--    conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_main" >&5
--$as_echo "$ac_cv_lib_gif_main" >&6; }
--if test "x$ac_cv_lib_gif_main" = xyes; then :
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBGIF 1
--_ACEOF
--
--  LIBS="-lgif $LIBS"
--
--else
--  as_fn_error $? "\"giflib not found - try installing giflib-devel\"" "$LINENO" 5
--fi
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lz" >&5
- $as_echo_n "checking for main in -lz... " >&6; }
-@@ -11040,156 +10984,9 @@ fi
- 
- 
- 
--pkg_failed=no
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XT" >&5
--$as_echo_n "checking for XT... " >&6; }
--
--if test -n "$XT_CFLAGS"; then
--    pkg_cv_XT_CFLAGS="$XT_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xt\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "xt") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; then
--  pkg_cv_XT_CFLAGS=`$PKG_CONFIG --cflags "xt" 2>/dev/null`
--else
--  pkg_failed=yes
--fi
-- else
--    pkg_failed=untried
--fi
--if test -n "$XT_LIBS"; then
--    pkg_cv_XT_LIBS="$XT_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xt\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "xt") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; then
--  pkg_cv_XT_LIBS=`$PKG_CONFIG --libs "xt" 2>/dev/null`
--else
--  pkg_failed=yes
--fi
-- else
--    pkg_failed=untried
--fi
--
--
--
--if test $pkg_failed = yes; then
--   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
--        _pkg_short_errors_supported=yes
--else
--        _pkg_short_errors_supported=no
--fi
--        if test $_pkg_short_errors_supported = yes; then
--	        XT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xt" 2>&1`
--        else
--	        XT_PKG_ERRORS=`$PKG_CONFIG --print-errors "xt" 2>&1`
--        fi
--	# Put the nasty error message in config.log where it belongs
--	echo "$XT_PKG_ERRORS" >&5
--
--	XT_FOUND=no
--elif test $pkg_failed = untried; then
--     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--	XT_FOUND=no
--else
--	XT_CFLAGS=$pkg_cv_XT_CFLAGS
--	XT_LIBS=$pkg_cv_XT_LIBS
--        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--	XT_FOUND=yes
--fi
--if test "x${XT_FOUND}" = xno
--then
--  as_fn_error $? "Could not find Xt - \
--  Try installing libXt-devel." "$LINENO" 5
--fi
--
--
--
--
--pkg_failed=no
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XP" >&5
--$as_echo_n "checking for XP... " >&6; }
--
--if test -n "$XP_CFLAGS"; then
--    pkg_cv_XP_CFLAGS="$XP_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xp\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "xp") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; then
--  pkg_cv_XP_CFLAGS=`$PKG_CONFIG --cflags "xp" 2>/dev/null`
--else
--  pkg_failed=yes
--fi
-- else
--    pkg_failed=untried
--fi
--if test -n "$XP_LIBS"; then
--    pkg_cv_XP_LIBS="$XP_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xp\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "xp") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; then
--  pkg_cv_XP_LIBS=`$PKG_CONFIG --libs "xp" 2>/dev/null`
--else
--  pkg_failed=yes
--fi
-- else
--    pkg_failed=untried
--fi
--
--
- 
--if test $pkg_failed = yes; then
--   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
- 
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
--        _pkg_short_errors_supported=yes
--else
--        _pkg_short_errors_supported=no
--fi
--        if test $_pkg_short_errors_supported = yes; then
--	        XP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xp" 2>&1`
--        else
--	        XP_PKG_ERRORS=`$PKG_CONFIG --print-errors "xp" 2>&1`
--        fi
--	# Put the nasty error message in config.log where it belongs
--	echo "$XP_PKG_ERRORS" >&5
- 
--	XP_FOUND=no
--elif test $pkg_failed = untried; then
--     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--	XP_FOUND=no
--else
--	XP_CFLAGS=$pkg_cv_XP_CFLAGS
--	XP_LIBS=$pkg_cv_XP_LIBS
--        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--	XP_FOUND=yes
--fi
--if test "x${XP_FOUND}" = xno
--then
--  as_fn_error $? "Could not find Xp - \
--  Try installing libXp-devel." "$LINENO" 5
--fi
- 
- 
- 
-@@ -11271,83 +11068,6 @@ fi
- 
- 
- 
--pkg_failed=no
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XINERAMA" >&5
--$as_echo_n "checking for XINERAMA... " >&6; }
--
--if test -n "$XINERAMA_CFLAGS"; then
--    pkg_cv_XINERAMA_CFLAGS="$XINERAMA_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xinerama\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "xinerama") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; then
--  pkg_cv_XINERAMA_CFLAGS=`$PKG_CONFIG --cflags "xinerama" 2>/dev/null`
--else
--  pkg_failed=yes
--fi
-- else
--    pkg_failed=untried
--fi
--if test -n "$XINERAMA_LIBS"; then
--    pkg_cv_XINERAMA_LIBS="$XINERAMA_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xinerama\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "xinerama") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; then
--  pkg_cv_XINERAMA_LIBS=`$PKG_CONFIG --libs "xinerama" 2>/dev/null`
--else
--  pkg_failed=yes
--fi
-- else
--    pkg_failed=untried
--fi
--
--
--
--if test $pkg_failed = yes; then
--   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
--        _pkg_short_errors_supported=yes
--else
--        _pkg_short_errors_supported=no
--fi
--        if test $_pkg_short_errors_supported = yes; then
--	        XINERAMA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xinerama" 2>&1`
--        else
--	        XINERAMA_PKG_ERRORS=`$PKG_CONFIG --print-errors "xinerama" 2>&1`
--        fi
--	# Put the nasty error message in config.log where it belongs
--	echo "$XINERAMA_PKG_ERRORS" >&5
--
--	XINERAMA_FOUND=no
--elif test $pkg_failed = untried; then
--     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--	XINERAMA_FOUND=no
--else
--	XINERAMA_CFLAGS=$pkg_cv_XINERAMA_CFLAGS
--	XINERAMA_LIBS=$pkg_cv_XINERAMA_LIBS
--        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--	XINERAMA_FOUND=yes
--
--fi
--if test "x${XINERAMA_FOUND}" = xno
--then
--  as_fn_error $? "Could not find Xinerama - \
--  Try installing libXinerama-devel." "$LINENO" 5
--fi
--
--
--
- if test "x${ENABLE_XRENDER}" = "xyes"
- then
- 
-@@ -11610,79 +11330,6 @@ fi
- 
- 
- 
--pkg_failed=no
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XTST" >&5
--$as_echo_n "checking for XTST... " >&6; }
--
--if test -n "$XTST_CFLAGS"; then
--    pkg_cv_XTST_CFLAGS="$XTST_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xtst\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "xtst") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; then
--  pkg_cv_XTST_CFLAGS=`$PKG_CONFIG --cflags "xtst" 2>/dev/null`
--else
--  pkg_failed=yes
--fi
-- else
--    pkg_failed=untried
--fi
--if test -n "$XTST_LIBS"; then
--    pkg_cv_XTST_LIBS="$XTST_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xtst\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "xtst") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; then
--  pkg_cv_XTST_LIBS=`$PKG_CONFIG --libs "xtst" 2>/dev/null`
--else
--  pkg_failed=yes
--fi
-- else
--    pkg_failed=untried
--fi
--
--
--
--if test $pkg_failed = yes; then
--   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
--        _pkg_short_errors_supported=yes
--else
--        _pkg_short_errors_supported=no
--fi
--        if test $_pkg_short_errors_supported = yes; then
--	        XTST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xtst" 2>&1`
--        else
--	        XTST_PKG_ERRORS=`$PKG_CONFIG --print-errors "xtst" 2>&1`
--        fi
--	# Put the nasty error message in config.log where it belongs
--	echo "$XTST_PKG_ERRORS" >&5
--
--	XTST_FOUND=no
--elif test $pkg_failed = untried; then
--     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--	XTST_FOUND=no
--else
--	XTST_CFLAGS=$pkg_cv_XTST_CFLAGS
--	XTST_LIBS=$pkg_cv_XTST_LIBS
--        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--	XTST_FOUND=yes
--fi
--if test "x${XTST_FOUND}" = xno
--then
--  as_fn_error $? "Could not find Xtst - \
--  Try installing libXtst-devel." "$LINENO" 5
--fi
- 
- 
- 
-@@ -11764,85 +11411,6 @@ fi
- 
- 
- 
--if test "x${BUILD_OS_DIR}" = "xlinux"
--then
--
--pkg_failed=no
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ALSA" >&5
--$as_echo_n "checking for ALSA... " >&6; }
--
--if test -n "$ALSA_CFLAGS"; then
--    pkg_cv_ALSA_CFLAGS="$ALSA_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "alsa") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; then
--  pkg_cv_ALSA_CFLAGS=`$PKG_CONFIG --cflags "alsa" 2>/dev/null`
--else
--  pkg_failed=yes
--fi
-- else
--    pkg_failed=untried
--fi
--if test -n "$ALSA_LIBS"; then
--    pkg_cv_ALSA_LIBS="$ALSA_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "alsa") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; then
--  pkg_cv_ALSA_LIBS=`$PKG_CONFIG --libs "alsa" 2>/dev/null`
--else
--  pkg_failed=yes
--fi
-- else
--    pkg_failed=untried
--fi
--
--
--
--if test $pkg_failed = yes; then
--   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
--        _pkg_short_errors_supported=yes
--else
--        _pkg_short_errors_supported=no
--fi
--        if test $_pkg_short_errors_supported = yes; then
--	        ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "alsa" 2>&1`
--        else
--	        ALSA_PKG_ERRORS=`$PKG_CONFIG --print-errors "alsa" 2>&1`
--        fi
--	# Put the nasty error message in config.log where it belongs
--	echo "$ALSA_PKG_ERRORS" >&5
--
--	ALSA_FOUND=no
--elif test $pkg_failed = untried; then
--     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--	ALSA_FOUND=no
--else
--	ALSA_CFLAGS=$pkg_cv_ALSA_CFLAGS
--	ALSA_LIBS=$pkg_cv_ALSA_LIBS
--        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--	ALSA_FOUND=yes
--fi
--  if test "x${ALSA_FOUND}" = xno
--  then
--    as_fn_error $? "Could not find alsa - \
--    Try installing alsa-lib-devel." "$LINENO" 5
--  fi
--
--
--fi
- 
- if test "x${enable_pulse_java}" = "xyes"
- then
-- 
cgit v1.2.3


From 54302bd22cbdda4cabf0541cabfb7c3373a92356 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 4 Apr 2011 19:44:06 +0200
Subject: get all prerequisites for openjdk (cross-compile) right

---
 jtools/cacao/Makefile          | 34 ----------------------------------
 jtools/jamvm/Makefile          | 37 -------------------------------------
 package/alsa-lib/Makefile      |  2 ++
 package/giflib/Makefile        | 24 ++++++++++++++++++++++++
 package/libXinerama/Makefile   | 37 +++++++++++++++++++++++++++++++++++++
 package/libXp/Makefile         | 35 +++++++++++++++++++++++++++++++++++
 package/libXtst/Makefile       | 37 +++++++++++++++++++++++++++++++++++++
 package/openjdk/Makefile       |  3 ++-
 package/printproto/Makefile    | 25 +++++++++++++++++++++++++
 package/xineramaproto/Makefile | 25 +++++++++++++++++++++++++
 10 files changed, 187 insertions(+), 72 deletions(-)
 delete mode 100644 jtools/cacao/Makefile
 delete mode 100644 jtools/jamvm/Makefile
 create mode 100644 package/giflib/Makefile
 create mode 100644 package/libXinerama/Makefile
 create mode 100644 package/libXp/Makefile
 create mode 100644 package/libXtst/Makefile
 create mode 100644 package/printproto/Makefile
 create mode 100644 package/xineramaproto/Makefile

(limited to 'jtools')

diff --git a/jtools/cacao/Makefile b/jtools/cacao/Makefile
deleted file mode 100644
index 7b5262dcc..000000000
--- a/jtools/cacao/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=		cacao
-PKG_VERSION:=		0.99.4
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		63220327925ace13756ae334c55a3baa
-PKG_SITES:=		http://www.complang.tuwien.ac.at/cacaojvm/download/$(PKG_NAME)-$(PKG_VERSION)/
-
-DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-
-include ../rules.mk
-
-install: ${STAGING_JAVA_HOST_DIR}/usr/bin/cacao
-
-$(WRKBUILD)/.configured: ${WRKDIST}/.prepared
-	cd $(WRKBUILD); ./configure --prefix=/usr --disable-libjvm --enable-debug \
-		--with-vm-zip=$(STAGING_JAVA_HOST_DIR)/usr/share/cacao/vm.zip \
-		--with-java-runtime-library=gnuclasspath \
-		--with-java-runtime-library-classes=$(STAGING_JAVA_HOST_DIR)/usr/share/classpath/glibj.zip \
-		--with-java-runtime-library-prefix=$(STAGING_JAVA_HOST_DIR)/usr \
-		--with-jni_md_h=$(STAGING_JAVA_HOST_DIR)/usr/include \
-	touch $@
-
-$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
-	${MAKE} -C ${WRKBUILD} $(MAKE_TRACE)
-	touch $@
-
-${STAGING_JAVA_HOST_DIR}/usr/bin/cacao: $(WRKBUILD)/.compiled
-	${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE)
-
-include $(TOPDIR)/mk/tools.mk
diff --git a/jtools/jamvm/Makefile b/jtools/jamvm/Makefile
deleted file mode 100644
index 639b7d875..000000000
--- a/jtools/jamvm/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=		jamvm
-PKG_VERSION:=		1.5.4
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		63220327925ace13756ae334c55a3baa
-PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=jamvm/}
-
-ifeq (Darwin,${OStype})
-CC_FOR_BUILD:=${CC_FOR_BUILD} -m32
-CXX_FOR_BUILD:=${CXX_FOR_BUILD} -m32
-endif
-
-include ../rules.mk
-
-install: ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm
-
-$(WRKBUILD)/.configured: ${WRKDIST}/.prepared
-	cd $(WRKBUILD); env \
-		CC='${CC_FOR_BUILD}' \
-		CXX='${CXX_FOR_BUILD}' \
-	    ./configure \
-		--prefix=/usr \
-		--with-classpath-install-dir=$(STAGING_JAVA_HOST_DIR)
-	touch $@
-
-$(WRKBUILD)/.compiled: ${WRKDIST}/.configured
-	${MAKE} -C ${WRKBUILD} $(MAKE_TRACE)
-	touch $@
-
-${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm: $(WRKBUILD)/.compiled
-	${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE)
-
-include $(TOPDIR)/mk/tools.mk
diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile
index 7ea5606fa..cddbb0e69 100644
--- a/package/alsa-lib/Makefile
+++ b/package/alsa-lib/Makefile
@@ -34,5 +34,7 @@ alsa-lib-dev-install:
 	${INSTALL_DIR} ${IDIR_ALSA_LIB_DEV}/usr/include/{sys,alsa}
 	${CP} ${WRKINST}/usr/include/sys/*.h ${IDIR_ALSA_LIB_DEV}/usr/include/sys
 	${CP} ${WRKINST}/usr/include/alsa/*.h ${IDIR_ALSA_LIB_DEV}/usr/include/alsa
+	${INSTALL_DIR} ${IDIR_ALSA_LIB_DEV}/usr/lib/pkgconfig
+	$(CP) $(WRKINST)/usr/lib/pkgconfig/*.pc ${IDIR_ALSA_LIB_DEV}/usr/lib/pkgconfig
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/giflib/Makefile b/package/giflib/Makefile
new file mode 100644
index 000000000..1259c92f9
--- /dev/null
+++ b/package/giflib/Makefile
@@ -0,0 +1,24 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		giflib
+PKG_VERSION:=		4.1.6
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		4ff2ecec336b9724c5190f06e8a40f9e
+PKG_DESCR:=		GIF graphics library
+PKG_SECTION:=		libs
+PKG_URL:=		http://sourceforge.net/projects/giflib/
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=giflib/giflib%204.x/$(PKG_NAME)-$(PKG_VERSION)/}
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,GIFLIB,giflib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+giflib-install:
+	$(INSTALL_DIR) $(IDIR_GIFLIB)/usr/lib
+	$(INSTALL_BIN) $(WRKINST)/usr/lib/libgif.so* \
+		$(IDIR_GIFLIB)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXinerama/Makefile b/package/libXinerama/Makefile
new file mode 100644
index 000000000..08b9a0ed0
--- /dev/null
+++ b/package/libXinerama/Makefile
@@ -0,0 +1,37 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		libXinerama
+PKG_VERSION:=		1.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		42b9fc01984c452ee416076c0977b0b3
+PKG_DESCR:=		Xinerama library
+PKG_SECTION:=		x11/libs
+PKG_BUILDDEP:=		xineramaproto
+PKG_SITES:=		${MASTER_SITE_XORG}
+
+PKG_SUBPKGS:=		LIBXINERAMA LIBXINERAMA_DEV
+PKGSD_LIBXINERAMA_DEV:=	Xinerama headers
+PKGSC_LIBXINERAMA_DEV:=	x11/devel
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBXINERAMA,libxinerama,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBXINERAMA_DEV,libxinerama-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXINERAMA_DEV},${PKGSC_LIBXINERAMA_DEV}))
+
+CONFIGURE_ARGS+= 	--disable-malloc0returnsnull
+
+libxinerama-install:
+	${INSTALL_DIR} ${IDIR_LIBXINERAMA}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libXinerama.so* ${IDIR_LIBXINERAMA}/usr/lib
+
+libxinerama-dev-install:
+	${INSTALL_DIR} ${IDIR_LIBXINERAMA_DEV}/usr/include
+	${CP} ${WRKINST}/usr/include/* ${IDIR_LIBXINERAMA_DEV}/usr/include
+	${INSTALL_DIR} ${IDIR_LIBXINERAMA_DEV}/usr/lib/pkgconfig
+	${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
+		${IDIR_LIBXINERAMA_DEV}/usr/lib/pkgconfig
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXp/Makefile b/package/libXp/Makefile
new file mode 100644
index 000000000..d01c734a0
--- /dev/null
+++ b/package/libXp/Makefile
@@ -0,0 +1,35 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		libXp
+PKG_VERSION:=		1.0.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		a960c831f11e6b4249fde78a5b969000
+PKG_DESCR:=		X Print library
+PKG_SECTION:=		x11/libs
+PKG_BUILDDEP:=		libXext printproto
+PKG_SITES:=		${MASTER_SITE_XORG}
+
+PKG_SUBPKGS:=		LIBXP LIBXP_DEV
+PKGSD_LIBXP_DEV:=	X Print headers
+PKGSC_LIBXP_DEV:=	x11/devel
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBXP,libpt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBXP_DEV,libpt-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXP_DEV},${PKGSC_LIBXP_DEV}))
+
+libxp-install:
+	${INSTALL_DIR} ${IDIR_LIBXP}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libXp.so* ${IDIR_LIBXP}/usr/lib
+
+libxp-dev-install:
+	${INSTALL_DIR} ${IDIR_LIBXP_DEV}/usr/include
+	${CP} ${WRKINST}/usr/include/* ${IDIR_LIBXP_DEV}/usr/include
+	${INSTALL_DIR} ${IDIR_LIBXP_DEV}/usr/lib/pkgconfig
+	${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
+		${IDIR_LIBXP_DEV}/usr/lib/pkgconfig
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libXtst/Makefile b/package/libXtst/Makefile
new file mode 100644
index 000000000..821bf5dee
--- /dev/null
+++ b/package/libXtst/Makefile
@@ -0,0 +1,37 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		libXtst
+PKG_VERSION:=		1.2.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		fd94ddca70e10eef4640e1f57b0301ee
+PKG_DESCR:=		Xtst library
+PKG_SECTION:=		x11/libs
+PKG_BUILDDEP:=		recordproto libXi
+PKG_SITES:=		${MASTER_SITE_XORG}
+
+PKG_SUBPKGS:=		LIBXTST LIBXTST_DEV
+PKGSD_LIBXTST_DEV:=	Xtst headers
+PKGSC_LIBXTST_DEV:=	x11/devel
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBXTST,libxtst,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBXTST_DEV,libxtst-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXTST_DEV},${PKGSC_LIBXTST_DEV}))
+
+CONFIGURE_ARGS+= 	--disable-malloc0returnsnull
+
+libxtst-install:
+	${INSTALL_DIR} ${IDIR_LIBXTST}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libXtst.so* ${IDIR_LIBXTST}/usr/lib
+
+libxtst-dev-install:
+	${INSTALL_DIR} ${IDIR_LIBXTST_DEV}/usr/include
+	${CP} ${WRKINST}/usr/include/* ${IDIR_LIBXTST_DEV}/usr/include
+	${INSTALL_DIR} ${IDIR_LIBXTST_DEV}/usr/lib/pkgconfig
+	${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
+		${IDIR_LIBXTST_DEV}/usr/lib/pkgconfig
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile
index 09345b198..41775218a 100644
--- a/package/openjdk/Makefile
+++ b/package/openjdk/Makefile
@@ -15,7 +15,8 @@ PKG_MD5SUM:=		2d2bbbb0f9b81f1fec41ec730da8a933 \
 			d526d0848c88607ce4e3a0a4edb75d50
 PKG_DESCR:=		OpenJDK Java VM
 PKG_SECTION:=		lang
-PKG_BUILDDEP:=		xproto jpeg zlib libX11 libpng freetype cups
+PKG_BUILDDEP:=		alsa-lib xproto jpeg zlib libX11 libpng freetype cups
+PKG_BUILDDEP+=		libXt libXp libXinerama libXrender libXtst
 PKG_URL:=		http://openjdk.org/
 PKG_SITES:=		http://download.java.net/openjdk/jdk6/promoted/b22/ \
 			http://mirror.netcologne.de/apache.org/xml/xalan-j/binaries/ \
diff --git a/package/printproto/Makefile b/package/printproto/Makefile
new file mode 100644
index 000000000..63a09d3d6
--- /dev/null
+++ b/package/printproto/Makefile
@@ -0,0 +1,25 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		printproto
+PKG_VERSION:=		1.0.5
+PKG_RELEASE:=		1
+PKG_DESCR:=		X Print Extension headers
+PKG_SECTION:=		x11/devel
+PKG_MD5SUM:=		5afeb3a7de8a14b417239a14ea724268
+PKG_SITES:=		http://xorg.freedesktop.org/releases/individual/proto/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,PRINTPROTO,printproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+post-install:
+	${INSTALL_DIR} ${IDIR_PRINTPROTO}/usr/include
+	${CP} ${WRKINST}/usr/include/X11 ${IDIR_PRINTPROTO}/usr/include
+	${INSTALL_DIR} ${IDIR_PRINTPROTO}/usr/lib/pkgconfig
+	${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
+		${IDIR_PRINTPROTO}/usr/lib/pkgconfig
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xineramaproto/Makefile b/package/xineramaproto/Makefile
new file mode 100644
index 000000000..9f920d70b
--- /dev/null
+++ b/package/xineramaproto/Makefile
@@ -0,0 +1,25 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		xineramaproto
+PKG_VERSION:=		1.2
+PKG_RELEASE:=		1
+PKG_DESCR:=		Xinerama Extension headers
+PKG_SECTION:=		x11/devel
+PKG_MD5SUM:=		1e98484ffa9b0eb6ab9d00cd53bfe74f
+PKG_SITES:=		http://xorg.freedesktop.org/releases/individual/proto/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,XINERAMAPROTO,xineramaproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+post-install:
+	${INSTALL_DIR} ${IDIR_XINERAMAPROTO}/usr/include
+	${CP} ${WRKINST}/usr/include/X11 ${IDIR_XINERAMAPROTO}/usr/include
+	${INSTALL_DIR} ${IDIR_XINERAMAPROTO}/usr/lib/pkgconfig
+	${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
+		${IDIR_XINERAMAPROTO}/usr/lib/pkgconfig
+
+include ${TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3


From 7356a92fbf59f66521b2e7fdd478b0fa63df052d Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 6 Apr 2011 14:25:15 +0200
Subject: add wrappers for ecj and gij, allow to start openjdk bootstrap target
 jdk compile

---
 jtools/ecj/Makefile      |  9 ++++++++-
 jtools/gcj/Makefile      |  6 +++---
 package/openjdk/Makefile | 43 ++++++++++++++++++++++++++++---------------
 3 files changed, 39 insertions(+), 19 deletions(-)

(limited to 'jtools')

diff --git a/jtools/ecj/Makefile b/jtools/ecj/Makefile
index 32cfdeb53..a67e9ebd8 100644
--- a/jtools/ecj/Makefile
+++ b/jtools/ecj/Makefile
@@ -18,9 +18,16 @@ ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj:
 		LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \
 		PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$$PATH \
 	$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj -g -O2 -findirect-dispatch \
-		-o ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj \
+		-o ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj.native \
 		--main=org.eclipse.jdt.internal.compiler.batch.Main \
 		$(TOPDIR)/jtools_build/gcc-4.5.2/ecj.jar
 	$(CP) $(TOPDIR)/jtools_build/gcc-4.5.2/ecj.jar ${STAGING_JAVA_HOST_DIR}/usr/share/ecj.jar
+	echo "env LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj.native \$$@" > \
+		${STAGING_JAVA_HOST_DIR}/usr/bin/ecj
+	chmod u+x ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj
+	# put a wrapper for java here
+	echo "env LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 ${STAGING_JAVA_HOST_DIR}/usr/bin/gij \$$@" > \
+		${STAGING_JAVA_HOST_DIR}/usr/bin/java
+	chmod u+x ${STAGING_JAVA_HOST_DIR}/usr/bin/java
 
 include $(TOPDIR)/mk/tools.mk
diff --git a/jtools/gcj/Makefile b/jtools/gcj/Makefile
index ea41ca671..7ccd03c15 100644
--- a/jtools/gcj/Makefile
+++ b/jtools/gcj/Makefile
@@ -26,9 +26,9 @@ $(WRKBUILD)/.configured: ${WRKDIST}/.prepared
 			--enable-java-home \
 			--enable-languages=java \
 			--with-ffi \
-			--with-mpc=$(STAGING_HOST_DIR) \
-			--with-mpfr=$(STAGING_HOST_DIR) \
-			--with-gmp=$(STAGING_HOST_DIR) \
+			--with-mpc=$(STAGING_HOST_DIR)/usr \
+			--with-mpfr=$(STAGING_HOST_DIR)/usr \
+			--with-gmp=$(STAGING_HOST_DIR)/usr \
 			--disable-libmudflap \
 			--disable-libgomp \
 			--disable-biarch \
diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile
index 41775218a..8802ee529 100644
--- a/package/openjdk/Makefile
+++ b/package/openjdk/Makefile
@@ -54,6 +54,9 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,OPENJDK,openjdk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+TARGET_CFLAGS:=         $(filter-out -fhonour-copts,$(TARGET_CFLAGS))
 
 ifeq ($(ADK_PACKAGE_OPENJDK_ZERO),y)
 CONFIGURE_ARGS+=	--enable-zero
@@ -62,29 +65,33 @@ ifeq ($(ADK_PACKAGE_OPENJDK_SHARK),y)
 CONFIGURE_ARGS+=	--enable-shark
 endif
 
+BOOTSTRAPJDK:=		${WRKDIST}/bootstrap-jdk
 CONFIGURE_ARGS+=	--disable-docs \
 			--enable-bootstrap \
 			--enable-openjdk-cross-compilation \
+			--with-cc-for-build=$(CC_FOR_BUILD) \
 			--with-openjdk-src-dir=$(WRKDIST)/$(PKG_NAME)-$(PKG_VERSION) \
 			--with-xalan2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xalan.jar \
 			--with-xalan2-serializer-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/serializer.jar \
 			--with-xerces2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xercesImpl.jar \
-			--with-jdk-home=$(WRKSRC)/openjdk.build/j2sdk-image \
-			--with-java=$(WRKSRC)/openjdk.build/j2sdk-image/bin/java \
-			--with-javac=$(WRKSRC)/openjdk.build/j2sdk-image/bin/javac \
-			--with-javah=$(WRKSRC)/openjdk.build/j2sdk-image/bin/javah \
-			--with-jar=$(WRKSRC)/openjdk.build/j2sdk-image/bin/jar \
-			--with-rmic=$(WRKSRC)/openjdk.build/j2sdk-image/bin/rmic \
-			--with-native2ascii=$(WRKSRC)/openjdk.build/j2sdk-image/bin/native2ascii \
+			--with-jdk-home=$(BOOTSTRAPJDK) \
+			--with-java=$(BOOTSTRAPJDK)/bin/java \
+			--with-javac=$(BOOTSTRAPJDK)/bin/javac \
+			--with-javah=$(BOOTSTRAPJDK)/bin/javah \
+			--with-jar=$(BOOTSTRAPJDK)/bin/jar \
+			--with-rmic=$(BOOTSTRAPJDK)/bin/rmic \
+			--with-native2ascii=$(BOOTSTRAPJDK)/bin/native2ascii \
 			--without-rhino
 
-OPENJDK_BUILD_ENV+=	JAVACFLAGS="-cp ${STAGING_JAVA_HOST_DIR}/usr/share/java/libgcj-4.5.2.jar"
-OPENJDK_BUILD_ENV+=	DYLD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64
-OPENJDK_BUILD_ENV+=	LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64
-OPENJDK_BUILD_ENV+=	ADK_ECJ=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj
+OPENJDK_NATIVE_ENV+=	JAVACFLAGS="-cp ${STAGING_JAVA_HOST_DIR}/usr/share/java/libgcj-4.5.2.jar"
+OPENJDK_NATIVE_ENV+=	DYLD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64
+OPENJDK_NATIVE_ENV+=	LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64
+OPENJDK_NATIVE_ENV+=	ADK_ECJ=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj
+
+OPENJDK_BUILD_ENV+=	ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/bin
 
 do-extract:
-	cd ${WRKDIST}; mkdir $(PKG_NAME)-$(PKG_VERSION) ; \
+	cd ${WRKDIST}; mkdir $(PKG_NAME)-$(PKG_VERSION); \
 		tar xzf $(TOPDIR)/dl/$(PKG_NAME)-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz -C $(PKG_NAME)-$(PKG_VERSION)
 	cd $(WRKDIST); tar xzf $(TOPDIR)/dl/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz
 	cd ${WRKDIST}; tar xzf ${TOPDIR}/dl/${XALAN_NAME}_${XALAN_VERSION}-bin.tar.gz
@@ -94,13 +101,13 @@ do-extract:
 
 pre-configure:
 	cd ${WRKBUILD}; rm -rf config.{cache,status}; \
-	export ${OPENJDK_BUILD_ENV}; ./configure \
+	export ${OPENJDK_NATIVE_ENV}; ./configure \
 		--enable-bootstrap \
 		--enable-zero \
 		--disable-openjdk-cross-compilation \
 		--with-openjdk-src-dir=$(WRKDIST)/$(PKG_NAME)-$(PKG_VERSION) \
 		--with-jdk-home=$(STAGING_JAVA_HOST_DIR)/usr/lib/jvm \
-		--with-java=$(STAGING_JAVA_HOST_DIR)/usr/bin/gij \
+		--with-java=$(STAGING_JAVA_HOST_DIR)/usr/bin/java \
 		--with-javac=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj \
 		--with-gcj=$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj \
 		--with-ecj-jar=${STAGING_JAVA_HOST_DIR}/usr/share/ecj.jar \
@@ -109,7 +116,13 @@ pre-configure:
 		--with-xerces2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xercesImpl.jar \
 		--without-rhino \
 		--disable-docs \
-	;${MAKE}
+	&& $(MAKE) && $(CP) $(WRKSRC)/openjdk.build/j2sdk-image ${WRKDIST}/bootstrap-jdk && $(MAKE) clean && rm -rf ${WRKBUILD}/openjdk-old
+
+do-build:
+	cd ${WRKBUILD}; export $(OPENJDK_BUILD_ENV); make
+
+do-install:
+	cd ${WRKBUILD}; make install
 
 openjdk-install:
 	$(INSTALL_DIR) $(IDIR_OPENJDK)/usr/bin
-- 
cgit v1.2.3