summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore1
-rw-r--r--jtools/cacao/Makefile19
-rw-r--r--jtools/classpath/Makefile2
-rw-r--r--jtools/ecj/Makefile11
-rw-r--r--jtools/gcj/Makefile25
-rw-r--r--jtools/jamvm/Makefile12
-rw-r--r--mk/build.mk10
-rw-r--r--package/openjdk/Makefile96
-rw-r--r--package/openjdk/patches/patch-icedtea6-1_10_Makefile_in28
-rwxr-xr-xscripts/reloc.sh2
-rwxr-xr-xscripts/sha256sum5
-rw-r--r--toolchain/Config.in12
12 files changed, 148 insertions, 75 deletions
diff --git a/.gitignore b/.gitignore
index c71f2df96..eb1f71724 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,6 +44,7 @@
/jtools_build/
/extra/
/.menu
+/.adkinit
/target/*/Config.in.systems
/target/*/sys-enabled
/target/packages/pkg-enabled
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/jtools/classpath/Makefile b/jtools/classpath/Makefile
index 253f9604d..d4421bf9a 100644
--- a/jtools/classpath/Makefile
+++ b/jtools/classpath/Makefile
@@ -23,6 +23,8 @@ $(WRKBUILD)/.configured: ${WRKDIST}/.prepared
--disable-dssi \
--disable-plugin \
--disable-examples \
+ --disable-gjdoc \
+ --with-jar=no \
--disable-Werror)
touch $@
diff --git a/jtools/ecj/Makefile b/jtools/ecj/Makefile
index ffa6cd43e..32cfdeb53 100644
--- a/jtools/ecj/Makefile
+++ b/jtools/ecj/Makefile
@@ -13,10 +13,13 @@ 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 \
+ 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 \
+ -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/jtools/gcj/Makefile b/jtools/gcj/Makefile
index ba31c27ea..ea41ca671 100644
--- a/jtools/gcj/Makefile
+++ b/jtools/gcj/Makefile
@@ -14,28 +14,37 @@ WRKDIST= ${WRKDIR}/gcc-${PKG_VERSION}
include ../rules.mk
+GCJ_ENV+= JAR=no
+
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) \
+ env ${GCJ_ENV} ./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 \
+ --disable-libgomp \
+ --disable-biarch \
+ --disable-decimal-float \
+ --disable-multilib \
+ --disable-bootstrap \
);
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
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
diff --git a/mk/build.mk b/mk/build.mk
index acc0d0351..faa39e258 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -234,7 +234,7 @@ cleandir:
rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) \
${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d
rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_HOST_DIR_PFX) $(TOOLS_BUILD_DIR)
- rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX)
+ rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) $(JTOOLS_BUILD_DIR) $(STAGING_JAVA_HOST_DIR)
rm -f .menu .tmpconfig.h .rebuild* ${TOPDIR}/package/Depends.mk ${TOPDIR}/prereq.mk
cleantarget:
@@ -248,9 +248,9 @@ distclean:
@$(TRACE) distclean
@$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE)
@rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) \
- ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d
+ ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d $(JTOOLS_BUILD_DIR)
@rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_HOST_DIR_PFX) $(TOOLS_BUILD_DIR)
- @rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX)
+ @rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) $(STAGING_JAVA_HOST_DIR)
@rm -f .adkinit .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \
.menu ${TOPDIR}/package/Depends.mk .ADK_HAVE_DOT_CONFIG .rebuild.*
@@ -477,9 +477,9 @@ _mconfig2: ${CONFIG}/conf modconfig .menu
distclean:
@$(MAKE) -C $(CONFIG) clean
@rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) \
- ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d
+ ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d $(JTOOLS_BUILD_DIR)
@rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_TARGET_DIR_PFX) $(TOOLS_BUILD_DIR)
- @rm -rf $(STAGING_HOST_DIR_PFX) $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX)
+ @rm -rf $(STAGING_HOST_DIR_PFX) $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) $(STAGING_JAVA_HOST_DIR)
@rm -f .adkinit .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \
.menu .rebuild.* ${TOPDIR}/package/Depends.mk .ADK_HAVE_DOT_CONFIG
diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile
index 2f861e053..ff606bee3 100644
--- a/package/openjdk/Makefile
+++ b/package/openjdk/Makefile
@@ -7,21 +7,38 @@ PKG_NAME:= openjdk
PKG_VERSION:= 6
PKG_EXTRAVER:= b22-28_feb_2011
PKG_RELEASE:= 1
-PKG_MD5SUM:= 2d2bbbb0f9b81f1fec41ec730da8a933 fd3f35e8a8a2ef9a64c035ed66cea06d
+PKG_MD5SUM:= 2d2bbbb0f9b81f1fec41ec730da8a933 \
+ fd3f35e8a8a2ef9a64c035ed66cea06d \
+ ef7a8b3624ea904bf584bc46d79b5e75 \
+ bc95c133620bd68c161cac9891592901 \
+ 91adfd41e6f001add4f92ae31216b1e3 \
+ d526d0848c88607ce4e3a0a4edb75d50
PKG_DESCR:= OpenJDK Java VM
PKG_SECTION:= lang
PKG_BUILDDEP:= xproto jpeg zlib libX11 libpng freetype
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/ \
+ http://icedtea.classpath.org/download/drops/ \
http://icedtea.classpath.org/download/source/
# autotools infrastructure for OpenJDK
ICEDTEA_NAME:= icedtea6
ICEDTEA_VERSION:= 1.10
-DISTFILES:= $(PKG_NAME)-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz $(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz
+# bootstrap JARs
+XALAN_NAME= xalan-j
+XALAN_VERSION= 2_7_0
+
+DISTFILES:= $(PKG_NAME)-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz \
+ $(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz \
+ jaxp144_01.zip \
+ jdk6-jaf-b20.zip \
+ jdk6-jaxws-b20.zip \
+ ${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
@@ -41,47 +58,62 @@ 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=/usr/share/java/xalan.jar \
- --with-xalan2-serializer-jar=/usr/share/java/serializer.jar \
- --with-xerces2-jar=/usr/share/java/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 ${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
pre-configure:
- (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" \
- ./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-ecj-jar=${STAGING_JAVA_HOST_DIR}/usr/share/ecj.jar \
- --disable-docs \
- --disable-openjdk-cross-compilation \
- --with-xalan2-jar=/usr/share/java/xalan.jar \
- --with-xalan2-serializer-jar=/usr/share/java/serializer.jar \
- --with-xerces2-jar=/usr/share/java/xercesImpl.jar \
- --without-rhino \
- --disable-xrender \
- --disable-nss \
- );
- (cd $(WRKBUILD)/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION) ; ${MAKE})
+ 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=$(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}
openjdk-install:
$(INSTALL_DIR) $(IDIR_OPENJDK)/usr/bin
diff --git a/package/openjdk/patches/patch-icedtea6-1_10_Makefile_in b/package/openjdk/patches/patch-icedtea6-1_10_Makefile_in
index 7e19f5159..b0464fb38 100644
--- a/package/openjdk/patches/patch-icedtea6-1_10_Makefile_in
+++ b/package/openjdk/patches/patch-icedtea6-1_10_Makefile_in
@@ -1,5 +1,5 @@
---- w-openjdk-6-1.orig/icedtea6-1.10/Makefile.in 2011-03-02 20:48:45.161291458 +0100
-+++ w-openjdk-6-1/icedtea6-1.10/Makefile.in 2011-03-28 17:00:03.591807998 +0200
+--- w-openjdk-6-1.orig/icedtea6-1.10/Makefile.in 2011-03-02 20:48:45.000000000 +0100
++++ w-openjdk-6-1/icedtea6-1.10/Makefile.in 2011-04-02 23:33:17.000000000 +0200
@@ -1329,7 +1329,7 @@ stamps/extract-openjdk.stamp: stamps/dow
@OPENJDK_SRC_DIR_FOUND_TRUE@ cp -pPR $(OPENJDK_SRC_DIR_LINK) $(OPENJDK_SRC_DIR) openjdk ; \
@OPENJDK_SRC_DIR_FOUND_TRUE@ fi
@@ -18,12 +18,24 @@
fi
mkdir -p stamps
touch stamps/extract-ecj.stamp
-@@ -1644,7 +1644,7 @@ clean-patch-ecj:
+@@ -1642,11 +1642,15 @@ clean-patch-ecj:
+ # ===========================
+
stamps/native-ecj.stamp:
- mkdir -p stamps ; \
- if test "x$(GCJ)" != "xno"; then \
+- mkdir -p stamps ; \
+- if test "x$(GCJ)" != "xno"; then \
- $(GCJ) $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
-+ $(GCJ) -static $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
- --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} ; \
- fi ; \
+- --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} ; \
+- fi ; \
++ if test -n "${ADK_ECJ}" && test -x "${ADK_ECJ}"; then \
++ ln -s "${ADK_ECJ}" native-ecj; \
++ else \
++ mkdir -p stamps ; \
++ if test "x$(GCJ)" != "xno"; then \
++ $(GCJ) $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
++ --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} ; \
++ fi ; \
++ fi; \
touch stamps/native-ecj.stamp
+
+ clean-native-ecj:
diff --git a/scripts/reloc.sh b/scripts/reloc.sh
index 59323612f..03034ea35 100755
--- a/scripts/reloc.sh
+++ b/scripts/reloc.sh
@@ -4,7 +4,7 @@
olddir=$(grep "^TOPDIR" prereq.mk 2>/dev/null |cut -d '=' -f 2)
newdir=$(pwd)
-if [ ! -z $olddir ];then
+if [ ! -z "$olddir" ];then
if [ "$olddir" != "$newdir" ];then
echo "adk directory relocated!"
echo "old directory: $olddir"
diff --git a/scripts/sha256sum b/scripts/sha256sum
index da34d9113..2a7ffb6f7 100755
--- a/scripts/sha256sum
+++ b/scripts/sha256sum
@@ -4,6 +4,11 @@
if [ -x /usr/bin/sha256sum ]; then
/usr/bin/sha256sum "$@"
+elif [ -x /bin/cksum ] && [ $(echo | cksum -a sha256) = 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b ]; then
+ # we assume the arguments are exactly "-c" or "-c -"
+ x=$(sed 's/^\([0-9a-fA-F]*\) *\([^ ].*\)$/SHA256 (\2) = \1/' | cksum -c -a sha256)
+ [[ $x = *FAILED* ]] && exit 1
+ exit 0
else
tmp=$(mktemp -t yyy)
cat - > $tmp
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 12:01:18 +0000