diff options
69 files changed, 1618 insertions, 1788 deletions
diff --git a/jtools/Makefile b/jtools/Makefile deleted file mode 100644 index 23d93a6d4..000000000 --- a/jtools/Makefile +++ /dev/null @@ -1,30 +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 - -TARGETS:= -# jikes is for ant -ifneq ($(ADK_PACKAGE_OPENJDK7),) -TARGETS:=fastjar gcj ecj jikes classpath jamvm ant openjdk7 -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/ant/Makefile b/jtools/ant/Makefile deleted file mode 100644 index 1741ed703..000000000 --- a/jtools/ant/Makefile +++ /dev/null @@ -1,33 +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:= ant -PKG_VERSION:= 1.8.4 -PKG_RELEASE:= 1 -PKG_MD5SUM:= c474fa9d0c35a24037c23b6e476862c1 -PKG_SITES:= http://archive.apache.org/dist/ant/source/ - -DISTFILES:= apache-$(PKG_NAME)-$(PKG_VERSION)-src.tar.bz2 -WRKDIST= $(WRKDIR)/apache-$(PKG_NAME)-$(PKG_VERSION) - -include ../rules.mk - -install: ${STAGING_JAVA_HOST_DIR}/usr/bin/ant - -$(WRKBUILD)/.compiled: ${WRKDIST}/.prepared - cd $(WRKBUILD)/lib/optional; wget http://openadk.org/distfiles/junit-4.9b2.jar - cp $(STAGING_JAVA_HOST_DIR)/usr/share/java/ecj.jar $(WRKBUILD)/lib/optional - cd ${WRKBUILD}; export BOOTJAVAC_OPTS="-bootclasspath $(STAGING_JAVA_HOST_DIR)/usr/share/classpath/glibj.zip" \ - LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \ - JAVA_HOME=$(STAGING_JAVA_HOST_DIR)/usr/lib/jvm ; \ - $(BASH) build.sh - touch $@ - -${STAGING_JAVA_HOST_DIR}/usr/bin/ant: $(WRKBUILD)/.compiled - cd $(WRKBUILD)/dist; \ - $(CP) bin/* $(STAGING_JAVA_HOST_DIR)/usr/bin ; \ - $(CP) lib/* $(STAGING_JAVA_HOST_DIR)/usr/lib - -include $(TOPDIR)/mk/tools.mk diff --git a/jtools/ant/junit-4.9b2.jar b/jtools/ant/junit-4.9b2.jar Binary files differdeleted file mode 100644 index aec30a07f..000000000 --- a/jtools/ant/junit-4.9b2.jar +++ /dev/null diff --git a/jtools/classpath/Makefile b/jtools/classpath/Makefile deleted file mode 100644 index 06f59e1a0..000000000 --- a/jtools/classpath/Makefile +++ /dev/null @@ -1,42 +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:= 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 - -CPENV:= LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \ - PATH=${STAGING_JAVA_HOST_DIR}/usr/bin:$$PATH \ - CLASSPATH=${STAGING_JAVA_HOST_DIR}/usr/share/java/libgcj-$(GCJ_VER).jar - -$(WRKBUILD)/.configured: ${WRKDIST}/.prepared - (cd $(WRKBUILD); env $(CPENV) ./configure --prefix=${STAGING_JAVA_HOST_DIR}/usr \ - --disable-local-sockets \ - --disable-alsa \ - --disable-gconf-peer \ - --disable-gtk-peer \ - --disable-qt-peer \ - --disable-dssi \ - --disable-plugin \ - --disable-examples \ - --disable-gjdoc \ - --with-jar=no \ - --disable-Werror) - touch $@ - -$(WRKBUILD)/.compiled: ${WRKDIST}/.configured - env $(CPENV) ${MAKE} -C ${WRKBUILD} - touch $@ - -${STAGING_JAVA_HOST_DIR}/usr/share/classpath/glibj.zip: $(WRKBUILD)/.compiled - ${MAKE} -C ${WRKBUILD} install - -include $(TOPDIR)/mk/tools.mk diff --git a/jtools/ecj/Makefile b/jtools/ecj/Makefile deleted file mode 100644 index 2154bedce..000000000 --- a/jtools/ecj/Makefile +++ /dev/null @@ -1,36 +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:= ecj -PKG_VERSION:= 1 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 63220327925ace13756ae334c55a3baa - -include ../rules.mk - -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 -lgcj -O2 -findirect-dispatch \ - -o ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj.native \ - --main=org.eclipse.jdt.internal.compiler.batch.Main \ - $(TOPDIR)/jtools_build/gcc-$(GCJ_VER)/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 - mv ${STAGING_JAVA_HOST_DIR}/usr/bin/gij ${STAGING_JAVA_HOST_DIR}/usr/bin/gij.native - echo "env LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 ${STAGING_JAVA_HOST_DIR}/usr/bin/gij.native \"\$$@\"" > \ - ${STAGING_JAVA_HOST_DIR}/usr/bin/java - chmod u+x ${STAGING_JAVA_HOST_DIR}/usr/bin/java - echo "env LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 ${STAGING_JAVA_HOST_DIR}/usr/bin/gij.native \"\$$@\"" > \ - ${STAGING_JAVA_HOST_DIR}/usr/bin/gij - chmod u+x ${STAGING_JAVA_HOST_DIR}/usr/bin/gij - -include $(TOPDIR)/mk/tools.mk diff --git a/jtools/fastjar/Makefile b/jtools/fastjar/Makefile deleted file mode 100644 index 744776eac..000000000 --- a/jtools/fastjar/Makefile +++ /dev/null @@ -1,27 +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:= 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/files.needed b/jtools/files.needed deleted file mode 100644 index c6a1de4ba..000000000 --- a/jtools/files.needed +++ /dev/null @@ -1,11 +0,0 @@ -cups.h;libcups -jpeglib.h;libjpeg -gif_lib.h;libgif -png.h;libpng -Xtos.h;libXt -Xinerama.h;libXinerama -Xrender.h;libXrender -XTest.h;libXtst -freetype.h;freetype -asoundlib.h;libasound -ffi.h;libffi diff --git a/jtools/jamvm/Makefile b/jtools/jamvm/Makefile deleted file mode 100644 index 1775ff5aa..000000000 --- a/jtools/jamvm/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:= jamvm -PKG_VERSION:= 1.5.4 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 7654e9657691f5f09c4f481ed4686176 -PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jamvm/} - -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=$(STAGING_JAVA_HOST_DIR)/usr \ - --with-classpath-install-dir=$(STAGING_JAVA_HOST_DIR)/usr - touch $@ - -$(WRKBUILD)/.compiled: ${WRKDIST}/.configured - ${MAKE} -C ${WRKBUILD} $(MAKE_TRACE) - touch $@ - -${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm: $(WRKBUILD)/.compiled - ${MAKE} -C ${WRKBUILD} install $(MAKE_TRACE) - ln -sf ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/bin/java - ln -sf ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/jre/bin/java - -include $(TOPDIR)/mk/tools.mk diff --git a/jtools/jikes/Makefile b/jtools/jikes/Makefile deleted file mode 100644 index 1d619c8eb..000000000 --- a/jtools/jikes/Makefile +++ /dev/null @@ -1,31 +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:= jikes -PKG_VERSION:= 1.22 -PKG_RELEASE:= 1 -PKG_MD5SUM:= cda958c7fef6b43b803e1d1ef9afcb85 -PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jikes/Jikes/1.22/} - -DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 - -include ../rules.mk - -install: ${STAGING_JAVA_HOST_DIR}/usr/bin/jikes - -$(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/jikes: $(WRKBUILD)/.compiled - ${MAKE} -C ${WRKBUILD} DESTDIR=$(STAGING_JAVA_HOST_DIR) install $(MAKE_TRACE) - $(CP) ${STAGING_JAVA_HOST_DIR}/usr/bin/jikes ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/bin/javac - $(CP) ${STAGING_JAVA_HOST_DIR}/usr/bin/jikes ${STAGING_JAVA_HOST_DIR}/usr/lib/jvm/jre/bin/javac - -include $(TOPDIR)/mk/tools.mk diff --git a/jtools/openjdk7/Makefile b/jtools/openjdk7/Makefile deleted file mode 100644 index 58db553fe..000000000 --- a/jtools/openjdk7/Makefile +++ /dev/null @@ -1,58 +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:= icedtea -PKG_VERSION:= 2.3.12 -PKG_RELEASE:= 1 -PKG_MD5SUM:= 9b3afa162021e3fca6161ba8f9f7dc11 -PKG_DESCR:= OpenJDK 7 Java VM -PKG_SECTION:= lang -PKG_URL:= http://openjdk.org/ -PKG_SITES:= http://icedtea.classpath.org/download/source/ - -include ../rules.mk - -OPENJDK_NATIVE_ENV+= JAVACFLAGS="-cp ${STAGING_JAVA_HOST_DIR}/usr/share/java/libgcj-$(GCJ_VER).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 PATH=$$PATH:$(STAGING_JAVA_HOST_DIR)/usr/bin -OPENJDK_NATIVE_ENV+= BOOTCLASSPATH="$(STAGING_JAVA_HOST_DIR)/usr/share/jamvm/classes.zip:$(STAGING_JAVA_HOST_DIR)/usr/share/classpath/glibj.zip" - -install: ${STAGING_JAVA_HOST_DIR}/bootstrap-jdk/bin/java - -CONFIGURE_ARGS+=\ - --enable-bootstrap \ - --enable-zero \ - --with-jdk-home=$(STAGING_JAVA_HOST_DIR)/usr/lib/jvm \ - --with-java=$(STAGING_JAVA_HOST_DIR)/usr/bin/java \ - --with-javac=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj \ - --with-ecj-jar=${STAGING_JAVA_HOST_DIR}/usr/share/java/ecj.jar \ - --without-hotspot-build \ - --disable-system-kerberos \ - --disable-system-jpeg \ - --disable-system-lcms \ - --disable-system-zlib \ - --disable-system-png \ - --disable-system-gif \ - --disable-system-gtk \ - --disable-system-gio \ - --disable-system-fontconfig \ - --disable-compile-against-syscalls \ - --without-rhino \ - --disable-docs - -$(WRKDIST)/.configured: ${WRKDIST}/.prepared - (cd ${WRKBUILD}; export ${OPENJDK_NATIVE_ENV}; ./configure ${CONFIGURE_ARGS}) - touch $@ - -$(WRKBUILD)/.compiled: ${WRKDIST}/.configured - export ${OPENJDK_NATIVE_ENV}; $(MAKE) -C $(WRKBUILD) icedtea-boot - touch $@ - -${STAGING_JAVA_HOST_DIR}/bootstrap-jdk/bin/java: $(WRKBUILD)/.compiled - $(CP) $(WRKSRC)/openjdk.build-boot/j2sdk-image $(STAGING_JAVA_HOST_DIR)/bootstrap-jdk - touch $@ - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/jtools/openjdk7/patches/openadk.patch b/jtools/openjdk7/patches/openadk.patch deleted file mode 100644 index 11eb2aea6..000000000 --- a/jtools/openjdk7/patches/openadk.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -Nur icedtea-2.3.4.orig/Makefile.in icedtea-2.3.4/Makefile.in ---- icedtea-2.3.4.orig/Makefile.in 2013-01-15 10:44:02.000000000 +0100 -+++ icedtea-2.3.4/Makefile.in 2013-02-11 17:32:45.000000000 +0100 -@@ -640,7 +640,7 @@ - $(am__append_14) $(am__append_15) $(DISTRIBUTION_PATCHES) - - # Bootstrapping patches --ICEDTEA_BOOT_PATCHES = patches/boot/javafiles.patch \ -+ICEDTEA_BOOT_PATCHES = patches/topdir-openwrt.patch patches/boot/javafiles.patch \ - patches/boot/ant-javac.patch patches/boot/corba-idlj.patch \ - patches/boot/corba-no-gen.patch patches/boot/corba-orb.patch \ - patches/boot/demos.patch patches/boot/ecj-fphexconstants.patch \ -@@ -2033,7 +2033,7 @@ - # Optional native ecj - stamps/native-ecj.stamp: - mkdir -p stamps --@BUILD_NATIVE_ECJ_TRUE@ ${GCJ} $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \ -+@BUILD_NATIVE_ECJ_TRUE@ ${GCJ} -lgcj $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \ - @BUILD_NATIVE_ECJ_TRUE@ --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} - touch $@ - -diff -Nur icedtea-2.3.4.orig/patches/topdir-openwrt.patch icedtea-2.3.4/patches/topdir-openwrt.patch ---- icedtea-2.3.4.orig/patches/topdir-openwrt.patch 1970-01-01 01:00:00.000000000 +0100 -+++ icedtea-2.3.4/patches/topdir-openwrt.patch 2013-02-12 09:37:29.000000000 +0100 -@@ -0,0 +1,14 @@ -+diff -Nur openjdk-boot.orig/Makefile icedtea7-forest-2-3-8bd8e70d4a03.2/Makefile -+--- openjdk-boot.orig/Makefile 2013-01-14 23:24:55.000000000 +0100 -++++ openjdk-boot/Makefile 2013-02-11 17:28:22.000000000 +0100 -+@@ -53,9 +53,7 @@ -+ REL_JDK_DEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-debug)/$(JDK_IMAGE_DIRNAME) -+ REL_JDK_FASTDEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-fastdebug)/$(JDK_IMAGE_DIRNAME) -+ -+-ifndef TOPDIR -+- TOPDIR:=. -+-endif -++TOPDIR:=. -+ -+ ifndef JDK_TOPDIR -+ JDK_TOPDIR=$(TOPDIR)/jdk diff --git a/jtools/prereq.sh b/jtools/prereq.sh deleted file mode 100644 index 2604de1ab..000000000 --- a/jtools/prereq.sh +++ /dev/null @@ -1,27 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -# test for existing /usr/include/asm -if [ ! -d "/usr/include/asm" ]; then - echo "ERROR: directory \"/usr/include/asm\" not found." - echo "on some systems this is name asm-generic." - echo "try to create a link to the asm directory with" - echo "\"ln -s /usr/include/asm-generic /usr/include/asm\"" - exit 1 -fi - -# test if all files from the files.needed file are available -for LINE in `cat files.needed`; do - - FILE=`echo ${LINE} | awk -F ";" '{print $1}'` - LIB=`echo ${LINE} | awk -F ";" '{print $2}'` - - #echo -n "looking for development files of \"${LIB}\"..." - FOUND=`find /usr/include /usr/lib -name "${FILE}" | wc -l` - if [ ${FOUND} -lt 1 ]; then - echo "not found!"; - echo "Please install the development header files for the library \"${LIB}\"." - exit 1 - fi - -done diff --git a/jtools/qemu/Makefile b/jtools/qemu/Makefile deleted file mode 100644 index b6add732e..000000000 --- a/jtools/qemu/Makefile +++ /dev/null @@ -1,32 +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:= qemu -PKG_VERSION:= 0.14.1 -PKG_RELEASE:= 1 -PKG_MD5SUM:= b6c713a8db638e173af53a62d5178640 -PKG_SITES:= http://download.savannah.gnu.org/releases/qemu/ - -include ../rules.mk - -install: ${STAGING_JAVA_HOST_DIR}/usr/bin/qemu-arm - -$(WRKBUILD)/.configured: ${WRKDIST}/.prepared - (cd $(WRKBUILD); ./configure --prefix=/usr \ - --host-cc=$(CC_FOR_BUILD) \ - --disable-system \ - --disable-sdl \ - --target-list=arm-linux-user,i386-linux-user,mipsel-linux-user,x86_64-linux-user \ - ) - touch $@ - -$(WRKBUILD)/.compiled: ${WRKDIST}/.configured - ${MAKE} -C ${WRKBUILD} $(MAKE_TRACE) - touch $@ - -${STAGING_JAVA_HOST_DIR}/usr/bin/qemu-arm: $(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 deleted file mode 100644 index 689d211a0..000000000 --- a/jtools/rules.mk +++ /dev/null @@ -1,8 +0,0 @@ -# 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} -GCJ_VER:= 4.7.3 - -include ${TOPDIR}/mk/buildhlp.mk diff --git a/mk/build.mk b/mk/build.mk index 86bb4bfcb..400125694 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -28,7 +28,6 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_PACKAGE_PACEMAKER=n \ ADK_PACKAGE_PACEMAKER_MGMTD=n \ ADK_PACKAGE_PACEMAKER_PYTHON_GUI=n \ - ADK_PACKAGE_OPENJDK7=n \ ADK_PACKAGE_CLASSPATH=n \ ADK_PACKAGE_GRUB=n \ ADK_PACKAGE_CRYPTINIT=n \ @@ -154,12 +153,12 @@ ifeq ($(ADK_NATIVE),y) else ifeq ($(ADK_TOOLCHAIN),y) ifeq ($(ADK_TOOLCHAIN_ONLY),y) - $(MAKE) -f mk/build.mk toolchain/fixup tools/install jtools/install package/compile + $(MAKE) -f mk/build.mk toolchain/fixup tools/install package/compile else - $(MAKE) -f mk/build.mk toolchain/fixup tools/install jtools/install package/compile root_clean package/install + $(MAKE) -f mk/build.mk toolchain/fixup tools/install package/compile root_clean package/install endif else - $(MAKE) -f mk/build.mk toolchain/fixup tools/install jtools/install target/config-prepare target/compile package/compile root_clean package/install target/install package_index + $(MAKE) -f mk/build.mk toolchain/fixup tools/install target/config-prepare target/compile package/compile root_clean package/install target/install package_index endif endif @@ -191,9 +190,6 @@ toolchain/%: ${STAGING_DIR} tools/%: $(MAKE) -C tools $(patsubst tools/%,%,$@) -jtools/%: - $(MAKE) -C jtools $(patsubst jtools/%,%,$@) - image: $(MAKE) -C target image @@ -274,7 +270,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) $(JTOOLS_BUILD_DIR) $(STAGING_JAVA_HOST_DIR) + rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) rm -f .menu .tmpconfig.h .rebuild* ${TOPDIR}/package/Depends.mk ${TOPDIR}/prereq.mk cleantarget: @@ -288,9 +284,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 $(JTOOLS_BUILD_DIR) + ${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) $(STAGING_JAVA_HOST_DIR) + @rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) |