diff options
34 files changed, 132 insertions, 1755 deletions
diff --git a/package/ant/Makefile b/package/ant/Makefile deleted file mode 100644 index b9d989ac3..000000000 --- a/package/ant/Makefile +++ /dev/null @@ -1,46 +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 $(ADK_TOPDIR)/rules.mk - -PKG_NAME:= ant -PKG_VERSION:= 1.8.4 -PKG_RELEASE:= 1 -PKG_HASH:= 5de65f7ba3f67e436ffffcdc0a73f591d1006e9fb41af8632c1f1f84d4a3e0b1 -PKG_DESCR:= java code build utility -PKG_SECTION:= dev/tools -HOST_BUILDDEP:= gcj-host -PKG_SITES:= http://archive.apache.org/dist/ant/source/ - -PKG_CFLINE_ANT:= depends on ADK_HOST_ONLY - -DISTFILES:= apache-$(PKG_NAME)-$(PKG_VERSION)-src.tar.bz2 -WRKDIST= $(WRKDIR)/apache-$(PKG_NAME)-$(PKG_VERSION) - -include $(ADK_TOPDIR)/mk/host.mk -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call HOST_template,ANT,ant,$(PKG_VERSION)-${PKG_RELEASE})) - -HOST_STYLE:= manual - -host-build: - if [ ! -f $(WRKBUILD)/lib/optional/junit-4.9b2.jar ];then \ - cd $(WRKBUILD)/lib/optional; wget http://distfiles.openadk.org/junit-4.9b2.jar; \ - fi - cp $(DL_DIR)/ecj*.jar $(WRKBUILD)/lib/optional/ecj.jar - (cd ${WRKBUILD}; \ - export ANT_OPTS="-Xms256m -Xmx256m" ;\ - export JAVA_HOME=$(STAGING_HOST_DIR)/usr/lib/jvm ;\ - export CLASSPATH=$(STAGING_HOST_DIR)/usr/lib/jvm/lib/tools.jar ;\ - export JAVAC=$(STAGING_HOST_DIR)/usr/bin/ecj ;\ - export JAVACMD=$(STAGING_HOST_DIR)/usr/bin/gij ;\ - $(BASH) ./build.sh) - -ant-hostinstall: - cd $(WRKBUILD)/dist; \ - $(CP) bin/* $(STAGING_HOST_DIR)/usr/bin ; \ - $(CP) lib/* $(STAGING_HOST_DIR)/usr/lib - -include ${ADK_TOPDIR}/mk/host-bottom.mk -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index 5d9f10881..ced4fbacc 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= asterisk -PKG_VERSION:= 20.11.1 +PKG_VERSION:= 22.3.0 PKG_RELEASE:= 1 -PKG_HASH:= 5ad25c136c7772f0ad10ae02d59f19b32c0cf64027278e3de6a6314ee24d5ff9 +PKG_HASH:= 9cd9a29db5ebff861431f85b317a1f8263d49587f596886df1fcd298bd545593 PKG_DESCR:= open source pbx PKG_SECTION:= net/voip PKG_DEPENDS:= libncurses libcurl libopenssl libedit libuuid libjansson diff --git a/package/barebox/Makefile b/package/barebox/Makefile index b4490f1d6..6a78a32c4 100644 --- a/package/barebox/Makefile +++ b/package/barebox/Makefile @@ -4,15 +4,17 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= barebox -PKG_VERSION:= 2019.09.0 +PKG_VERSION:= 2025.03.0 PKG_RELEASE:= 1 -PKG_HASH:= beab6bdba2466bece57d23834daf4f0d530a594efc11ca0ddb69372981e6e159 +PKG_HASH:= 0bf7118004e445bdd57feeef89ee9064982acc221e8a046c4a7994d3da6da2ec PKG_DESCR:= portable bootloader PKG_SECTION:= base/boot PKG_BUILDDEP:= lzop-host PKG_URL:= http://www.barebox.org PKG_SITES:= http://www.barebox.org/download/ +PKG_ARCH_DEPENDS:= aarch64 arm mips or1k ppc riscv32 riscv64 x86_64 + DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 include $(ADK_TOPDIR)/mk/package.mk @@ -25,15 +27,19 @@ BUILD_STYLE:= manual INSTALL_STYLE:= manual BAREBOX_ARCH:= $(ADK_TARGET_ARCH) -ifeq ($(ADK_TARGET_ARCH_X86),y) -CONFIG:= efi_defconfig -endif ifeq ($(ADK_TARGET_ARCH_X86_64),y) CONFIG:= efi_defconfig BAREBOX_ARCH:= x86 +BAREBOX:= barebox.efi endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_MIPS),y) +ifeq ($(ADK_TARGET_LITTLE_ENDIAN),y) +CONFIG:= qemu-maltael_defconfig +BAREBOX:= images/barebox-qemu-malta.img.swapped +else CONFIG:= qemu-malta_defconfig +BAREBOX:= images/barebox-qemu-malta.img +endif endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9),y) CONFIG:= vexpress_ca9_defconfig @@ -53,6 +59,6 @@ do-build: $(MAKE)) barebox-install: - $(CP) $(WRKBUILD)/barebox.bin $(FW_DIR) + $(CP) $(WRKBUILD)/$(BAREBOX) $(FW_DIR) include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/ecj/Makefile b/package/ecj/Makefile deleted file mode 100644 index 26bace2c8..000000000 --- a/package/ecj/Makefile +++ /dev/null @@ -1,43 +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 $(ADK_TOPDIR)/rules.mk - -PKG_NAME:= ecj -PKG_VERSION:= 4.9 -PKG_RELEASE:= 1 -PKG_HASH:= 9506e75b862f782213df61af67338eb7a23c35ff425d328affc65585477d34cd -PKG_DESCR:= ecj java compiler -PKG_SECTION:= dev/lang -PKG_SITES:= ftp://sourceware.org/pub/java/ - -PKG_CFLINE_ECJ:= depends on ADK_HOST_ONLY -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.jar - -include $(ADK_TOPDIR)/mk/host.mk -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call HOST_template,ECJ,ecj,$(PKG_VERSION)-${PKG_RELEASE})) - -HOST_STYLE:= manual - -ecj-hostinstall: - env LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 \ - $(STAGING_HOST_DIR)/usr/bin/gcj -lgcj -O2 -findirect-dispatch \ - -o ${STAGING_HOST_DIR}/usr/bin/ecj.native \ - --main=org.eclipse.jdt.internal.compiler.batch.Main \ - $(DL_DIR)/${PKG_NAME}-${PKG_VERSION}.jar - echo "env LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 ${STAGING_HOST_DIR}/usr/bin/ecj.native \$$@" > \ - ${STAGING_HOST_DIR}/usr/bin/ecj - chmod u+x ${STAGING_HOST_DIR}/usr/bin/ecj - # put a wrapper for java here - mv ${STAGING_HOST_DIR}/usr/bin/gij ${STAGING_HOST_DIR}/usr/bin/gij.native - echo "env LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 ${STAGING_HOST_DIR}/usr/bin/gij.native \"\$$@\"" > \ - ${STAGING_HOST_DIR}/usr/bin/hostjava - chmod u+x ${STAGING_HOST_DIR}/usr/bin/hostjava - echo "env LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 ${STAGING_HOST_DIR}/usr/bin/gij.native \"\$$@\"" > \ - ${STAGING_HOST_DIR}/usr/bin/gij - chmod u+x ${STAGING_HOST_DIR}/usr/bin/gij - -include ${ADK_TOPDIR}/mk/host-bottom.mk -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/fastjar/Makefile b/package/fastjar/Makefile deleted file mode 100644 index bb19be675..000000000 --- a/package/fastjar/Makefile +++ /dev/null @@ -1,24 +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 $(ADK_TOPDIR)/rules.mk - -PKG_NAME:= fastjar -PKG_VERSION:= 0.98 -PKG_RELEASE:= 1 -PKG_HASH:= f156abc5de8658f22ee8f08d7a72c88f9409ebd8c7933e9466b0842afeb2f145 -PKG_DESCR:= fastjar utility -PKG_SECTION:= dev/tools -PKG_SITES:= http://download.savannah.gnu.org/releases/fastjar/ - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz - -PKG_CFLINE_FASTJAR:= depends on ADK_HOST_ONLY - -include $(ADK_TOPDIR)/mk/host.mk -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call HOST_template,FASTJAR,fastjar,$(PKG_VERSION)-${PKG_RELEASE})) - -include ${ADK_TOPDIR}/mk/host-bottom.mk -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/gcj/Makefile b/package/gcj/Makefile deleted file mode 100644 index c4fdd7e06..000000000 --- a/package/gcj/Makefile +++ /dev/null @@ -1,45 +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 $(ADK_TOPDIR)/rules.mk - -PKG_NAME:= gcj -PKG_VERSION:= 5.4.0 -PKG_RELEASE:= 1 -PKG_HASH:= 37089e80c3f2e9a0663d7ccc51c2a6c7dbbf3275bc1e4ed1ed3b1460cd5b3030 -PKG_DESCR:= java compiler -PKG_SECTION:= dev/lang -HOST_BUILDDEP:= zip-host -PKG_SITES:= ${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/} - -PKG_CFLINE_GCJ:= depends on ADK_HOST_ONLY - -DISTFILES:= gcc-$(PKG_VERSION).tar.gz -WRKDIST= ${WRKDIR}/gcc-${PKG_VERSION} - -include $(ADK_TOPDIR)/mk/host.mk -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call HOST_template,GCJ,gcj,$(PKG_VERSION)-${PKG_RELEASE})) - -HOST_MAKE_ENV+= "JAR=no LDFLAGS=-liconv" -# http://gcc.gnu.org/bugzilla/attachment.cgi?id=30880&action=diff -HOST_CONFIGURE_ARGS:= --enable-dependency-tracking \ - --enable-java-home \ - --enable-languages=java \ - --enable-shared \ - --with-ffi \ - --with-mpc=$(STAGING_HOST_DIR) \ - --with-mpfr=$(STAGING_HOST_DIR) \ - --with-gmp=$(STAGING_HOST_DIR) \ - --disable-nls \ - --without-libiconv-prefix \ - --disable-libmudflap \ - --disable-libgomp \ - --disable-biarch \ - --disable-decimal-float \ - --disable-multilib \ - --disable-bootstrap - -include ${ADK_TOPDIR}/mk/host-bottom.mk -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/git/Makefile b/package/git/Makefile index 7e520abee..9710bfc36 100644 --- a/package/git/Makefile +++ b/package/git/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= git -PKG_VERSION:= 2.47.0 +PKG_VERSION:= 2.49.0 PKG_RELEASE:= 1 -PKG_HASH:= 1ce114da88704271b43e027c51e04d9399f8c88e9ef7542dae7aebae7d87bc4e +PKG_HASH:= 618190cf590b7e9f6c11f91f23b1d267cd98c3ab33b850416d8758f8b5a85628 PKG_DESCR:= fast version control system PKG_SECTION:= dev/scm PKG_BUILDDEP:= zlib curl expat diff --git a/package/irssi/Makefile b/package/irssi/Makefile index 66bc9344e..3e656877e 100644 --- a/package/irssi/Makefile +++ b/package/irssi/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= irssi -PKG_VERSION:= 1.4.4 +PKG_VERSION:= 1.4.5 PKG_RELEASE:= 1 -PKG_HASH:= fefe9ec8c7b1475449945c934a2360ab12693454892be47a6d288c63eb107ead +PKG_HASH:= 72a951cb0ad622785a8962801f005a3a412736c7e7e3ce152f176287c52fe062 PKG_DESCR:= irc text client PKG_SECTION:= app/chat PKG_DEPENDS:= glib libncurses @@ -14,7 +14,10 @@ PKG_BUILDDEP:= glib ncurses PKG_URL:= http://www.irssi.org/ PKG_SITES:= https://github.com/irssi/irssi/releases/download/$(PKG_VERSION)/ -PKG_CHOICES_IRSSI:= WITH_LIBRESSL WITHOUT_SSL +PKG_CHOICES_IRSSI:= WITH_OPENSSL WITH_LIBRESSL WITHOUT_SSL +PKGCD_WITH_OPENSSL:= use openssl for crypto +PKGCB_WITH_OPENSSL:= openssl +PKGCS_WITH_OPENSSL:= openssl PKGCD_WITH_LIBRESSL:= use libressl for crypto PKGCB_WITH_LIBRESSL:= libressl PKGCS_WITH_LIBRESSL:= libressl diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile deleted file mode 100644 index 4c5e86dd4..000000000 --- a/package/jamvm/Makefile +++ /dev/null @@ -1,49 +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 ${ADK_TOPDIR}/rules.mk - -PKG_NAME:= jamvm -PKG_VERSION:= 2.0.0 -PKG_RELEASE:= 1 -PKG_HASH:= 76428e96df0ae9dd964c7a7c74c1e9a837e2f312c39e9a357fa8178f7eff80da -PKG_DESCR:= java virtual machine implementation -PKG_SECTION:= dev/lang -PKG_DEPENDS:= libffi zlib -PKG_BUILDDEP:= libffi zlib -PKG_NEEDS:= threads -PKG_URL:= http://jamvm.sourceforge.net -PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jamvm/} - -# use of deprecated swp{b} -PKG_SYSTEM_DEPENDS:= !raspberry-pi3 !raspberry-pi3p - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz - -include ${ADK_TOPDIR}/mk/host.mk -include ${ADK_TOPDIR}/mk/package.mk - -$(eval $(call HOST_template,JAMVM,jamvm,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,JAMVM,jamvm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -HOST_CONFIGURE_ARGS+= --libdir=$(STAGING_HOST_DIR)/usr/lib/jamvm \ - --includedir=$(STAGING_HOST_DIR)/usr/include/jamvm \ - --with-classpath-install-dir=$(STAGING_HOST_DIR)/usr - -CONFIGURE_ARGS+= --enable-ffi - -jamvm-install: - ${INSTALL_DIR} ${IDIR_JAMVM}/usr/bin - ${INSTALL_DIR} ${IDIR_JAMVM}/usr/lib - ${INSTALL_DIR} ${IDIR_JAMVM}/usr/share/jamvm - ${INSTALL_BIN} ${WRKINST}/usr/bin/jamvm \ - ${IDIR_JAMVM}/usr/bin - ${CP} ${WRKINST}/usr/share/jamvm/classes.zip \ - ${IDIR_JAMVM}/usr/share/jamvm - $(CP) ${WRKINST}/usr/lib/libjvm.so \ - ${IDIR_JAMVM}/usr/lib - $(CP) ${WRKINST}/usr/lib/rt.jar \ - ${IDIR_JAMVM}/usr/lib - -include ${ADK_TOPDIR}/mk/host-bottom.mk -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/jikes/Makefile b/package/jikes/Makefile deleted file mode 100644 index 5a4bd097d..000000000 --- a/package/jikes/Makefile +++ /dev/null @@ -1,26 +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 $(ADK_TOPDIR)/rules.mk - -PKG_NAME:= jikes -PKG_VERSION:= 1.22 -PKG_RELEASE:= 1 -PKG_HASH:= 0cb02c763bc441349f6d38cacd52adf762302cce3a08e269f1f75f726e6e14e3 -PKG_DESCR:= java compiler -PKG_BUILDDEP:= jikes-host -PKG_SECTION:= dev/lang -PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jikes/Jikes/1.22/} - -PKG_CFLINE_JIKES:= depends on ADK_HOST_ONLY - -DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 - -include $(ADK_TOPDIR)/mk/host.mk -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call HOST_template,JIKES,jikes,$(PKG_VERSION)-${PKG_RELEASE})) -$(eval $(call PKG_template,JIKES,jikes,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -include ${ADK_TOPDIR}/mk/host-bottom.mk -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libffi/Makefile b/package/libffi/Makefile index b6dd3c851..41487ecee 100644 --- a/package/libffi/Makefile +++ b/package/libffi/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= libffi -PKG_VERSION:= 3.4.6 +PKG_VERSION:= 3.4.7 PKG_RELEASE:= 1 -PKG_HASH:= b0dea9df23c863a7a50e825440f3ebffabd65df1497108e5d437747843895a4e +PKG_HASH:= 138607dee268bdecf374adf9144c00e839e38541f75f24a1fcf18b78fda48b2d PKG_DESCR:= foreign function interface library PKG_SECTION:= libs/misc HOST_BUILDDEP:= libtool-host diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile deleted file mode 100644 index d757ba965..000000000 --- a/package/openjdk7/Makefile +++ /dev/null @@ -1,163 +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 $(ADK_TOPDIR)/rules.mk - -PKG_NAME:= openjdk7 -PKG_VERSION:= 2.6.9 -PKG_RELEASE:= 1 -PKG_HASH:= 8e4f3eb8d41ef66f1797825343141046973c124b18bf7d4698fae0a9a25495ea -PKG_DESCR:= java virtual machine -PKG_SECTION:= dev/lang -PKG_BUILDDEP:= openjdk7-host alsa-lib xproto libjpeg-turbo zlib giflib libpng freetype cups -PKG_BUILDDEP+= libX11 libXt libXp libXinerama libXrender libXtst -PKG_BUILDDEP+= libpng giflib libgtk2 glib fontconfig nss gconf ncurses -HOST_BUILDDEP:= fastjar-host gcj-host ecj-host unzip-host ant-host libXcomposite-host -HOST_BUILDDEP+= libXtst-host libXt-host libXinerama-host libXrender-host -HOST_BUILDDEP+= cups-host qemu-host alsa-lib-host freetype-host libxslt-host -PKG_DEPENDS:= zlib libffi libxtst libxi cups gconf -PKG_DEPENDS+= libfreetype libxrender libx11 libxext nss libjpeg-turbo -PKG_DEPENDS+= libpng giflib libgtk2 glib fontconfig libncurses -PKG_NEEDS:= threads c++ -PKG_URL:= http://openjdk.org/ -PKG_SITES:= http://icedtea.classpath.org/download/source/ - -DISTFILES:= icedtea-$(PKG_VERSION).tar.xz -WRKDIST= ${WRKDIR}/icedtea-${PKG_VERSION} - -GCJ_VER:= 5.4.0 - -PKG_HOST_DEPENDS:= linux -PKG_ARCH_DEPENDS:= arm mips ppc x86 x86_64 - -include $(ADK_TOPDIR)/mk/host.mk -include $(ADK_TOPDIR)/mk/package.mk -include $(ADK_TOPDIR)/mk/qemu.mk - -$(eval $(call HOST_template,OPENJDK7,openjdk7,$(PKG_VERSION)-${PKG_RELEASE})) -$(eval $(call PKG_template,OPENJDK7,openjdk7,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -CONFIG_STYLE:= basic - -# uclibc with iconv-tiny/libiconv needs -liconv -ifeq ($(ADK_TARGET_LIBC_ICONV),) -ifeq ($(ADK_TARGET_LIB_UCLIBC_NG),y) -TARGET_LIBS:= -liconv -lm -endif -endif - -# for UINTPTR_MAX in stdint.h -TARGET_CFLAGS+= -D__STDC_LIMIT_MACROS -# segfaults with march=pentium-m/atom -TARGET_CFLAGS:= $(subst march=pentium-m,march=i686,$(TARGET_CFLAGS)) -TARGET_CFLAGS:= $(subst march=atom,march=i686,$(TARGET_CFLAGS)) - -BOOTSTRAPJDK:= ${STAGING_HOST_DIR}/bootstrap-jdk - -JDKARCH:= $(ADK_TARGET_CPU_ARCH) -ifeq ($(ADK_TARGET_ARCH),x86) -JDKARCH:= i386 -endif -ifeq ($(ADK_TARGET_CPU_ARCH),x86_64) -JDKARCH:= amd64 -endif - -CONFIGURE_ARGS:= --enable-zero \ - --disable-docs \ - --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-gcj \ - --without-hotspot-build \ - --enable-nss \ - --enable-system-zlib \ - --enable-system-jpeg \ - --enable-system-png \ - --enable-system-gif \ - --enable-system-gtk \ - --enable-system-gio \ - --enable-system-fontconfig \ - --enable-system-gconf \ - --disable-system-sctp \ - --disable-system-pcsc \ - --disable-system-lcms \ - --disable-system-kerberos \ - --disable-compile-against-syscalls \ - --without-rhino \ - --disable-bootstrap - -CONFIGURE_ENV+= LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib -MAKE_ENV+= ALT_COMPILER_PATH=$(TOOLCHAIN_DIR)/usr/$(GNU_TARGET_NAME)/bin \ - ALT_OPENWIN_HOME=$(STAGING_TARGET_DIR)/usr/ \ - ALT_CUPS_HEADERS_PATH=$(STAGING_TARGET_DIR)/usr/include/ \ - ALT_FREETYPE_HEADERS_PATH=$(STAGING_TARGET_DIR)/usr/include/ \ - OTHER_CFLAGS='$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)' \ - OTHER_CXXFLAGS='$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)' \ - OTHER_LDFLAGS='$(TARGET_LDFLAGS)' \ - OTHER_LDLIBS='$(TARGET_LIBS)' \ - NO_DOCS=true \ - CROSS_COMPILE_ARCH=$(JDKARCH) QEMU=$(QEMU) \ - LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib - -ALL_TARGET:= icedtea - -# host stuff -OPENJDK_NATIVE_ENV:= JAVACFLAGS="-cp ${STAGING_HOST_DIR}/usr/share/java/libgcj-$(GCJ_VER).jar" \ - NO_DOCS=true \ - LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 \ - BOOTCLASSPATH="$(STAGING_HOST_DIR)/usr/share/jamvm/classes.zip:$(STAGING_HOST_DIR)/usr/share/classpath/glibj.zip" \ - OTHER_CPPFLAGS='$(HOST_CPPFLAGS)' \ - OTHER_LDFLAGS='$(HOST_LDFLAGS)' \ - ALSA_CPPFLAGS='$(HOST_CPPFLAGS)' \ - LIBFFI_CFLAGS='-I$(STAGING_HOST_DIR)/usr/include -L$(STAGING_HOST_DIR)/usr/lib' \ - ALT_OPENWIN_HOME='$(STAGING_HOST_DIR)/usr' \ - ALT_CUPS_HEADERS_PATH="$(STAGING_HOST_DIR)/usr/include" \ - ALT_FREETYPE_HEADERS_PATH="$(STAGING_HOST_DIR)/usr/include" \ - ALT_FREETYPE_LIB_PATH="$(STAGING_HOST_DIR)/usr/lib" - -HOST_CONFIGURE_ENV+= $(OPENJDK_NATIVE_ENV) -HOST_MAKE_ENV+= $(OPENJDK_NATIVE_ENV) -HOST_ALL_TARGET:= icedtea-boot -HOST_CONFIGURE_ARGS+= --enable-bootstrap \ - --enable-zero \ - --with-jdk-home=$(STAGING_HOST_DIR)/usr/lib/jvm \ - --with-java=$(STAGING_HOST_DIR)/usr/bin/hostjava \ - --with-javac=$(STAGING_HOST_DIR)/usr/bin/ecj \ - --with-ecj-jar=${DL_DIR}/ecj-4.9.jar \ - --without-hotspot-build \ - --disable-system-zlib \ - --disable-system-jpeg \ - --disable-system-lcms \ - --disable-system-png \ - --disable-system-gif \ - --disable-system-gtk \ - --disable-system-gio \ - --disable-system-kerberos \ - --disable-system-fontconfig \ - --disable-system-gconf \ - --disable-system-pcsc \ - --disable-system-sctp \ - --disable-compile-against-syscalls \ - --without-rhino \ - --enable-systemtap=no \ - --disable-docs - -hostpost-install: - -rm -rf $(STAGING_HOST_DIR)/bootstrap-jdk - $(CP) $(WRKBUILD)/openjdk.build-boot/j2sdk-image $(STAGING_HOST_DIR)/bootstrap-jdk - -openjdk7-install: - $(INSTALL_DIR) $(IDIR_OPENJDK7)/usr/lib/jvm/jre - $(INSTALL_DIR) $(IDIR_OPENJDK7)/usr/bin - $(CP) $(WRKBUILD)/openjdk.build/j2re-image/bin $(IDIR_OPENJDK7)/usr/lib/jvm/jre - $(CP) $(WRKBUILD)/openjdk.build/j2re-image/lib $(IDIR_OPENJDK7)/usr/lib/jvm/jre - (cd $(IDIR_OPENJDK7)/usr/bin && ln -sf ../lib/jvm/jre/bin/java .) - (cd $(IDIR_OPENJDK7)/usr/lib/jvm/jre/lib/$(JDKARCH) && ln -sf server/libjvm.so .) - $(CP) ./files/nss.cfg $(IDIR_OPENJDK7)/usr/lib/jvm/jre/lib/security - -include ${ADK_TOPDIR}/mk/host-bottom.mk -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/openjdk7/files/nss.cfg b/package/openjdk7/files/nss.cfg deleted file mode 100644 index e0685918b..000000000 --- a/package/openjdk7/files/nss.cfg +++ /dev/null @@ -1,5 +0,0 @@ -name = NSS -nssLibraryDirectory = /usr/lib -nssDbMode = noDb -attributes = compatibility -handleStartupErrors = ignoreMultipleInitialisation diff --git a/package/openjdk7/patches/openadk.patch b/package/openjdk7/patches/openadk.patch deleted file mode 100644 index 276f1fc79..000000000 --- a/package/openjdk7/patches/openadk.patch +++ /dev/null @@ -1,896 +0,0 @@ -diff -Nur icedtea-2.6.9.orig/Makefile.in icedtea-2.6.9/Makefile.in ---- icedtea-2.6.9.orig/Makefile.in 2017-02-14 01:37:03.478827012 +0100 -+++ icedtea-2.6.9/Makefile.in 2017-04-02 07:50:37.977789464 +0200 -@@ -647,7 +647,6 @@ - STAGE1_BOOT_DIR = $(abs_top_builddir)/bootstrap/boot - STAGE2_BOOT_DIR = $(abs_top_builddir)/bootstrap/icedtea - JAMVM_IMPORT_PATH = $(abs_top_builddir)/jamvm/install/hotspot --CRYPTO_CHECK_BUILD_DIR = $(abs_top_builddir)/test/cryptocheck.build - ECC_CHECK_BUILD_DIR = $(abs_top_builddir)/ecccheck.build - MIME_TYPE_CHECK_BUILD_DIR = $(abs_top_builddir)/test/mimetypecheck.build - STAGE1_BOOT_RUNTIME = $(STAGE1_BOOT_DIR)/jre/lib/rt.jar -@@ -791,7 +790,7 @@ - $(am__append_14) $(DISTRIBUTION_PATCHES) - - # Bootstrapping patches --ICEDTEA_BOOT_PATCHES = patches/boot/javafiles.patch \ -+ICEDTEA_BOOT_PATCHES = patches/openadk.patch patches/boot/javafiles.patch \ - patches/boot/corba-idlj.patch patches/boot/corba-no-gen.patch \ - patches/boot/corba-orb.patch patches/boot/demos.patch \ - patches/boot/fphexconstants.patch \ -@@ -1512,7 +1511,7 @@ - clean-icedtea-debug-stage2 clean-icedtea-stage1 clean-add-zero clean-add-zero-debug \ - clean-add-cacao clean-add-cacao-debug clean-rt clean-rewrite-rhino clean-rewriter \ - clean-add-systemtap clean-add-systemtap-debug clean-add-nss clean-add-tzdata-support \ -- clean-add-tzdata-support-debug clean-cryptocheck clean-policytool-@JAVA_VER@.desktop \ -+ clean-add-tzdata-support-debug clean-policytool-@JAVA_VER@.desktop \ - clean-jconsole-@JAVA_VER@.desktop clean-ecccheck clean-mimetypecheck - if [ -e bootstrap ]; then \ - rmdir bootstrap ; \ -@@ -1545,8 +1544,7 @@ - clean-add-systemtap-debug clean-add-systemtap-boot \ - clean-add-nss clean-add-tzdata-support clean-add-tzdata-support-debug \ - clean-add-tzdata-support-boot clean-check-mimetype clean-mimetypecheck \ -- clean-check-crypto clean-check-crypto-debug clean-check-crypto-boot \ -- clean-add-archive clean-add-archive-debug clean-add-archive-boot clean-cryptocheck \ -+ clean-add-archive clean-add-archive-debug clean-add-archive-boot \ - clean-download-hotspot clean-download-corba clean-download-jaxp \ - clean-download-jaxws clean-download-langtools clean-download-jdk clean-download-openjdk \ - clean-extract-corba clean-extract-jaxp clean-extract-jaxws clean-extract-jdk \ -@@ -2533,16 +2531,6 @@ - fi - rm -f stamps/add-tzdata-support.stamp - --stamps/check-crypto.stamp: stamps/cryptocheck.stamp stamps/icedtea.stamp -- if [ -e $(BUILD_SDK_DIR)/bin/java ] ; then \ -- $(BUILD_SDK_DIR)/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \ -- fi -- mkdir -p stamps -- touch $@ -- --clean-check-crypto: -- rm -f stamps/check-crypto.stamp -- - stamps/add-archive.stamp: stamps/icedtea.stamp - @ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@ if [ -e $(BUILD_SDK_DIR)/bin/java ] ; then \ - @ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@ if test "x$(INSTALL_ARCH_DIR)" != "xppc64" -a "x$(INSTALL_ARCH_DIR)" != "xppc64le" ; then \ -@@ -2657,16 +2645,6 @@ - fi - rm -f stamps/add-tzdata-support-debug.stamp - --stamps/check-crypto-debug.stamp: stamps/cryptocheck.stamp stamps/icedtea-debug.stamp -- if [ -e $(BUILD_DEBUG_SDK_DIR)/bin/java ] ; then \ -- $(BUILD_DEBUG_SDK_DIR)/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \ -- fi -- mkdir -p stamps -- touch $@ -- --clean-check-crypto-debug: -- rm -f stamps/check-crypto-debug.stamp -- - stamps/add-archive-debug.stamp: stamps/icedtea-debug.stamp - @ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@ if [ -e $(BUILD_DEBUG_SDK_DIR)/bin/java ] ; then \ - @ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@ if test "x$(INSTALL_ARCH_DIR)" != "xppc64" -a "x$(INSTALL_ARCH_DIR)" != "xppc64le" ; then \ -@@ -2711,24 +2689,24 @@ - - stamps/icedtea-stage2.stamp: stamps/icedtea.stamp stamps/add-cacao.stamp \ - stamps/add-zero.stamp stamps/add-jamvm.stamp stamps/add-systemtap.stamp \ -- stamps/add-tzdata-support.stamp stamps/check-crypto.stamp stamps/add-archive.stamp \ -+ stamps/add-tzdata-support.stamp stamps/add-archive.stamp \ - stamps/split-debuginfo.stamp stamps/add-mime-types-file.stamp - mkdir -p stamps - touch $@ - --clean-icedtea-stage2: clean-add-jamvm clean-check-crypto clean-add-archive clean-split-debuginfo \ -+clean-icedtea-stage2: clean-add-jamvm clean-add-archive clean-split-debuginfo \ - clean-add-mime-types-file - rm -f stamps/icedtea-stage2.stamp - - stamps/icedtea-debug-stage2.stamp: stamps/icedtea-debug.stamp \ - stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp stamps/add-jamvm-debug.stamp \ - stamps/add-systemtap-debug.stamp stamps/add-tzdata-support-debug.stamp \ -- stamps/check-crypto-debug.stamp stamps/add-archive-debug.stamp stamps/split-debuginfo-debug.stamp \ -+ stamps/add-archive-debug.stamp stamps/split-debuginfo-debug.stamp \ - stamps/add-mime-types-file-debug.stamp - mkdir -p stamps - touch $@ - --clean-icedtea-debug-stage2: clean-add-jamvm-debug clean-check-crypto-debug \ -+clean-icedtea-debug-stage2: clean-add-jamvm-debug \ - clean-add-archive-debug clean-split-debuginfo-debug clean-add-mime-types-file-debug - rm -f stamps/icedtea-debug-stage2.stamp - -@@ -2799,16 +2777,6 @@ - fi - rm -f stamps/add-tzdata-support-boot.stamp - --stamps/check-crypto-boot.stamp: stamps/cryptocheck.stamp stamps/icedtea-boot.stamp -- if [ -e $(BUILD_BOOT_SDK_DIR)/bin/java ] ; then \ -- $(BUILD_BOOT_SDK_DIR)/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \ -- fi -- mkdir -p stamps -- touch $@ -- --clean-check-crypto-boot: -- rm -f stamps/check-crypto-boot.stamp -- - stamps/add-archive-boot.stamp: stamps/icedtea-boot.stamp - @ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@ if [ -e $(BUILD_BOOT_SDK_DIR)/bin/java ] ; then \ - @ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@ if test "x$(INSTALL_ARCH_DIR)" != "xppc64" -a "x$(INSTALL_ARCH_DIR)" != "xppc64le" ; then \ -@@ -2853,13 +2821,13 @@ - - stamps/icedtea-stage1.stamp: stamps/icedtea-boot.stamp \ - stamps/add-systemtap-boot.stamp stamps/add-tzdata-support-boot.stamp \ -- stamps/check-crypto-boot.stamp stamps/add-archive-boot.stamp \ -+ stamps/add-archive-boot.stamp \ - stamps/split-debuginfo-boot.stamp stamps/add-mime-types-file-boot.stamp - mkdir -p stamps - touch $@ - - clean-icedtea-stage1: clean-add-systemtap-boot clean-add-tzdata-support-boot \ -- clean-check-crypto-boot clean-add-archive-boot clean-split-debuginfo-boot \ -+ clean-add-archive-boot clean-split-debuginfo-boot \ - clean-add-mime-types-file-boot - rm -f stamps/icedtea-stage1.stamp - -@@ -2940,7 +2908,7 @@ - stamps/jamvm.stamp: $(OPENJDK_TREE) stamps/rt.stamp - @BUILD_JAMVM_TRUE@ cd jamvm/jamvm && \ - @BUILD_JAMVM_TRUE@ ./autogen.sh --with-java-runtime-library=openjdk7 \ --@BUILD_JAMVM_TRUE@ --prefix=$(abs_top_builddir)/jamvm/install ; \ -+@BUILD_JAMVM_TRUE@ --prefix=$(abs_top_builddir)/jamvm/install $(CONFIGURE_ARGS); \ - @BUILD_JAMVM_TRUE@ $(MAKE) ; \ - @BUILD_JAMVM_TRUE@ $(MAKE) install - @BUILD_JAMVM_TRUE@ mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server -@@ -3323,19 +3291,6 @@ - chmod u+w $(STAGE1_BOOT_RUNTIME) ; \ - fi - --# Crypto Level Check -- --stamps/cryptocheck.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) -- mkdir -p $(CRYPTO_CHECK_BUILD_DIR) -- $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \ -- -d $(CRYPTO_CHECK_BUILD_DIR) $(CRYPTO_CHECK_SRCS) -- mkdir -p stamps -- touch $@ -- --clean-cryptocheck: -- rm -rf $(CRYPTO_CHECK_BUILD_DIR) -- rm -f stamps/cryptocheck.stamp -- - # Mime Type Check - - stamps/mimetypecheck.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) -@@ -3422,7 +3377,6 @@ - ${mkinstalldirs} $(DESTDIR)${prefix}/jre/bin $(DESTDIR)${prefix}/jre/lib - ${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/{.,headless,jli,xawt} - ${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/ext -- ${mkinstalldirs} $(DESTDIR)${prefix}/tapset - @SPLIT_DEBUGINFO_TRUE@ ${mkinstalldirs} $(DESTDIR)$(DEBUG_PREFIX)/$(bindir) $(DESTDIR)$(DEBUG_PREFIX)/${exec_prefix}/lib - @SPLIT_DEBUGINFO_TRUE@ ${mkinstalldirs} $(DESTDIR)$(DEBUG_PREFIX)/${exec_prefix}/lib/$(INSTALL_ARCH_DIR) - @SPLIT_DEBUGINFO_TRUE@ ${mkinstalldirs} $(DESTDIR)$(DEBUG_PREFIX)/${exec_prefix}/lib/$(INSTALL_ARCH_DIR)/jli -@@ -3520,9 +3474,6 @@ - for files in $(BUILD_SDK_DIR)/jre/lib/ext/*.jar; do \ - $(call install_file,$${files},$(DESTDIR)${prefix}/jre/lib/ext,$(INSTALL_DATA));\ - done -- for files in $(BUILD_SDK_DIR)/tapset/*.stp; do \ -- $( |