[WIP] import from ppc64 test tree.

65 files changed, 644 insertions, 1021 deletions

diff --git a/legacy/gcc6/APKBUILD b/legacy/gcc6/APKBUILD
deleted file mode 100644
index 6e6c8e76d..000000000
--- a/legacy/gcc6/APKBUILD
+++ /dev/null
@@ -1,667 +0,0 @@
-# Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org>
-_major=6
-pkgname=gcc$_major
-pkgver=6.4.0
-_ecjver=4.9
-[ "$BOOTSTRAP" = "nolibc" ] && pkgname="gcc-pass2"
-[ "$CBUILD" != "$CHOST" ] && _cross="-$CARCH" || _cross=""
-[ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
-
-pkgname="$pkgname$_target"
-pkgrel=11
-pkgdesc="The GNU Compiler Collection"
-url="https://gcc.gnu.org"
-arch="all"
-license="GPL-3.0+ AND LGPL-2.1+"
-_gccrel=$pkgver-r$pkgrel
-depends="binutils$_target isl"
-makedepends_build="gcc$_cross g++$_cross bison flex texinfo zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
-makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev libucontext-dev"
-subpackages=" "
-[ "$CHOST" = "$CTARGET" ] && subpackages="gcc$_major-doc$_target gcc$_major-lang$_target"
-replaces="libstdc++ binutils"
-options="$options !check !dbg strip toolchain"
-
-: ${LANG_CXX:=true}
-: ${LANG_OBJC:=true}
-: ${LANG_JAVA:=true}
-: ${LANG_GO:=true}
-: ${LANG_FORTRAN:=true}
-: ${LANG_ADA:=false}
-
-LIBGOMP=true
-LIBGCC=true
-LIBATOMIC=true
-LIBITM=true
-
-if [ "$CHOST" != "$CTARGET" ]; then
-	if [ "$BOOTSTRAP" = nolibc ]; then
-		LANG_CXX=false
-		LANG_ADA=false
-		LIBGCC=false
-		_builddir="$srcdir/build-cross-pass2"
-	else
-		_builddir="$srcdir/build-cross-final"
-	fi
-	LANG_OBJC=false
-	LANG_JAVA=false
-	LANG_GO=false
-	LANG_FORTRAN=false
-	LIBGOMP=false
-	LIBATOMIC=false
-	LIBITM=false
-
-	# reset target flags (should be set in crosscreate abuild)
-	# fixup flags. seems gcc treats CPPFLAGS as global without
-	# _FOR_xxx variants. wrap it in CFLAGS and CXXFLAGS.
-	export CFLAGS="$CPPFLAGS $CFLAGS"
-	export CXXFLAGS="$CPPFLAGS $CXXFLAGS"
-	unset CPPFLAGS
-	export CFLAGS_FOR_TARGET=" "
-	export CXXFLAGS_FOR_TARGET=" "
-	export LDFLAGS_FOR_TARGET=" "
-
-	STRIP_FOR_TARGET="$CTARGET-strip"
-elif [ "$CBUILD" != "$CHOST" ]; then
-	# fixup flags. seems gcc treats CPPFLAGS as global without
-	# _FOR_xxx variants. wrap it in CFLAGS and CXXFLAGS.
-	export CFLAGS="$CPPFLAGS $CFLAGS"
-	export CXXFLAGS="$CPPFLAGS $CXXFLAGS"
-	unset CPPFLAGS
-
-	# reset flags and cc for build
-	export CC_FOR_BUILD="gcc"
-	export CXX_FOR_BUILD="g++"
-	export CFLAGS_FOR_BUILD=" "
-	export CXXFLAGS_FOR_BUILD=" "
-	export LDFLAGS_FOR_BUILD=" "
-	export CFLAGS_FOR_TARGET=" "
-	export CXXFLAGS_FOR_TARGET=" "
-	export LDFLAGS_FOR_TARGET=" "
-
-	# Languages that do not need bootstrapping
-	LANG_OBJC=false
-	LANG_JAVA=false
-	LANG_GO=false
-	LANG_FORTRAN=false
-
-	STRIP_FOR_TARGET=${CROSS_COMPILE}strip
-	_builddir="$srcdir/build-cross-native"
-else
-	STRIP_FOR_TARGET=${CROSS_COMPILE}strip
-	_builddir="$srcdir/build"
-fi
-
-# libitm has TEXTRELs in ARM build, so disable for now
-# gcc itself has TEXTRELs in m68k; until this is fixed, we need it
-case "$CTARGET_ARCH" in
-arm*)		LIBITM=false ;;
-m68k)		options="$options textrels" ;;
-esac
-
-# Fortran uses libquadmath if toolchain has __float128
-# currently on x86, x86_64 and ia64
-LIBQUADMATH=$LANG_FORTRAN
-case "$CTARGET_ARCH" in
-pmmx | x86 | x86_64)	LIBQUADMATH=$LANG_FORTRAN ;;
-*)			LIBQUADMATH=false ;;
-esac
-
-# libatomic is a dependency for openvswitch
-$LIBATOMIC && subpackages="$subpackages libatomic$_major::$CTARGET_ARCH"
-$LIBGCC && subpackages="$subpackages libgcc$_major::$CTARGET_ARCH"
-$LIBQUADMATH && subpackages="$subpackages libquadmath$_major::$CTARGET_ARCH"
-if $LIBGOMP; then
-	depends="$depends libgomp=$_gccrel"
-	subpackages="$subpackages libgomp$_major::$CTARGET_ARCH"
-fi
-
-_languages=c
-if $LANG_CXX; then
-	subpackages="$subpackages libstdc++:libcxx:$CTARGET_ARCH g++$_target:gpp"
-	_languages="$_languages,c++"
-fi
-if $LANG_OBJC; then
-	subpackages="$subpackages libobjc::$CTARGET_ARCH gcc-objc$_target:objc"
-	_languages="$_languages,objc"
-fi
-if $LANG_JAVA; then
-	subpackages="$subpackages libgcj::$CTARGET_ARCH gcc-java$_target:java"
-	_languages="$_languages,java"
-fi
-if $LANG_GO; then
-	subpackages="$subpackages libgo::$CTARGET_ARCH gcc-go$_target:go"
-	_languages="$_languages,go"
-fi
-if $LANG_FORTRAN; then
-	subpackages="$subpackages libgfortran::$CTARGET_ARCH gfortran$_target:gfortran"
-	_languages="$_languages,fortran"
-fi
-if $LANG_ADA; then
-	subpackages="$subpackages libgnat::$CTARGET_ARCH gcc-gnat$_target:gnat"
-	_languages="$_languages,ada"
-	makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
-fi
-makedepends="$makedepends_build $makedepends_host"
-
-source="https://ftp.gnu.org/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.xz
-	https://sourceware.org/pub/java/ecj-$_ecjver.jar
-
-	001_all_default-ssp-strong.patch
-	002_all_default-relro.patch
-	003_all_default-fortify-source.patch
-	005_all_default-as-needed.patch
-	011_all_default-warn-format-security.patch
-	012_all_default-warn-trampolines.patch
-	020_all_msgfmt-libstdc++-link.patch
-	050_all_libiberty-asprintf.patch
-	051_all_libiberty-pic.patch
-	053_all_libitm-no-fortify-source.patch
-	067_all_gcc-poison-system-directories.patch
-	090_all_pr55930-dependency-tracking.patch
-
-	201-cilkrts.patch
-	203-libgcc_s.patch
-	204-linux_libc_has_function.patch
-	205-nopie.patch
-	207-static-pie.patch
-
-	libgcc-always-build-gcceh.a.patch
-	gcc-4.9-musl-fortify.patch
-	gcc-6.1-musl-libssp.patch
-	boehm-gc-musl.patch
-	gcc-pure64.patch
-	fix-gcj-stdgnu14-link.patch
-	fix-gcj-musl.patch
-	fix-gcj-iconv-musl.patch
-
-	gcc-4.8-build-args.patch
-	fix-cxxflags-passing.patch
-	ada-fixes.patch
-	ada-shared.patch
-	ada-musl.patch
-	ada-aarch64-multiarch.patch
-
-	300-main-gcc-add-musl-s390x-dynamic-linker.patch
-	310-build-gcj-s390x.patch
-	320-libffi-gnulinux.patch
-	330-gccgo-link-to-ucontext.patch
-	331-gccgo-use-real-off_t-type.patch
-	332-gccgo-remove-ustat.patch
-	libgo-musl-1.2.3.patch
-
-	fix-rs6000-pie.patch
-	add-classic_table-support.patch
-	lra-pentium.patch
-
-	gcc-5.4.0-locale.patch
-	isl-fix.patch
-	"
-
-# we build out-of-tree
-_gccdir="$srcdir"/gcc-$pkgver
-_gcclibdir=/usr/lib/gcc/${CTARGET}/$pkgver
-_gcclibexec=/usr/libexec/gcc/${CTARGET}/$pkgver
-
-prepare() {
-	cd "$_gccdir"
-
-	_err=
-	for i in $source; do
-		case "$i" in
-		*.patch)
-			msg "Applying $i"
-			patch -p1 -F3 -i "$srcdir"/$i || _err="$_err $i"
-			;;
-		esac
-	done
-
-	if [ -n "$_err" ]; then
-		error "The following patches failed:"
-		for i in $_err; do
-			echo "  $i"
-		done
-		return 1
-	fi
-
-	# see http://gcc.gnu.org/ml/java/2008-04/msg00027.html
-	mv "$srcdir"/ecj-*.jar ecj.jar
-
-	echo ${pkgver} > gcc/BASE-VER
-	echo "UNSUPPORTED=1" > libcilkrts/configure.tgt
-	rm libgo/go/syscall/libcall_linux_ustat.go
-}
-
-build() {
-	local _arch_configure=
-	local _libc_configure=
-	local _cross_configure=
-	local _bootstrap_configure=
-	local _hash_style=gnu
-	local _symvers=
-
-	cd "$_gccdir"
-
-	case "$CTARGET" in
-	aarch64-*-*-*)		_arch_configure="--with-arch=armv8-a --with-abi=lp64 --enable-fix-cortex-a53-835769 --enable-fix-cortex-a53-843419";;
-	armv5-*-*-*eabi)	_arch_configure="--with-arch=armv5te --with-tune=arm926ej-s --with-float=soft --with-abi=aapcs-linux";;
-	armv6-*-*-*eabihf)	_arch_configure="--with-arch=armv6zk --with-tune=arm1176jzf-s --with-fpu=vfp --with-float=hard --with-abi=aapcs-linux";;
-	armv7-*-*-*eabihf)	_arch_configure="--with-arch=armv7-a --with-tune=generic-armv7-a --with-fpu=vfpv3-d16 --with-float=hard --with-abi=aapcs-linux --with-mode=thumb";;
-	m68k-*-*-*)		_arch_configure="--with-arch=68020 --with-tune=68020-40";;
-	mipsel-*-*-*)		_arch_configure="--with-arch-32=mips2 --with-tune-32=mips32 --with-fp-32=32 --with-mips-plt --with-float=hard --with-abi=32";;
-	mips-*-*-*)		_arch_configure="--with-arch=mips3 --with-mips-plt --with-abi=32"; _hash_style="sysv";;
-	mips32el-*-*-*)		_arch_configure="--with-arch=mips32 --with-mips-plt --with-abi=32"; _hash_style="sysv";;
-	powerpc-*-*-*)		_arch_configure="--enable-secureplt --enable-decimal-float=no";;
-	powerpc64*-*-*-*)	_arch_configure="--with-abi=elfv2 --enable-secureplt --enable-decimal-float=no";;
-	powerpc64le*-*-*-*)	_arch_configure="--with-abi=elfv2 --enable-secureplt --enable-decimal-float=no";;
-	i486-*-*-*)		_arch_configure="--with-arch=i486 --with-tune=generic --enable-cld";;
-	i586-*-*-*)		_arch_configure="--with-arch=i586 --with-tune=pentium2 --enable-cld --enable-mmx";;
-	pentium3-*-*-*)		_arch_configure="--with-arch=pentium3 --with-tune=pentium-m";;
-	s390x-*-*-*)		_arch_configure="--with-arch=z196 --with-tune=zEC12 --with-zarch --with-long-double-128 --enable-decimal-float";;
-	esac
-
-	case "$CTARGET_LIBC" in
-	musl)
-		# musl does not support mudflap, or libsanitizer
-		# libmpx uses secure_getenv and struct _libc_fpstate not present in musl
-		_libc_configure="--disable-libmpx --disable-libmudflap --disable-libsanitizer"
-		_symvers="--disable-symvers"
-		export libat_cv_have_ifunc=no
-		export ac_cv_type_off64_t=no
-		;;
-	esac
-
-	[ "$CBUILD" != "$CHOST"   ] && _cross_configure="--disable-bootstrap"
-	[ "$CHOST"  != "$CTARGET" ] && _cross_configure="--disable-bootstrap --with-sysroot=$CBUILDROOT"
-
-	case "$BOOTSTRAP" in
-	nolibc)	_bootstrap_configure="--with-newlib --disable-shared --enable-threads=no" ;;
-	*)	_bootstrap_configure="--enable-shared --enable-threads --enable-tls" ;;
-	esac
-
-	$LIBGOMP	|| _bootstrap_configure="$_bootstrap_configure --disable-libgomp"
-	$LIBATOMIC	|| _bootstrap_configure="$_bootstrap_configure --disable-libatomic"
-	$LIBITM		|| _bootstrap_configure="$_bootstrap_configure --disable-libitm"
-	$LIBQUADMATH	|| _arch_configure="$_arch_configure --disable-libquadmath"
-
-	msg "Building the following:"
-	echo ""
-	echo "  CBUILD=$CBUILD"
-	echo "  CHOST=$CHOST"
-	echo "  CTARGET=$CTARGET"
-	echo "  CTARGET_ARCH=$CTARGET_ARCH"
-	echo "  CTARGET_LIBC=$CTARGET_LIBC"
-	echo "  languages=$_languages"
-	echo "  arch_configure=$_arch_configure"
-	echo "  libc_configure=$_libc_configure"
-	echo "  cross_configure=$_cross_configure"
-	echo "  bootstrap_configure=$_bootstrap_configure"
-	echo "  hash_style=$_hash_style"
-	echo ""
-
-	mkdir -p "$_builddir"
-	cd "$_builddir"
-	"$_gccdir"/configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--build=${CBUILD} \
-		--host=${CHOST} \
-		--target=${CTARGET} \
-		--with-pkgversion="Adelie ${pkgver}" \
-		--with-bugurl="http://bts.adelielinux.org/" \
-		--enable-checking=release \
-		--disable-fixed-point \
-		--disable-libstdcxx-pch \
-		--disable-multilib \
-		--disable-werror \
-		$_symvers \
-		--enable-__cxa_atexit \
-		--enable-default-pie \
-		--enable-cloog-backend \
-		--enable-languages=$_languages \
-		$_arch_configure \
-		$_libc_configure \
-		$_cross_configure \
-		$_bootstrap_configure \
-		--with-system-zlib \
-		--with-linker-hash-style=$_hash_style
-	make
-}
-
-check() {
-	cd "$_builddir"
-	make check
-}
-
-package() {
-	cd "$_builddir"
-	make -j1 DESTDIR="${pkgdir}" install
-
-	ln -s gcc "$pkgdir"/usr/bin/cc
-
-	# we dont support gcj -static
-	# and saving 35MB is not bad.
-	find "$pkgdir" -name libgcj.a -o -name libgtkpeer.a \
-		-o -name libgjsmalsa.a -o -name libgcj-tools.a \
-		-o -name libjvm.a -o -name libgij.a -o -name libgcj_bc.a \
-		-o -name libjavamath.a \
-		| xargs rm -f
-
-	# strip debug info from some static libs
-	${STRIP_FOR_TARGET} -g `find "$pkgdir" \( -name libgfortran.a -o -name libobjc.a -o -name libgomp.a \
-		-o -name libmudflap.a -o -name libmudflapth.a \
-		-o -name libgcc.a -o -name libgcov.a -o -name libquadmath.a \
-		-o -name libitm.a -o -name libgo.a -o -name libcaf\*.a \
-		-o -name libatomic.a -o -name libasan.a -o -name libtsan.a \) \
-		-a -type f`
-
-	if $LANG_JAVA; then
-		sed -i -e 's/lib: /&%{static:%eJava programs cannot be linked statically}/' \
-			"$pkgdir"/usr/lib/libgcj.spec
-	fi
-
-	if $LIBGOMP; then
-		mv "$pkgdir"/usr/lib/libgomp.spec "$pkgdir"/$_gcclibdir
-	fi
-	if $LIBITM; then
-		mv "$pkgdir"/usr/lib/libitm.spec "$pkgdir"/$_gcclibdir
-	fi
-
-	# remove ffi
-	rm -f "$pkgdir"/usr/lib/libffi* "$pkgdir"/usr/share/man/man3/ffi*
-	find "$pkgdir" -name 'ffi*.h' | xargs rm -f
-
-	local gdblib=${_target:+$CTARGET/}lib
-	for i in $(find "$pkgdir"/usr/$gdblib/ -type f -maxdepth 1 -name "*-gdb.py" ); do
-		mkdir -p "$pkgdir"/usr/share/gdb/python/auto-load/usr/$gdblib
-		mv "$i" "$pkgdir"/usr/share/gdb/python/auto-load/usr/$gdblib/
-	done
-
-	# move ada runtime libs
-	if $LANG_ADA; then
-		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.so"); do
-			mv "$i" "$pkgdir"/usr/lib/
-			ln -s ../../../../${i##*/} $i
-		done
-	fi
-
-	if [ "$CHOST" != "$CTARGET" ]; then
-		# cross-gcc: remove any files that would conflict with the
-		# native gcc package
-		rm -rf "$pkgdir"/usr/bin/cc "$pkgdir"/usr/include "$pkgdir"/usr/share
-		# libcc1 does not depend on target, don't ship it
-		rm -rf "$pkgdir"/usr/lib/libcc1.so*
-
-		# fixup gcc library symlinks to be linker scripts so
-		# linker finds the libs from relocated sysroot
-		for so in "$pkgdir"/usr/$CTARGET/lib/*.so; do
-			if [ -h "$so" ]; then
-				local _real=$(basename $(readlink "$so"))
-				rm -f "$so"
-				echo "GROUP ($_real)" > "$so"
-			fi
-		done
-	fi
-}
-
-libatomic() {
-	pkgdesc="GCC Atomic library"
-	depends=
-	replaces="gcc"
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libatomic.so.* "$subpkgdir"/usr/lib/
-}
-
-libcxx() {
-	pkgdesc="GNU C++ standard runtime library"
-	depends=
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libstdc++.so.* "$subpkgdir"/usr/lib/
-}
-
-gpp() {
-	pkgdesc="GNU C++ standard library and compiler"
-	depends="libstdc++=$_gccrel gcc=$_gccrel libc-dev"
-	mkdir -p "$subpkgdir/$_gcclibexec" \
-		"$subpkgdir"/usr/bin \
-		"$subpkgdir"/usr/${_target:+$CTARGET/}include \
-		"$subpkgdir"/usr/${_target:+$CTARGET/}lib \
-
-	mv "$pkgdir/$_gcclibexec/cc1plus" "$subpkgdir/$_gcclibexec/"
-
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/*++* "$subpkgdir"/usr/${_target:+$CTARGET/}lib/
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}include/c++ "$subpkgdir"/usr/${_target:+$CTARGET/}include/
-	mv "$pkgdir"/usr/bin/*++ "$subpkgdir"/usr/bin/
-}
-
-libobjc() {
-	pkgdesc="GNU Objective-C runtime"
-	replaces="objc"
-	depends=
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libobjc.so.* "$subpkgdir"/usr/lib/
-}
-
-objc() {
-	pkgdesc="GNU Objective-C"
-	replaces="gcc"
-	depends="libc-dev gcc=$_gccrel libobjc=$_gccrel"
-
-	mkdir -p "$subpkgdir"/$_gcclibdir/include \
-		"$subpkgdir"/usr/lib
-	mv "$pkgdir"/$_gcclibdir/include/objc "$subpkgdir"/$_gcclibdir/include/
-	mv "$pkgdir"/usr/lib/libobjc.so "$pkgdir"/usr/lib/libobjc.a \
-		"$subpkgdir"/usr/lib/
-}
-
-libgcc() {
-	pkgdesc="GNU C compiler runtime libraries"
-	depends=
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libgcc_s.so.* "$subpkgdir"/usr/lib/
-}
-
-libgomp() {
-	pkgdesc="GCC shared-memory parallel programming API library"
-	depends=
-	replaces="gcc"
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/${_target:+$CTARGET/}lib/libgomp.so.* "$subpkgdir"/usr/lib/
-}
-
-java() {
-	pkgdesc="Java support for GCC"
-	depends="zlib-dev gcc=$_gccrel libgcj=$_gccrel"
-
-	mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/usr/lib "$subpkgdir"/$_gcclibdir/
-	cd "$pkgdir"/usr/bin
-	mv *gcj *gcj-dbtool *gjavah *gcjh *jcf-dump "$subpkgdir"/usr/bin/
-	cd "$pkgdir"
-	for i in $(find usr/ -name ecj1 -o -name jc1 -o -name jvgenmain); do
-		mkdir -p "$subpkgdir"/${i%/*}
-		mv "$pkgdir"/$i "$subpkgdir"/$i
-	done
-	for i in "$pkgdir"/usr/lib/libgcj*.so; do
-		if [ -L "$i" ]; then
-			mv "$i" "$subpkgdir"/usr/lib/
-		fi
-	done
-	mkdir -p "$subpkgdir"/usr/share/gcc-6.4.0/python
-	mv "$pkgdir"/usr/share/gcc-6.4.0/python/libjava \
-		"$subpkgdir"/usr/share/gcc-6.4.0/python
-	mv "$pkgdir"/usr/lib/libgij.so "$subpkgdir"/usr/lib/
-	mv "$pkgdir"/usr/lib/libgcj.spec "$subpkgdir"/$_gcclibdir/
-}
-
-libgcj() {
-	pkgdesc="Java runtime library for gcc"
-	# libgcj_bc.so moved from gcc-java to libgcj
-	replaces="gcc-java"
-	depends=
-
-	mkdir -p "$subpkgdir"/usr/bin
-	cd "$pkgdir"/usr/bin
-	mv aot-compile gappletviewer gc-analyze gij gjar gjarsigner gkeytool\
-		gnative2ascii gorbd grmic grmid grmiregistry gserialver \
-		gtnameserv jv-convert rebuild-gcj-db \
-		"$subpkgdir"/usr/bin/
-	cd "$pkgdir"
-	for i in $(find usr/lib -name jc1 -o -name jvgenmain); do
-		mkdir -p "$subpkgdir"/${i%/*}
-		mv "$pkgdir"/$i "$subpkgdir"/$i
-	done
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/gcj-* \
-		"$pkgdir"/usr/lib/libgcj_bc.so \
-		"$pkgdir"/usr/lib/libgcj*.so.* \
-		"$pkgdir"/usr/lib/libgij.so.* \
-		"$pkgdir"/usr/lib/logging.properties \
-		"$pkgdir"/usr/lib/security \
-		"$subpkgdir"/usr/lib/
-
-	mkdir -p "$subpkgdir"/usr/lib/pkgconfig
-	mv "$pkgdir"/usr/lib/pkgconfig/libgcj* "$subpkgdir"/usr/lib/pkgconfig/
-
-	mkdir -p "$subpkgdir"/usr/share/
-	mv "$pkgdir"/usr/share/java "$subpkgdir"/usr/share/
-}
-
-libgo() {
-	pkgdesc="Go runtime library for GCC"
-	depends=
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgo.so.* "$subpkgdir"/usr/lib/
-}
-
-go() {
-	pkgdesc="Go support for GCC"
-	depends="gcc=$_gccrel libgo=$_gccrel"
-
-	mkdir -p "$subpkgdir"/$_gcclibexec \
-		"$subpkgdir"/usr/lib \
-		"$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/lib/go "$subpkgdir"/usr/lib/
-	mv "$pkgdir"/usr/bin/*gccgo "$subpkgdir"/usr/bin/
-	mv "$pkgdir"/usr/bin/*go "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/*gofmt "$subpkgdir"/usr/bin
-	mv "$pkgdir"/$_gcclibexec/go1 "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/$_gcclibexec/cgo "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/usr/lib/libgo.a \
-		"$pkgdir"/usr/lib/libgo.so \
-		"$pkgdir"/usr/lib/libgobegin.a \
-		"$pkgdir"/usr/lib/libgolibbegin.a \
-		"$pkgdir"/usr/lib/libnetgo.a \
-		"$subpkgdir"/usr/lib/
-}
-
-libgfortran() {
-	pkgdesc="Fortran runtime library for GCC"
-	depends=
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgfortran.so.* "$subpkgdir"/usr/lib/
-}
-
-libquadmath() {
-	replaces="gcc"
-	pkgdesc="128-bit math library for GCC"
-	depends=
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libquadmath.so.* "$subpkgdir"/usr/lib/
-}
-
-gfortran() {
-	pkgdesc="GNU Fortran Compiler"
-	depends="gcc=$_gccrel libgfortran=$_gccrel"
-	$LIBQUADMATH && depends="$depends libquadmath=$_gccrel"
-	replaces="gcc"
-
-	mkdir -p "$subpkgdir"/$_gcclibexec \
-		"$subpkgdir"/$_gcclibdir \
-		"$subpkgdir"/usr/lib \
-		"$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/*gfortran "$subpkgdir"/usr/bin/
-	mv "$pkgdir"/usr/lib/libgfortran.a \
-		"$pkgdir"/usr/lib/libgfortran.so \
-		"$subpkgdir"/usr/lib/
-	if $LIBQUADMATH; then
-		mv "$pkgdir"/usr/lib/libquadmath.a \
-			"$pkgdir"/usr/lib/libquadmath.so \
-			"$subpkgdir"/usr/lib/
-	fi
-	mv "$pkgdir"/$_gcclibexec/f951 "$subpkgdir"/$_gcclibexec
-	mv "$pkgdir"/usr/lib/libgfortran.spec "$subpkgdir"/$_gcclibdir
-}
-
-libgnat() {
-	pkgdesc="GNU Ada runtime shared libraries"
-	depends=
-
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libgna*.so "$subpkgdir"/usr/lib/
-}
-
-gnat() {
-	pkgdesc="Ada support for GCC"
-	depends="gcc=$_gccrel"
-	[ "$CHOST" = "$CTARGET" ] && depends="$depends libgnat=$_gccrel"
-
-	mkdir -p "$subpkgdir"/$_gcclibexec \
-		"$subpkgdir"/$_gcclibdir \
-		"$subpkgdir"/usr/bin
-	mv "$pkgdir"/$_gcclibexec/*gnat* "$subpkgdir"/$_gcclibexec/
-	mv "$pkgdir"/$_gcclibdir/*ada* "$subpkgdir"/$_gcclibdir/
-	mv "$pkgdir"/usr/bin/*gnat* "$subpkgdir"/usr/bin/
-}
-
-sha512sums="02c60e54527c7adf584798d5251f8a0b80c93d5deafce82501b2c28e6692e0bd783927bbfc4bc527a863c0cccc025150a34740a9e29badb02d4b48e56a8aba90  gcc-6.4.0.tar.xz
-28f8c6fdbcb19e950b1d0bafb3bcc7a8cba87bc673aa6027cece116599cdee80f0cf5e95a1440544890239f5c754e8a93ab46d9daedd937faef445d7ea33b226  ecj-4.9.jar
-a1335adc2fbee98e36c4437ff2587771b98ed4180726779020f65039498235626a411cdb0100dbd20cd19d12f0d94f9a21af179ff624676c28cead9d60598b5d  001_all_default-ssp-strong.patch
-e36e95b81489163abd6fe9d58f7867bdca43e61143afacbfb17f4698c0b16ec5fd0061d8fab7b2ae615540bebd721c2e2227f80401b4e7fc253da9da62e6b513  002_all_default-relro.patch
-f86466c62b8291fac46f9c250c7ad8fa5ab7b1cce2504442fd07ddc4543665b317ae28951f244e39aba29aeaf3fff252ec4f6a147aa16adb2b7aed747dd89188  003_all_default-fortify-source.patch
-51282fea54c7e616367bbeb2479ba13fec6f24eb47bd04e2071907b3b36273b2ff24676f46ef8d22f241c8ab4857307861eee076eab66797c3a50a8ecaa1809a  005_all_default-as-needed.patch
-3398386dd1e079d6545dd9799adc799c6b80e3984fac6899d0e1a7ee21b66d0c7e53cddf17a65d590c883db750f9f79aaedd857355a8b9f7fb9476c906237919  011_all_default-warn-format-security.patch
-9adb0d2b9b67dd957df6c609b8714c7c078efb52cd88770905c37c67827be8fc83d1125037b9c29d77db21ce78756aa2bb0bacdb0b98d869ac126da76a298e21  012_all_default-warn-trampolines.patch
-d35a3ac7e13a4446921a90e1ff3eec1079840c845f9d523c868e24ae21f94cf69ba041de5341ebef96432a6f57598e223381d4286e8fb8baaa25906707f29fbd  020_all_msgfmt-libstdc++-link.patch
-840070a3c423e6206aaa6e63e1d9a0fcd6efd53626cd1240a193f0b60aa5d84216acc4a2a4fa8bce74549b07e6a316b01d638f20cea13dc62473491a302fb3d6  050_all_libiberty-asprintf.patch
-0a0bc72b9366158f5d23fff1928e756fdd212433bac6ab1f00d632f241382820db8db5d475ddf11ea020eaf7e2e71b12fb9b1c3c870cf84adf6c2b16f15aabca  051_all_libiberty-pic.patch
-e7a2eb1b1870e199d6fd753d065781575656fa12baa264f96c5d179689d88c31b8a3f92a5dae96088c05e96aa2bda138364ad7dbcc79e1819a102f192cbb7bab  053_all_libitm-no-fortify-source.patch
-e87da18aa7ab92b02b06168658c63b42a6c73a08fad2a30f81ef6296100fdbe3c3a91548fd0cb24eaf591e862bb08e4b67249bc4b977b07da33523aee0c686bc  067_all_gcc-poison-system-directories.patch
-4a328d1e1a56c20166307edcfa322068915784d9c08025b7f81cf69714da48fc266b6d34f77b9135c2f10da830d9df408276a1b78d1fd218637c2823506593c2  090_all_pr55930-dependency-tracking.patch
-ef052d0c3c9642fcb5ed570069c5a49c8ef523c47ac8ce3f201a801766f72ae4ff7c3725a70ee66e52c0fb559621e35fe0cf5b88b901d71ceadd381f49653a08  201-cilkrts.patch
-808e206f5e107084156fba333d4e091dcbd62f5d7756142bc292d4b0a52619f8c2aaca3617defc2f5b6552ba0439aebd33f4141329d88eab6ddf2dd637d92c08  203-libgcc_s.patch
-fc0de05b36613b732a0222ea005c90653c6a40d6761b6894af2419272f4e74875f37e26af33a9b9940669ef89269c44c46d17ca5bcd54b5cd1176e5eaf2992c1  204-linux_libc_has_function.patch
-98473bcaa77903a223ca9b0d2087c0921b287a2816d308cc32c8fe009e6cbf5dd1ae7fba27794ab8d9c09e117fe534413d91a464d1218474fc123ce0adfdc2c1  205-nopie.patch
-3287d5b443bea8ec64132bcabe869c738ae98ea8f1a86df1c5d18c927f8816edbfcefeefc47792dbbb2bcacf50319af00e01b3735d34525913b64350770ad453  207-static-pie.patch
-d08d7ead2de0429e5c9055d5b029ec2be9a8c821d22cecaf9b51f633652c493333f98963d9267fa2fa63850c50ae5eefd5f59e5910ec10d20044dac082182a8b  libgcc-always-build-gcceh.a.patch
-600fe5098dc54edaa9808fd5717af9dec058953f9ad37d49cfba1db4f7e9a7a8f02019342f75157fc575946fa693259422184de27b7ecc8386d9f3ecc0f7cc5d  gcc-4.9-musl-fortify.patch
-dbe0ee917fc7668571722364ab7c806731e3a31e8bfa30b4941b28b16b877d2a32b4a3897ef533399a28f82d43cac9b28e92de0493f0e779046db56584e07fa4  gcc-6.1-musl-libssp.patch
-bda845a6aa1854d2c883910b115f79ccfa93dfc2b5eac69a3a236d83eb34cadc140731d616ffc24698c7abc8878dd15f231bcc5119f1860e575a120b311706c7  boehm-gc-musl.patch
-fa62556719449caec6b2b434355bfbcaa5ae55ffe017b3e1f827f66a2aae21b79c571ee7a4ce723ea69169bc3a6447e73650991a200cc372adf2f102677518d7  gcc-pure64.patch
-2253941f3d19b6d08801d3782f5f5ed56c3b73fbc9d3561a8f01c702963ac4fab91599c686076e7081eb6a80c37ccd33591ae978996d6eee1dc0ce0f1c50259a  fix-gcj-stdgnu14-link.patch
-f89ddeb21bc8f97e6a850a6b70b4501a8f3e49a4bc8cc82897488decda5d98ad01cb7f6c8b392d452e9579924a523bc75da6e0648c1c976d42e40af48b10343b  fix-gcj-musl.patch
-54d67cc008b735e47771314171930c5d8b8f5f5dc97fcf4214824c105c808f3e75d22d5a4fdf5068ed0457fa0d46c60cfb442e276259a4a5e9b8722a027d18e6  fix-gcj-iconv-musl.patch
-abe9aaf9aa956058d0386a4396a511d176a46bb3906b90e952383646cdc158cbeb0a5dc616a1ccb1ca7d49fd0b5e351532aa15a3b13362abbf1ca4266f54a687  gcc-4.8-build-args.patch
-35d6d59f0b7b968f282f56767c9e0823a7bdc5aa0d450aca50fbd802649a7ca608b47671244a3faa208a9b0d6832cabb5a22724157dc817b2c0ad63d09f93282  fix-cxxflags-passing.patch
-9016b257abd8fa981de44a49512e35db814d1cbb47c1a87cd31c12d4ae20b13e9e149fe41691a7ec3c95bbcfde8a79194a8d2eaf547ceade3a246fad67c47dd8  ada-fixes.patch
-3f5bc334d9f73d06f5f7c876738d02356acdd08958bea0e4d2095ebf15c2c2ec4e411abdae0297505ae9a1699ca01b17338e853184e84663203b192b0d35fc19  ada-shared.patch
-631d4bdef6d8bde34df7978bb53ec28c3c909cf1f87139e5f148138d0f09adc58b41ecf0148bbf50fb4bc916c411e9bf8a2b6c046c75c0e77d754d8c35bcd4d7  ada-musl.patch
-fa44c8158111627aa0e91c43e7cc3aa38642c2041c96532dd4f0932dae4d6f92ea2850b683abcf10e7e120299d42ea6b69adc00002a514c76be8e39e99fa052b  ada-aarch64-multiarch.patch
-4b4a0ff306a8ef34ff6e3284fbfca869012164a47ba7cb099085c1dd03e6ca0cdd462f82710e08c9a02895adc7484e4c5eef17b5aa264cf5d978fe8ad78eea93  300-main-gcc-add-musl-s390x-dynamic-linker.patch
-385bc2fa50204f678964e5148c6170f572701dab920fbec8301f505bda34d182cde0adb7da042fee71719e12fb59f59181897f9b1bb4f4716ff59aad46ca1998  310-build-gcj-s390x.patch
-f4ef08454e28c8732db69115e4998ec153399e8d229dd27f923dbdcf57b68128a65640d026cc7f45b58ba8764ab1eb575d4eb6d6dfc550a87a183f8b94e76181  320-libffi-gnulinux.patch
-8efd028febb962ae100be32f72f7450c4f77d67ad96a5f47072136cdf47043f9d54835a87c7ab5aaa0fa0108c4c7a97ba2d7732d5aaf2efce70fe1f7e1c39d6e  330-gccgo-link-to-ucontext.patch
-24c8708f64b9b7945b3f07e9bbecf17ab8bcde2524f49cbd694ca2f6146ccc3f13bb027db282f326525ea79d50a2868fa3fa2b0d688a914b5ea77bbfd7e5cbe4  331-gccgo-use-real-off_t-type.patch
-cf19fcc6abee70210a9061e5385fe361a5eb59a74f7d34297420a53e351400da23a060164bef5b322daba4be90019481731acf93c45fb5a93430018f1aa7ce35  332-gccgo-remove-ustat.patch
-d5eb8d289a1de1f9d85d5451a81265a1aac3eea79a555cc4bfaa60cb7c3f80c00ee1ea3791a8069bc22783f3534d6ad20bfaa4e11252f49f9ffa27843315c0ee  libgo-musl-1.2.3.patch
-01c71cd5881fc07ea3b9b980697e89b3ca0fe98502958ceafc3fca18b2604c844e2f457feab711baf8e03f00a5383b0e38aac7eb954034e306f43d4a37f165ed  fix-rs6000-pie.patch
-1860593584f629d24d5b6db14b0a3412e9f93449b663aaa4981301a0923db0159314905e694f27366fbfef72dce06636ab6df86862b7e9e9564847e03bee82c1  add-classic_table-support.patch
-4e1b421ed72668b66ecbcb0a34afa99d2a34cb2ea9ee51c4aad605fc8a0e94e3bfbabae4ebe236efc5ec86fc01a472cbe93f36fe25cf579714939d8102a9b84a  lra-pentium.patch
-67a75a94fdba69de96b98dbc2978a50cb197857c464b81f7c956176da7066b3be937e40cb15e0870fc1e7382d662c5101bcd18cf457fc4112de41802042b51c4  gcc-5.4.0-locale.patch
-ca9e2747fc0ed5b5c35a7df6ae48482855c2663882b5e7a86e65efa5910b3be77380361fe21668718a3e68f6362306a440fa86bff6c50b4d92d6c75ce65a47e8  isl-fix.patch"
diff --git a/legacy/java-gcj-compat/APKBUILD b/legacy/java-gcj-compat/APKBUILD
deleted file mode 100644
index a75f1e6b1..000000000
--- a/legacy/java-gcj-compat/APKBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# Contributor: Timo Teras <timo.teras@iki.fi>
-# Maintainer: A. Wilcox <awilfox@adelielinux.org>
-gccver=6.4.0
-gccpkgrel=10
-
-pkgname=java-gcj-compat
-pkgver=$gccver
-pkgrel=$gccpkgrel
-pkgdesc="Java runtime environment using GCC Java"
-url="https://gcc.gnu.org/"
-arch="all"
-license="GPL-3.0+ AND LGPL-2.1+"
-depends="fastjar gcc-java=$gccver-r$gccpkgrel java-common"
-makedepends="gcc-java=$gccver-r$gccpkgrel zlib-dev"
-subpackages=""
-source=""
-
-build() {
-	mkdir -p $builddir
-	cd $builddir
-	msg "Building ecj..."
-	gcj -Wl,-Bsymbolic -findirect-dispatch -o ecj \
-		--main=org.eclipse.jdt.internal.compiler.batch.Main \
-		/usr/share/java/ecj.jar -lgcj
-}
-
-check() {
-	$builddir/ecj > /dev/null
-}
-
-package() {
-	JVM_DIR=$pkgdir/usr/lib/jvm
-	JDK_DIR=$JVM_DIR/java-1.5-gcj
-	JDK_BIN_DIR=$JDK_DIR/bin
-	JRE_DIR=$JDK_DIR/jre
-	JRE_BIN_DIR=$JRE_DIR/bin
-	JRE_LIB_DIR=$JRE_DIR/lib
-
-	CPU=$(uname -m | sed -e 's/i.86/i386/g' -e 's/x86_64/amd64/g')
-
-	mkdir -p $JDK_BIN_DIR
-	ln -sf ../../../../bin/gij $JDK_BIN_DIR/java
-	ln -sf ../../../../bin/fastjar $JDK_BIN_DIR/fastjar
-	ln -sf ../../../../bin/sinjdoc $JDK_BIN_DIR/javadoc
-	ln -sf ../../../../bin/grmic $JDK_BIN_DIR/rmic
-	ln -sf ../../../../bin/gjavah $JDK_BIN_DIR/javah
-	install -s $builddir/ecj $JDK_BIN_DIR/javac
-	ln -sf ../../../../bin/gappletviewer $JDK_BIN_DIR/appletviewer
-	ln -sf ../../../../bin/gjarsigner $JDK_BIN_DIR/jarsigner
-	ln -sf ../../../../bin/grmiregistry $JDK_BIN_DIR/rmiregistry
-	ln -sf ../../../../bin/gkeytool $JDK_BIN_DIR/keytool
-
-	gcjrel=`ls -d /usr/lib/gcj-$gccver-* | cut -d '-' -f 3`
-
-	mkdir -p $JRE_BIN_DIR $JRE_LIB_DIR/$CPU
-	ln -sf ../../../../../bin/gij $JRE_BIN_DIR/java
-	ln -sf ../../../../../bin/grmiregistry $JRE_BIN_DIR/rmiregistry
-	ln -sf ../../../../../bin/gkeytool $JRE_BIN_DIR/keytool
-	ln -sf ../../../../../share/java/libgcj-$gccver.jar $JRE_LIB_DIR/rt.jar
-	ln -sf ../../../../../share/java/libgcj-tools-$gccver.jar $JRE_LIB_DIR/tools.jar
-	ln -sf ../../../../../../lib/gcj-$gccver-$gcjrel/libjvm.so $JRE_LIB_DIR/$CPU
-	ln -sf ../../../../../../lib/gcj-$gccver-$gcjrel/libjavamath.so $JRE_LIB_DIR/$CPU
-	ln -sf ../../../../../../lib/gcj-$gccver-$gcjrel/classmap.db $JRE_LIB_DIR/$CPU
-}
-
diff --git a/legacy/openjdk7/APKBUILD b/legacy/openjdk7/APKBUILD
deleted file mode 100644
index b94d46452..000000000
--- a/legacy/openjdk7/APKBUILD
+++ /dev/null
@@ -1,289 +0,0 @@
-# Contributor: Timo Teras <timo.teras@iki.fi>
-# Contributor: Jakub Jirutka <jakub@jirutka.cz>
-# Maintainer: A. Wilcox <awilfox@adelielinux.org>
-pkgname=openjdk7
-_icedteaver=2.6.16
-# pkgver is <JDK version>.<JDK update>
-# check icedtea JDK when updating
-pkgver=7.201.$_icedteaver
-pkgrel=0
-pkgdesc="OpenJDK 7 via IcedTea"
-url="https://icedtea.classpath.org/"
-arch="all"
-license="GPL-2.0-only WITH Classpath-exception-2.0"
-depends="$pkgname-jre java-cacerts"
-options="sover-namecheck"
-makedepends="bash findutils zip file mawk util-linux libxslt
-	autoconf automake linux-headers coreutils cmd:which
-	ca-certificates
-	nss-dev cups-dev libjpeg-turbo-dev giflib-dev libpng-dev libxt-dev
-	lcms2-dev libxp-dev libxtst-dev libxinerama-dev zlib-dev
-	libxrender-dev alsa-lib-dev freetype-dev fontconfig-dev
-	gtk+2.0-dev krb5-dev attr-dev pcsc-lite-dev lksctp-tools-dev
-	libxcomposite-dev nss-static"
-install=""
-
-# upstream binary versions
-RHINO_VER=1.7.7.2
-_RHINO_VER=1_7_7_2
-ANT_VER=1.9.11
-
-case $CARCH in
-x86|pmmx)	_jarch=i386;;
-x86_64)		_jarch=amd64;;
-aarch64)	_jarch=aarch64;;
-arm*)		_jarch=arm
-		# openjdk has quite a bit of arm assembly producing textrels
-		# and it's non trivial to fix. allow it for now.
-		options="$options textrels";;
-s390x)		_jarch=s390x;;
-ppc64le)	_jarch=ppc64le;;
-ppc64)		_jarch=ppc64
-		export CFLAGS="$CFLAGS -DABI_ELFv2";;
-ppc)		_jarch=ppc;;
-esac
-
-INSTALL_BASE=/usr/lib/jvm/java-1.7-openjdk
-_jrelib="$INSTALL_BASE/jre/lib/$_jarch"
-
-# exclude xawt from ldpath to avoid duplicate provides for libmawt.so
-# (also in headless). in future this should be a virtual provides.
-ldpath="$_jrelib:$_jrelib/native_threads:$_jrelib/headless:$_jrelib/server:$_jrelib/jli"
-sonameprefix="$pkgname:"
-
-provides="$pkgname-bootstrap=$pkgver-r$pkgrel"
-
-subpackages="$pkgname-jre-lib:jrelib:noarch $pkgname-jre $pkgname-jre-base:jrebase
-	$pkgname-doc:doc"
-
-if [ "$BOOTSTRAP" != "no" ]; then
-	makedepends="$makedepends java-gcj-compat"
-	BOOTSTRAP_JAVA_HOME=/usr/lib/jvm/java-1.5-gcj/
-else
-	makedepends="$makedepends $pkgname-bootstrap fastjar"
-	BOOTSTRAP_JAVA_HOME="$INSTALL_BASE"
-fi
-
-_dropsver=$_icedteaver
-_dropsurl=https://icedtea.classpath.org/download/drops/icedtea7/$_dropsver
-
-source="https://icedtea.classpath.org/download/source/icedtea-$_icedteaver.tar.gz
-	openjdk-$_dropsver.tar.bz2::$_dropsurl/openjdk.tar.bz2
-	corba-$_dropsver.tar.bz2::$_dropsurl/corba.tar.bz2
-	jaxp-$_dropsver.tar.bz2::$_dropsurl/jaxp.tar.bz2
-	jaxws-$_dropsver.tar.bz2::$_dropsurl/jaxws.tar.bz2
-	jdk-$_dropsver.tar.bz2::$_dropsurl/jdk.tar.bz2
-	langtools-$_dropsver.tar.bz2::$_dropsurl/langtools.tar.bz2
-	hotspot-$_dropsver.tar.bz2::$_dropsurl/hotspot.tar.bz2
-	https://archive.apache.org/dist/ant/binaries/apache-ant-$ANT_VER-bin.tar.gz
-	https://github.com/mozilla/rhino/releases/download/Rhino${_RHINO_VER}_Release/rhino-$RHINO_VER.zip
-
-	icedtea-hotspot-musl.patch
-	icedtea-hotspot-musl-ppc.patch
-	icedtea-hotspot-noagent-musl.patch
-	icedtea-hotspot-uclibc-fixes.patch
-	icedtea-jdk-fix-build.patch
-	icedtea-jdk-execinfo.patch
-	icedtea-jdk-fix-ipv6-init.patch
-	icedtea-jdk-musl.patch
-	icedtea-jdk-no-soname.patch
-	icedtea-cpio.patch
-	icedtea-tar.patch
-	icedtea-remove-gawk.patch
-	icedtea-xattr.patch
-	remove-gawk.patch
-	xattr.patch
-	"
-
-# secfixes:
-#   7.201.2.6.16-r0:
-#   - CVE-2018-3136
-#   - CVE-2018-3139
-#   - CVE-2018-3149
-#   - CVE-2018-3169
-#   - CVE-2018-3180
-#   - CVE-2018-3214
-#   - CVE-2018-13785
-
-builddir="$srcdir/icedtea-$_icedteaver"
-
-unpack() {
-	if [ -z "$force" ]; then
-		verify
-		initdcheck
-	fi
-	mkdir -p "$srcdir"
-	msg "Unpacking sources..."
-	tar -C "$srcdir" -zxf icedtea-$_icedteaver.tar.gz
-	tar -C "$srcdir" -zxf apache-ant-$ANT_VER-bin.tar.gz
-	unzip -o -q "rhino-$RHINO_VER.zip" -d "$srcdir"
-}
-
-prepare() {
-	cd "$builddir"
-
-	# Busybox sha256 does not support longopts
-	sed -e "s/--check/-c/g" -i Makefile.am
-
-	for patch in $source; do
-		case $patch in
-		icedtea-*.patch)
-			cp ../$patch patches
-			;;
-		*.patch)
-			msg "Applying patch $patch"
-			patch -p1 -i "$srcdir"/$patch
-			;;
-		esac
-	done
-
-	./autogen.sh
-}
-
-build() {
-	[ -z "$JOBS" ] && export JOBS=$(echo $MAKEFLAGS | sed -n -e 's/.*-j\([0-9]\+\).*/\1/p')
-	export ALT_PARALLEL_COMPILE_JOBS="${JOBS:-2}"
-	export HOTSPOT_BUILD_JOBS="${JOBS:-2}"
-
-	export JAVA_HOME=$BOOTSTRAP_JAVA_HOME
-	export PATH=$JAVA_HOME/bin:$srcdir/apache-ant-$ANT_VER/bin:$PATH
-	export DISTRIBUTION_PATCHES=""
-
-	# Explicitly set the C++ standard as the default has changed on GCC 6+
-	# and disable optimizations that lead to a broken JVM. These options
-	# has been adopted from the Fedora package.
-	export EXTRA_CPP_FLAGS="$CXXFLAGS -std=gnu++98 -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-strict-overflow"
-	# CXXFLAGS doesn't make it to all calls, so we set the C++ standard
-	# version for C too.
-	export EXTRA_CFLAGS="$CFLAGS -std=gnu++98 -Wno-error -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-strict-overflow"
-
-	local patch
-	for patch in $source; do
-		case $patch in
-		icedtea-*.patch)
-			export DISTRIBUTION_PATCHES="$DISTRIBUTION_PATCHES patches/$patch"
-			;;
-		esac
-	done
-	echo "icedtea patches: $DISTRIBUTION_PATCHES"
-
-	# --disable-arm32-jit: https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2942
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=$INSTALL_BASE \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		--with-parallel-jobs=${JOBS:-2} \
-		--disable-dependency-tracking \
-		--disable-downloading \
-		--disable-arm32-jit \
-		--with-rhino=$srcdir/rhino$RHINO_VER/lib/rhino-$RHINO_VER.jar \
-		--with-openjdk-src-zip=$srcdir/openjdk-$_dropsver.tar.bz2 \
-		--with-hotspot-src-zip=$srcdir/hotspot-$_dropsver.tar.bz2 \
-		--with-corba-src-zip=$srcdir/corba-$_dropsver.tar.bz2 \
-		--with-jaxp-src-zip=$srcdir/jaxp-$_dropsver.tar.bz2 \
-		--with-jaxws-src-zip=$srcdir/jaxws-$_dropsver.tar.bz2 \
-		--with-jdk-src-zip=$srcdir/jdk-$_dropsver.tar.bz2 \
-		--with-langtools-src-zip=$srcdir/langtools-$_dropsver.tar.bz2 \
-		--with-jdk-home=$BOOTSTRAP_JAVA_HOME \
-		--with-pkgversion="Adelie ${pkgver}-r${pkgrel}"
-
-	msg "Icedtea boot"
-	make -j1 icedtea-boot SHELL=/bin/bash
-	msg "Icedtea boot done"
-	make
-}
-
-package() {
-	mkdir -p "$pkgdir"/$INSTALL_BASE
-	cp -a "$builddir"/openjdk.build/j2sdk-image/* "$pkgdir"/$INSTALL_BASE
-	rm "$pkgdir"/$INSTALL_BASE/src.zip
-
-	# symlink to shared java cacerts store
-	rm -f "$pkgdir"/$INSTALL_BASE/jre/lib/security/cacerts
-	ln -sf /etc/ssl/certs/java/cacerts \
-		"$pkgdir"/$INSTALL_BASE/jre/lib/security/cacerts
-}
-
-jrelib() {
-	pkgdesc="OpenJDK 7 Java Runtime (class libraries)"
-	depends=""
-
-	local A; for A in jre/lib/zi jre/lib/images jre/lib/*.jar \
-			jre/lib/security jre/lib/ext/*.jar jre/lib/cmm \
-			jre/ASSEMBLY_EXCEPTION jre/THIRD_PARTY_README jre/LICENSE; do
-
-		local dirname="${A%/*}"
-		mkdir -p "$subpkgdir"/$INSTALL_BASE/$dirname
-		mv "$pkgdir"/$INSTALL_BASE/$A "$subpkgdir"/$INSTALL_BASE/$dirname
-	done
-}
-
-jrebase() {
-	pkgdesc="OpenJDK 7 Java Runtime (no GUI support)"
-	depends="$pkgname-jre-lib java-common java-cacerts"
-
-	mkdir -p "$subpkgdir"/$INSTALL_BASE/bin
-
-	local A; for A in java orbd rmid servertool unpack200 keytool \
-			pack200 rmiregistry tnameserv; do
-		mv "$pkgdir"/$INSTALL_BASE/bin/$A "$subpkgdir"/$INSTALL_BASE/bin
-	done
-
-	# rest of the jre subdir (which were not taken by -jre subpkg)
-	mv "$pkgdir"/$INSTALL_BASE/jre "$subpkgdir"/$INSTALL_BASE
-}
-
-jre() {
-	pkgdesc="OpenJDK 7 Java Runtime"
-	# manually depend to avoid clash with libgcj's libjvm.so
-	depends="so:openjdk7:libjvm.so=0"
-
-	mkdir -p "$subpkgdir"
-	local A; for A in jre/bin/policytool \
-			bin/appletviewer \
-			bin/policytool \
-			jre/lib/$_jarch/xawt \
-			jre/lib/$_jarch/libsplashscreen.so; do
-
-		local dirname="${A%/*}"
-		mkdir -p "$subpkgdir"/$INSTALL_BASE/$dirname
-		mv "$pkgdir"/$INSTALL_BASE/$A "$subpkgdir"/$INSTALL_BASE/$dirname
-	done
-}
-
-doc() {
-	default_doc
-	mkdir -p "$subpkgdir"/$INSTALL_BASE/
-	mv "$pkgdir"/$INSTALL_BASE/man "$subpkgdir"/$INSTALL_BASE/
-}
-
-sha512sums="cc782e1c5b1ce158be315cff5be61676373870c2062eb34688583a875ab68413bbabd909ce83e79a9c46c3d0c8ec10aad3c015276ddf782ce2079cb5a7098f82  icedtea-2.6.16.tar.gz
-ee2443da63ab6b1a525d0633a577f28d28d3916cb47b312d61d71b4795ae3bde4a70478017b7639133fb65cfb63aa0fcbc397afbde18f20d605a50286163e4a2  openjdk-2.6.16.tar.bz2
-3926a1c889d0ff5386dd78e8fb1ff71b553744fe574ab9655d9e1677da9aea3306d65e631866afcbb533b8e0fefbb34ae655400c9bc7c2058aaa34f8fb0a04d8  corba-2.6.16.tar.bz2
-2b37ba6f235b684682d9590c292b6af5fb6f41d4001f92dcf4945570e13fe760f91bbc7068d071e3e935829c9719936ae96940874ee211fd32cba187e05f0255  jaxp-2.6.16.tar.bz2
-41dc2b7a610cd5f4c9155c14670bb97f1c57924af2737faf6beb7b284c0ad7c0f0b33f4276cde5674a57db3f88ba4503f94f2dff7a52db3273ee53ed0b14be64  jaxws-2.6.16.tar.bz2
-2703b7bf7455aa3997426f2ce3d4c2285ee44640a940d15c1c3434414c295d87b44e749fece5a7b966661910c8768a79774fb03b43ab5605df9dc8965b600fd7  jdk-2.6.16.tar.bz2
-192dd5fac399c52bcb547617832428b40af493089b4bb63159cd9363c78af76c7acdc051d461eb4e4692b2090e05ed769b9fec460a328973b36b57bbb28cee39  langtools-2.6.16.tar.bz2
-73b0338ec293d0d87cc7251f63ef453ec10c7de978c56d8ff455b16ee0506175aed681a9a95fbdcc8b747ba00ef6cf914f63d0c5d22268b40620d4dbc7390a98  hotspot-2.6.16.tar.bz2
-0da12cb0f761b8cb76e042449e7d93f43236e7bc948e337215470a70031f0a2dda6d1b508f9397b283808d84c4ebddb31558fe1cd8e6e6469c1dd390d69ec6e7  apache-ant-1.9.11-bin.tar.gz
-1b9e8721749e81c5420a00af1e00ee0e4f48624ccb4e9aa969032114116ad50f59b254d4d16d74feff74de64157cc8b0a2ead9b555907c84b7055b796fba9a75  rhino-1.7.7.2.zip
-f62b942f0bacda8e37d0f1876d8ba14ddb4fc55a7d5fd1019463744927f40f422a85e9ee051948d566242f5a785aa28f275eb58768611283cba89af91235f43c  icedtea-hotspot-musl.patch
-e5cf4d70f96fc1e72ae8b97a887adb96092ff36584711cbb8de9d9fa9e859cb8731d638838de0d9591239fc44ffe5c74422d1842bd9f10a0c00dff1627bdeeef  icedtea-hotspot-musl-ppc.patch
-e7a2c1771bb582d427041f8d22e48c0daf8f20d7c0926cbce3549d49c4e949359ee25a35682b486e82f3e390535c950c5beee3bd8d06fb5a717b50f2d9b2a6bc  icedtea-hotspot-noagent-musl.patch
-822eee0dc4d3ba677a289dfeb3668b536d2d626708390a9d9702fb4144a481fd443a215a0d2041c6026113837aafa4ba0b5e9ead8589d2da6717a238bbc95a5a  icedtea-hotspot-uclibc-fixes.patch
-213a537de5f011cb39d608515c3413513ac75fb93593f9a9ef4205f71d72bdd8b097c80db185f7b26021d5bb85045b866f34f3478482dc4189972d8614a13458  icedtea-jdk-fix-build.patch
-0391970e6a32946aa3cccf38fdef9c0fe2af26cd0df824b98aa2fcfa1bf661d4a68e339bffcfd16f386c565fc68bb28a29208a67d4bad8a0e847ad02bd8becbb  icedtea-jdk-execinfo.patch
-48533f87fc2cf29d26b259be0df51087d2fe5b252e72d00c6ea2f4add7b0fb113141718c116279c5905e03f64a1118082e719393786811367cf4d472b5d36774  icedtea-jdk-fix-ipv6-init.patch
-44a35941c80f408d0607e32763b3b6ccee21e1d39886309327d3d74d2900117e4346ef59e77c663fd022fec10ee8f365eeb46c1260014d5765d226ce175ce3c5  icedtea-jdk-musl.patch
-bf4b184e170f7b0ff64ab30d2162784fe2bd5460d1fa31973259f7065fd4c511c46f97724fe2bd72bb94e9006cb568d0e0c87d1a9c90819e65880f8f44830bb1  icedtea-jdk-no-soname.patch
-a54c79c82afa1bc95265397b274260584c8b8c6be1651ddfb907d9523a809ea4581409e0d3fb0bbb63ef5a204e8ce29b7940e78cd640af1f490ae938c59129b6  icedtea-cpio.patch
-dc5f59068395e9501b17308c91ec80670c195117e22cb7bef78d551d118f180a11d7f0b5d47f4c7106909d9a9a8c060ddd60b78f251fd35afa6c72a1515af53e  icedtea-tar.patch
-049061b97d6e744b7ad9bad4a3dbfa1d236400003175e49740830dcb78a1f164b5c67b066e76c970eb27e09707f948cac0f5b7073abe0f49bcecfdd747f0107d  icedtea-remove-gawk.patch
-b9950ddf9c5ebb53d1e029a1fe8ef843860128ceb05872313b33fd2696a4acadbc8291110ca6513ce7531e0f943e42b167068e603f7ecd0e36f5b16d6bb827ab  icedtea-xattr.patch
-fda1ba46276475cced16c4f380dbc0a0ac07ae2d66a8da10e88455a299bd40ff04a63dae1c5f3d3de6adbb3c6c240db5d37df0be2fc3391764cb21c9ad83eb8b  remove-gawk.patch
-3dd758e04e3b852398d81356c02a89afce0c664938d3f0179ee32e358d7057f5f969379329dd1ebcbf4bc3d37bd5e0d94102cd3f023326db5175968cfbbc9c35  xattr.patch"
diff --git a/user/openjdk7/APKBUILD b/user/openjdk7/APKBUILD
new file mode 100644
index 000000000..3fa9af806
--- /dev/null
+++ b/user/openjdk7/APKBUILD
@@ -0,0 +1,593 @@
+# Contributor: Timo Teras <timo.teras@iki.fi>
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: Zach van Rijn <me@zv.io>
+pkgname=openjdk7
+# pkgver is <JDK version>.<JDK update>
+pkgver=7.201.$_icedteaver
+# Check https://icedtea.classpath.org/download/source/ when updating
+_icedteaver=2.6.16
+pkgrel=0
+pkgdesc="OpenJDK 7 via IcedTea"
+url="https://icedtea.classpath.org/"
+arch="all"
+license="GPL-2.0-only WITH Classpath-exception-2.0"
+depends="$pkgname-jre java-cacerts"
+options="sover-namecheck"
+
+# GCJ is required to bootstrap from source; it was removed from GCC 7.
+# GCC 6 is not packaged or installed.
+_gccver=6.4.0
+_gccmaj=${_gccver%%.*}
+_ecjver=4.9
+makedepends_gcc="bison flex linux-headers texinfo zip
+	gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev libucontext-dev
+	libart-lgpl-dev
+	"
+
+makedepends="bash findutils zip file mawk util-linux libxslt
+	autoconf automake linux-headers coreutils cmd:which
+	ca-certificates
+	nss-dev cups-dev libjpeg-turbo-dev giflib-dev libpng-dev libxt-dev
+	lcms2-dev libxp-dev libxtst-dev libxinerama-dev zlib-dev
+	libxrender-dev alsa-lib-dev freetype-dev fontconfig-dev
+	gtk+2.0-dev krb5-dev attr-dev pcsc-lite-dev lksctp-tools-dev
+	libxcomposite-dev nss-static cmd:wget
+	unzip
+
+	$makedepends_gcc
+	"
+
+install=""
+
+# upstream binary versions
+RHINO_VER=1.7.7.2
+_RHINO_VER=1_7_7_2
+ANT_VER=1.9.11
+
+case $CARCH in
+x86|pmmx)	_jarch=i386;;
+x86_64)		_jarch=amd64;;
+aarch64)	_jarch=aarch64;;
+arm*)		_jarch=arm
+		# openjdk has quite a bit of arm assembly producing textrels
+		# and it's non trivial to fix. allow it for now.
+		options="$options textrels";;
+s390x)		_jarch=s390x;;
+ppc64le)	_jarch=ppc64le;;
+ppc64)		_jarch=ppc64; ;;
+ppc)		_jarch=ppc;;
+esac
+
+INSTALL_BASE=/usr/lib/jvm/java-1.7-openjdk
+_jrelib="$INSTALL_BASE/jre/lib/$_jarch"
+_jvmdir=/usr/lib/jvm/java-1.5-gcj
+
+# exclude xawt from ldpath to avoid duplicate provides for libmawt.so
+# (also in headless). in future this should be a virtual provides.
+ldpath="$_jrelib:$_jrelib/native_threads:$_jrelib/headless:$_jrelib/server:$_jrelib/jli"
+sonameprefix="$pkgname:"
+
+provides="$pkgname-bootstrap=$pkgver-r$pkgrel"
+
+subpackages="$pkgname-jre-lib:jrelib:noarch $pkgname-jre $pkgname-jre-base:jrebase
+	$pkgname-doc:doc"
+
+BOOTSTRAP_JAVA_HOME="$_jvmdir"
+_bootstrap_java_home="$srcdir/gcc-$_gccver/usr/share/java"
+
+_dropsver=$_icedteaver
+_dropsurl=https://icedtea.classpath.org/download/drops/icedtea7/$_dropsver
+
+source_gcc="
+	https://ftp.gnu.org/gnu/gcc/gcc-$_gccver/gcc-$_gccver.tar.xz
+	https://sourceware.org/pub/java/ecj-$_ecjver.jar
+
+	gcc-001_all_default-ssp-strong.patch
+	gcc-002_all_default-relro.patch
+	gcc-003_all_default-fortify-source.patch
+	gcc-005_all_default-as-needed.patch
+	gcc-011_all_default-warn-format-security.patch
+	gcc-012_all_default-warn-trampolines.patch
+	gcc-020_all_msgfmt-libstdc++-link.patch
+	gcc-050_all_libiberty-asprintf.patch
+	gcc-051_all_libiberty-pic.patch
+	gcc-053_all_libitm-no-fortify-source.patch
+	gcc-067_all_gcc-poison-system-directories.patch
+	gcc-090_all_pr55930-dependency-tracking.patch
+
+	gcc-201-cilkrts.patch
+	gcc-203-libgcc_s.patch
+	gcc-204-linux_libc_has_function.patch
+	gcc-205-nopie.patch
+	gcc-207-static-pie.patch
+
+	gcc-libgcc-always-build-gcceh.a.patch
+	gcc-gcc-4.9-musl-fortify.patch
+	gcc-gcc-6.1-musl-libssp.patch
+	gcc-boehm-gc-musl.patch
+	gcc-gcc-pure64.patch
+	gcc-fix-gcj-stdgnu14-link.patch
+	gcc-fix-gcj-musl.patch
+	gcc-fix-gcj-iconv-musl.patch
+
+	gcc-gcc-4.8-build-args.patch
+	gcc-fix-cxxflags-passing.patch
+	gcc-ada-fixes.patch
+	gcc-ada-shared.patch
+	gcc-ada-musl.patch
+	gcc-ada-aarch64-multiarch.patch
+
+	gcc-300-main-gcc-add-musl-s390x-dynamic-linker.patch
+	gcc-310-build-gcj-s390x.patch
+	gcc-320-libffi-gnulinux.patch
+	gcc-330-gccgo-link-to-ucontext.patch
+	gcc-331-gccgo-use-real-off_t-type.patch
+	gcc-332-gccgo-remove-ustat.patch
+	gcc-libgo-musl-1.2.3.patch
+
+	gcc-fix-rs6000-pie.patch
+	gcc-add-classic_table-support.patch
+	gcc-lra-pentium.patch
+
+	gcc-gcc-5.4.0-locale.patch
+	gcc-isl-fix.patch
+	"
+
+source="https://icedtea.classpath.org/download/source/icedtea-$_icedteaver.tar.gz
+	openjdk-$_dropsver.tar.bz2::$_dropsurl/openjdk.tar.bz2
+	corba-$_dropsver.tar.bz2::$_dropsurl/corba.tar.bz2
+	jaxp-$_dropsver.tar.bz2::$_dropsurl/jaxp.tar.bz2
+	jaxws-$_dropsver.tar.bz2::$_dropsurl/jaxws.tar.bz2
+	jdk-$_dropsver.tar.bz2::$_dropsurl/jdk.tar.bz2
+	langtools-$_dropsver.tar.bz2::$_dropsurl/langtools.tar.bz2
+	hotspot-$_dropsver.tar.bz2::$_dropsurl/hotspot.tar.bz2
+	https://archive.apache.org/dist/ant/binaries/apache-ant-$ANT_VER-bin.tar.gz
+	https://github.com/mozilla/rhino/releases/download/Rhino${_RHINO_VER}_Release/rhino-$RHINO_VER.zip
+
+	icedtea-hotspot-musl.patch
+	icedtea-hotspot-musl-ppc.patch
+	icedtea-hotspot-noagent-musl.patch
+	icedtea-hotspot-uclibc-fixes.patch
+	icedtea-jdk-fix-build.patch
+	icedtea-jdk-execinfo.patch
+	icedtea-jdk-fix-ipv6-init.patch
+	icedtea-jdk-musl.patch
+	icedtea-jdk-no-soname.patch
+	icedtea-cpio.patch
+	icedtea-tar.patch
+	icedtea-remove-gawk.patch
+	icedtea-xattr.patch
+	icedtea-newer-freetype.patch
+
+	remove-gawk.patch
+	xattr.patch
+	project-autoconf-2xx.patch
+
+	$source_gcc
+	"
+
+builddir="$srcdir/icedtea-$_icedteaver"
+
+srcdir_gcc="${srcdir}_gcc"
+
+#---------------------------------------------------------------
+# gcc
+
+STRIP_FOR_TARGET=${CROSS_COMPILE}strip
+
+: ${LANG_CXX:=true}
+: ${LANG_OBJC:=false}
+: ${LANG_JAVA:=true}
+: ${LANG_GO:=false}
+: ${LANG_FORTRAN:=false}
+: ${LANG_ADA:=false}
+
+LIBGCC=true
+LIBATOMIC=true
+LIBITM=true
+
+_languages=java
+#---------------------------------------------------------------
+
+clean() {
+	rm -fr "$srcdir"
+	rm -fr "$srcdir_gcc"
+}
+
+unpack_gcc() {
+	mkdir -p "$srcdir_gcc"
+	tar -C "$srcdir_gcc" -Jxf gcc-$_gccver.tar.xz
+}
+
+unpack() {
+	if [ -z "$force" ]; then
+		verify
+		initdcheck
+	fi
+	mkdir -p "$srcdir"
+	msg "Unpacking sources..."
+	tar -C "$srcdir" -zxf icedtea-$_icedteaver.tar.gz
+	tar -C "$srcdir" -zxf apache-ant-$ANT_VER-bin.tar.gz
+	unzip -o -q "rhino-$RHINO_VER.zip" -d "$srcdir"
+
+	unpack_gcc
+}
+
+# we build out-of-tree
+_gccdir="$srcdir_gcc"/gcc-$_gccver
+_gcclibdir=/usr/lib/gcc/${CTARGET}/$_gccver
+_gcclibexec=/usr/libexec/gcc/${CTARGET}/$_gccver
+
+prepare_gcc () {
+	cd "$_gccdir"
+
+	_err=
+	for i in $source_gcc; do
+		case "$i" in
+		*.patch)
+			msg "Applying $i"
+			patch -p1 -F3 -i "$srcdir"/$i || _err="$_err $i"
+			;;
+		esac
+	done
+
+	if [ -n "$_err" ]; then
+		error "The following patches failed:"
+		for i in $_err; do
+			echo "  $i"
+		done
+		return 1
+	fi
+
+	# see http://gcc.gnu.org/ml/java/2008-04/msg00027.html
+	mv "$srcdir"/ecj-*.jar ecj.jar
+
+	echo ${_gccver} > gcc/BASE-VER
+	echo "UNSUPPORTED=1" > libcilkrts/configure.tgt
+	rm libgo/go/syscall/libcall_linux_ustat.go
+}
+
+prepare() {
+	cd "$builddir"
+
+	# Busybox sha256 does not support longopts
+	sed -e "s/--check/-c/g" -i Makefile.am
+
+	for patch in $source; do
+		case $patch in
+		icedtea-*.patch)
+			cp ../$patch patches
+			;;
+		gcc-*.patch)
+			continue; # defer gcc patches to end of routine
+			;;
+		*.patch)
+			msg "Applying patch $patch"
+			patch -p1 -i "$srcdir"/$patch
+			;;
+		esac
+	done
+
+	./autogen.sh
+
+	prepare_gcc
+}
+
+build_gcc() {
+	mkdir "$_gccdir"/build
+	cd "$_gccdir"/build
+
+	local _arch_configure=
+	local _libc_configure=
+	local _cross_configure=
+	local _bootstrap_configure=
+	local _hash_style=gnu
+	local _symvers=
+
+	case "$CTARGET" in
+	aarch64-*-*-*)		_arch_configure="--with-arch=armv8-a --with-abi=lp64 --enable-fix-cortex-a53-835769 --enable-fix-cortex-a53-843419";;
+	armv5-*-*-*eabi)	_arch_configure="--with-arch=armv5te --with-tune=arm926ej-s --with-float=soft --with-abi=aapcs-linux";;
+	armv6-*-*-*eabihf)	_arch_configure="--with-arch=armv6zk --with-tune=arm1176jzf-s --with-fpu=vfp --with-float=hard --with-abi=aapcs-linux";;
+	armv7-*-*-*eabihf)	_arch_configure="--with-arch=armv7-a --with-tune=generic-armv7-a --with-fpu=vfpv3-d16 --with-float=hard --with-abi=aapcs-linux --with-mode=thumb";;
+	m68k-*-*-*)		_arch_configure="--with-arch=68020 --with-tune=68020-40";;
+	mipsel-*-*-*)		_arch_configure="--with-arch-32=mips2 --with-tune-32=mips32 --with-fp-32=32 --with-mips-plt --with-float=hard --with-abi=32";;
+	mips-*-*-*)		_arch_configure="--with-arch=mips3 --with-mips-plt --with-abi=32"; _hash_style="sysv";;
+	mips32el-*-*-*)		_arch_configure="--with-arch=mips32 --with-mips-plt --with-abi=32"; _hash_style="sysv";;
+	powerpc-*-*-*)		_arch_configure="--enable-secureplt --enable-decimal-float=no";;
+	powerpc64*-*-*-*)	_arch_configure="--with-abi=elfv2 --enable-secureplt --enable-decimal-float=no";;
+	powerpc64le*-*-*-*)	_arch_configure="--with-abi=elfv2 --enable-secureplt --enable-decimal-float=no";;
+	i486-*-*-*)		_arch_configure="--with-arch=i486 --with-tune=generic --enable-cld";;
+	i586-*-*-*)		_arch_configure="--with-arch=i586 --with-tune=pentium2 --enable-cld --enable-mmx";;
+	pentium3-*-*-*)		_arch_configure="--with-arch=pentium3 --with-tune=pentium-m";;
+	s390x-*-*-*)		_arch_configure="--with-arch=z196 --with-tune=zEC12 --with-zarch --with-long-double-128 --enable-decimal-float";;
+	esac
+
+	case "$CTARGET_LIBC" in
+	musl)
+		# musl does not support mudflap, or libsanitizer
+		# libmpx uses secure_getenv and struct _libc_fpstate not present in musl
+		_libc_configure="--disable-libmpx --disable-libmudflap --disable-libsanitizer"
+		_symvers="--disable-symvers"
+		export libat_cv_have_ifunc=no
+		export ac_cv_type_off64_t=no
+		;;
+	esac
+
+	_cross_configure="--disable-bootstrap"
+
+	case "$BOOTSTRAP" in
+	nolibc)	_bootstrap_configure="--with-newlib --disable-shared --enable-threads=no" ;;
+	*)	_bootstrap_configure="--enable-shared --enable-threads --enable-tls" ;;
+	esac
+
+	$LIBATOMIC	|| _bootstrap_configure="$_bootstrap_configure --disable-libatomic"
+	$LIBITM		|| _bootstrap_configure="$_bootstrap_configure --disable-libitm"
+	$LIBQUADMATH	|| _arch_configure="$_arch_configure --disable-libquadmath"
+
+#	export CFLAGS="$CPPFLAGS $CFLAGS"
+#	export CXXFLAGS="$CPPFLAGS $CXXFLAGS"
+#	unset CPPFLAGS
+#	export CFLAGS_FOR_TARGET=" "
+#	export CXXFLAGS_FOR_TARGET=" "
+#	export LDFLAGS_FOR_TARGET=" "
+
+	msg "Building the following:"
+	echo ""
+	echo "  CBUILD=$CBUILD"
+	echo "  CHOST=$CHOST"
+	echo "  CTARGET=$CTARGET"
+	echo "  CTARGET_ARCH=$CTARGET_ARCH"
+	echo "  CTARGET_LIBC=$CTARGET_LIBC"
+	echo "  languages=$_languages"
+	echo "  arch_configure=$_arch_configure"
+	echo "  libc_configure=$_libc_configure"
+	echo "  cross_configure=$_cross_configure"
+	echo "  bootstrap_configure=$_bootstrap_configure"
+	echo "  hash_style=$_hash_style"
+	echo ""
+
+	"$_gccdir"/configure --prefix="$srcdir"/gcc-$_gccver/usr \
+		--mandir="$srcdir"/gcc-$_gccver/usr/share/man \
+		--infodir="$srcdir"/gcc-$_gccver/usr/share/info \
+		--build=${CBUILD} \
+		--host=${CHOST} \
+		--target=${CTARGET} \
+		--with-pkgversion="Adelie ${_gccver}" \
+		--with-bugurl="https://git.adelielinux.org/adelie/packages/-/issues" \
+		--enable-checking=release \
+		--disable-fixed-point \
+		--disable-libstdcxx-pch \
+		--disable-multilib \
+		--disable-werror \
+		$_symvers \
+		--enable-__cxa_atexit \
+		--enable-default-pie \
+		--enable-cloog-backend \
+		--enable-languages=$_languages \
+		$_arch_configure \
+		$_libc_configure \
+		$_cross_configure \
+		$_bootstrap_configure \
+		--with-system-zlib \
+		--with-linker-hash-style=$_hash_style \
+		--enable-java-awt=gtk \
+		--enable-java-home \
+		--with-jvm-root-dir="$srcdir"/gcc-$_gccver"${_jvmdir}" \
+		--with-ecj-jar="$_gccdir"/ecj.jar \
+		;
+	make
+
+	# ephemeral (only used for openjdk build)
+	make -j1 install
+	cp "$_gccdir"/build/$CTARGET/libjava/scripts/jar "$srcdir"/gcc-$_gccver/usr/bin
+}
+
+build() {
+	build_gcc
+
+	cd "$builddir" # lost during gcc build?
+
+	export PATH="$JAVA_HOME/bin:$srcdir/gcc-$_gccver/usr/bin:$PATH"
+	export LD_LIBRARY_PATH="$srcdir"/gcc-$_gccver/usr/lib
+
+	[ -z "$JOBS" ] && export JOBS=$(echo $MAKEFLAGS | sed -n -e 's/.*-j\([0-9]\+\).*/\1/p')
+	export ALT_PARALLEL_COMPILE_JOBS="${JOBS:-2}"
+	export HOTSPOT_BUILD_JOBS="${JOBS:-2}"
+
+	export JAVA_HOME=$BOOTSTRAP_JAVA_HOME
+	export ANT_HOME="$srcdir"/gcc-$_gccver/usr
+	export PATH=$JAVA_HOME/bin:$srcdir/apache-ant-$ANT_VER/bin:$PATH
+	export DISTRIBUTION_PATCHES=""
+
+	# Explicitly set the C++ standard as the default has changed on GCC 6+
+	# and disable optimizations that lead to a broken JVM. These options
+	# has been adopted from the Fedora package.
+	export EXTRA_CPP_FLAGS="$CXXFLAGS -std=gnu++98 -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-strict-overflow"
+	# CXXFLAGS doesn't make it to all calls, so we set the C++ standard
+	# version for C too.
+	export EXTRA_CFLAGS="$CFLAGS -std=gnu++98 -Wno-error -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-strict-overflow"
+
+	local patch
+	for patch in $source; do
+		case $patch in
+		icedtea-*.patch)
+			export DISTRIBUTION_PATCHES="$DISTRIBUTION_PATCHES patches/$patch"
+			;;
+		esac
+	done
+	echo "icedtea patches: $DISTRIBUTION_PATCHES"
+
+	# --disable-arm32-jit: https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2942
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=$INSTALL_BASE \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		--with-parallel-jobs=${JOBS:-2} \
+		--disable-dependency-tracking \
+		--disable-downloading \
+		--disable-arm32-jit \
+		--with-rhino=$srcdir/rhino$RHINO_VER/lib/rhino-$RHINO_VER.jar \
+		--with-openjdk-src-zip=$srcdir/openjdk-$_dropsver.tar.bz2 \
+		--with-hotspot-src-zip=$srcdir/hotspot-$_dropsver.tar.bz2 \
+		--with-corba-src-zip=$srcdir/corba-$_dropsver.tar.bz2 \
+		--with-jaxp-src-zip=$srcdir/jaxp-$_dropsver.tar.bz2 \
+		--with-jaxws-src-zip=$srcdir/jaxws-$_dropsver.tar.bz2 \
+		--with-jdk-src-zip=$srcdir/jdk-$_dropsver.tar.bz2 \
+		--with-langtools-src-zip=$srcdir/langtools-$_dropsver.tar.bz2 \
+		--with-jdk-home="$srcdir"/gcc-$_gccver/$BOOTSTRAP_JAVA_HOME \
+		--with-pkgversion="Adelie ${pkgver}-r${pkgrel}" \
+		--enable-nss \
+		--enable-non-nss-curves \
+		--enable-bootstrap \
+		--with-gcj="$srcdir"/gcc-$_gccver/usr/bin/gcj \
+		--with-ecj-jar="$_gccdir"/ecj.jar \
+		;
+
+	msg "Icedtea boot"
+	make -j1 icedtea-boot SHELL=/bin/bash USRBIN_PATH=/bin/
+	msg "Icedtea boot done"
+	make
+}
+
+package() {
+	mkdir -p "$pkgdir"/$INSTALL_BASE
+	cp -a "$builddir"/openjdk.build/j2sdk-image/* "$pkgdir"/$INSTALL_BASE
+	rm "$pkgdir"/$INSTALL_BASE/src.zip
+
+	# symlink to shared java cacerts store
+	rm -f "$pkgdir"/$INSTALL_BASE/jre/lib/security/cacerts
+	ln -sf /etc/ssl/certs/java/cacerts \
+		"$pkgdir"/$INSTALL_BASE/jre/lib/security/cacerts
+}
+
+jrelib() {
+	pkgdesc="OpenJDK 7 Java Runtime (class libraries)"
+	depends=""
+
+	local A; for A in jre/lib/zi jre/lib/images jre/lib/*.jar \
+			jre/lib/security jre/lib/ext/*.jar jre/lib/cmm \
+			jre/ASSEMBLY_EXCEPTION jre/THIRD_PARTY_README jre/LICENSE; do
+
+		local dirname="${A%/*}"
+		mkdir -p "$subpkgdir"/$INSTALL_BASE/$dirname
+		mv "$pkgdir"/$INSTALL_BASE/$A "$subpkgdir"/$INSTALL_BASE/$dirname
+	done
+}
+
+jrebase() {
+	pkgdesc="OpenJDK 7 Java Runtime (no GUI support)"
+	depends="$pkgname-jre-lib java-common java-cacerts"
+
+	mkdir -p "$subpkgdir"/$INSTALL_BASE/bin
+
+	local A; for A in java orbd rmid servertool unpack200 keytool \
+			pack200 rmiregistry tnameserv; do
+		mv "$pkgdir"/$INSTALL_BASE/bin/$A "$subpkgdir"/$INSTALL_BASE/bin
+	done
+
+	# rest of the jre subdir (which were not taken by -jre subpkg)
+	mv "$pkgdir"/$INSTALL_BASE/jre "$subpkgdir"/$INSTALL_BASE
+}
+
+jre() {
+	pkgdesc="OpenJDK 7 Java Runtime"
+	# manually depend to avoid clash with libgcj's libjvm.so
+	depends="so:openjdk7:libjvm.so=0"
+
+	mkdir -p "$subpkgdir"
+	local A; for A in jre/bin/policytool \
+			bin/appletviewer \
+			bin/policytool \
+			jre/lib/$_jarch/xawt \
+			jre/lib/$_jarch/libsplashscreen.so; do
+
+		local dirname="${A%/*}"
+		mkdir -p "$subpkgdir"/$INSTALL_BASE/$dirname
+		mv "$pkgdir"/$INSTALL_BASE/$A "$subpkgdir"/$INSTALL_BASE/$dirname
+	done
+}
+
+doc() {
+	default_doc
+	mkdir -p "$subpkgdir"/$INSTALL_BASE/
+	mv "$pkgdir"/$INSTALL_BASE/man "$subpkgdir"/$INSTALL_BASE/
+}
+
+sha512sums="cc782e1c5b1ce158be315cff5be61676373870c2062eb34688583a875ab68413bbabd909ce83e79a9c46c3d0c8ec10aad3c015276ddf782ce2079cb5a7098f82  icedtea-2.6.16.tar.gz
+ee2443da63ab6b1a525d0633a577f28d28d3916cb47b312d61d71b4795ae3bde4a70478017b7639133fb65cfb63aa0fcbc397afbde18f20d605a50286163e4a2  openjdk-2.6.16.tar.bz2
+3926a1c889d0ff5386dd78e8fb1ff71b553744fe574ab9655d9e1677da9aea3306d65e631866afcbb533b8e0fefbb34ae655400c9bc7c2058aaa34f8fb0a04d8  corba-2.6.16.tar.bz2
+2b37ba6f235b684682d9590c292b6af5fb6f41d4001f92dcf4945570e13fe760f91bbc7068d071e3e935829c9719936ae96940874ee211fd32cba187e05f0255  jaxp-2.6.16.tar.bz2
+41dc2b7a610cd5f4c9155c14670bb97f1c57924af2737faf6beb7b284c0ad7c0f0b33f4276cde5674a57db3f88ba4503f94f2dff7a52db3273ee53ed0b14be64  jaxws-2.6.16.tar.bz2
+2703b7bf7455aa3997426f2ce3d4c2285ee44640a940d15c1c3434414c295d87b44e749fece5a7b966661910c8768a79774fb03b43ab5605df9dc8965b600fd7  jdk-2.6.16.tar.bz2
+192dd5fac399c52bcb547617832428b40af493089b4bb63159cd9363c78af76c7acdc051d461eb4e4692b2090e05ed769b9fec460a328973b36b57bbb28cee39  langtools-2.6.16.tar.bz2
+73b0338ec293d0d87cc7251f63ef453ec10c7de978c56d8ff455b16ee0506175aed681a9a95fbdcc8b747ba00ef6cf914f63d0c5d22268b40620d4dbc7390a98  hotspot-2.6.16.tar.bz2
+0da12cb0f761b8cb76e042449e7d93f43236e7bc948e337215470a70031f0a2dda6d1b508f9397b283808d84c4ebddb31558fe1cd8e6e6469c1dd390d69ec6e7  apache-ant-1.9.11-bin.tar.gz
+1b9e8721749e81c5420a00af1e00ee0e4f48624ccb4e9aa969032114116ad50f59b254d4d16d74feff74de64157cc8b0a2ead9b555907c84b7055b796fba9a75  rhino-1.7.7.2.zip
+f62b942f0bacda8e37d0f1876d8ba14ddb4fc55a7d5fd1019463744927f40f422a85e9ee051948d566242f5a785aa28f275eb58768611283cba89af91235f43c  icedtea-hotspot-musl.patch
+e5cf4d70f96fc1e72ae8b97a887adb96092ff36584711cbb8de9d9fa9e859cb8731d638838de0d9591239fc44ffe5c74422d1842bd9f10a0c00dff1627bdeeef  icedtea-hotspot-musl-ppc.patch
+e7a2c1771bb582d427041f8d22e48c0daf8f20d7c0926cbce3549d49c4e949359ee25a35682b486e82f3e390535c950c5beee3bd8d06fb5a717b50f2d9b2a6bc  icedtea-hotspot-noagent-musl.patch
+822eee0dc4d3ba677a289dfeb3668b536d2d626708390a9d9702fb4144a481fd443a215a0d2041c6026113837aafa4ba0b5e9ead8589d2da6717a238bbc95a5a  icedtea-hotspot-uclibc-fixes.patch
+213a537de5f011cb39d608515c3413513ac75fb93593f9a9ef4205f71d72bdd8b097c80db185f7b26021d5bb85045b866f34f3478482dc4189972d8614a13458  icedtea-jdk-fix-build.patch
+0391970e6a32946aa3cccf38fdef9c0fe2af26cd0df824b98aa2fcfa1bf661d4a68e339bffcfd16f386c565fc68bb28a29208a67d4bad8a0e847ad02bd8becbb  icedtea-jdk-execinfo.patch
+48533f87fc2cf29d26b259be0df51087d2fe5b252e72d00c6ea2f4add7b0fb113141718c116279c5905e03f64a1118082e719393786811367cf4d472b5d36774  icedtea-jdk-fix-ipv6-init.patch
+44a35941c80f408d0607e32763b3b6ccee21e1d39886309327d3d74d2900117e4346ef59e77c663fd022fec10ee8f365eeb46c1260014d5765d226ce175ce3c5  icedtea-jdk-musl.patch
+bf4b184e170f7b0ff64ab30d2162784fe2bd5460d1fa31973259f7065fd4c511c46f97724fe2bd72bb94e9006cb568d0e0c87d1a9c90819e65880f8f44830bb1  icedtea-jdk-no-soname.patch
+a54c79c82afa1bc95265397b274260584c8b8c6be1651ddfb907d9523a809ea4581409e0d3fb0bbb63ef5a204e8ce29b7940e78cd640af1f490ae938c59129b6  icedtea-cpio.patch
+dc5f59068395e9501b17308c91ec80670c195117e22cb7bef78d551d118f180a11d7f0b5d47f4c7106909d9a9a8c060ddd60b78f251fd35afa6c72a1515af53e  icedtea-tar.patch
+049061b97d6e744b7ad9bad4a3dbfa1d236400003175e49740830dcb78a1f164b5c67b066e76c970eb27e09707f948cac0f5b7073abe0f49bcecfdd747f0107d  icedtea-remove-gawk.patch
+b9950ddf9c5ebb53d1e029a1fe8ef843860128ceb05872313b33fd2696a4acadbc8291110ca6513ce7531e0f943e42b167068e603f7ecd0e36f5b16d6bb827ab  icedtea-xattr.patch
+49d5e0fb5b180941f7f0fe6c8e84f33b0311efe7e4ec664d2ab4844196e6d728de8a74d69a7aa952ba964f9de65c2b1c0b7c4656d81ad14123d0cc7acea315db  icedtea-newer-freetype.patch
+fda1ba46276475cced16c4f380dbc0a0ac07ae2d66a8da10e88455a299bd40ff04a63dae1c5f3d3de6adbb3c6c240db5d37df0be2fc3391764cb21c9ad83eb8b  remove-gawk.patch
+3dd758e04e3b852398d81356c02a89afce0c664938d3f0179ee32e358d7057f5f969379329dd1ebcbf4bc3d37bd5e0d94102cd3f023326db5175968cfbbc9c35  xattr.patch
+6dd39baca14f088d0b2157308e3d9657ab64ecdb7daab09137486e212e3a8c53f6deae6167b6212217c6ef29c1406347e21ca6bb193ced9ebeb399aeb06bda4b  project-autoconf-2xx.patch
+02c60e54527c7adf584798d5251f8a0b80c93d5deafce82501b2c28e6692e0bd783927bbfc4bc527a863c0cccc025150a34740a9e29badb02d4b48e56a8aba90  gcc-6.4.0.tar.xz
+28f8c6fdbcb19e950b1d0bafb3bcc7a8cba87bc673aa6027cece116599cdee80f0cf5e95a1440544890239f5c754e8a93ab46d9daedd937faef445d7ea33b226  ecj-4.9.jar
+a1335adc2fbee98e36c4437ff2587771b98ed4180726779020f65039498235626a411cdb0100dbd20cd19d12f0d94f9a21af179ff624676c28cead9d60598b5d  gcc-001_all_default-ssp-strong.patch
+e36e95b81489163abd6fe9d58f7867bdca43e61143afacbfb17f4698c0b16ec5fd0061d8fab7b2ae615540bebd721c2e2227f80401b4e7fc253da9da62e6b513  gcc-002_all_default-relro.patch
+f86466c62b8291fac46f9c250c7ad8fa5ab7b1cce2504442fd07ddc4543665b317ae28951f244e39aba29aeaf3fff252ec4f6a147aa16adb2b7aed747dd89188  gcc-003_all_default-fortify-source.patch
+51282fea54c7e616367bbeb2479ba13fec6f24eb47bd04e2071907b3b36273b2ff24676f46ef8d22f241c8ab4857307861eee076eab66797c3a50a8ecaa1809a  gcc-005_all_default-as-needed.patch
+3398386dd1e079d6545dd9799adc799c6b80e3984fac6899d0e1a7ee21b66d0c7e53cddf17a65d590c883db750f9f79aaedd857355a8b9f7fb9476c906237919  gcc-011_all_default-warn-format-security.patch
+9adb0d2b9b67dd957df6c609b8714c7c078efb52cd88770905c37c67827be8fc83d1125037b9c29d77db21ce78756aa2bb0bacdb0b98d869ac126da76a298e21  gcc-012_all_default-warn-trampolines.patch
+d35a3ac7e13a4446921a90e1ff3eec1079840c845f9d523c868e24ae21f94cf69ba041de5341ebef96432a6f57598e223381d4286e8fb8baaa25906707f29fbd  gcc-020_all_msgfmt-libstdc++-link.patch
+840070a3c423e6206aaa6e63e1d9a0fcd6efd53626cd1240a193f0b60aa5d84216acc4a2a4fa8bce74549b07e6a316b01d638f20cea13dc62473491a302fb3d6  gcc-050_all_libiberty-asprintf.patch
+0a0bc72b9366158f5d23fff1928e756fdd212433bac6ab1f00d632f241382820db8db5d475ddf11ea020eaf7e2e71b12fb9b1c3c870cf84adf6c2b16f15aabca  gcc-051_all_libiberty-pic.patch
+e7a2eb1b1870e199d6fd753d065781575656fa12baa264f96c5d179689d88c31b8a3f92a5dae96088c05e96aa2bda138364ad7dbcc79e1819a102f192cbb7bab  gcc-053_all_libitm-no-fortify-source.patch
+e87da18aa7ab92b02b06168658c63b42a6c73a08fad2a30f81ef6296100fdbe3c3a91548fd0cb24eaf591e862bb08e4b67249bc4b977b07da33523aee0c686bc  gcc-067_all_gcc-poison-system-directories.patch
+4a328d1e1a56c20166307edcfa322068915784d9c08025b7f81cf69714da48fc266b6d34f77b9135c2f10da830d9df408276a1b78d1fd218637c2823506593c2  gcc-090_all_pr55930-dependency-tracking.patch
+ef052d0c3c9642fcb5ed570069c5a49c8ef523c47ac8ce3f201a801766f72ae4ff7c3725a70ee66e52c0fb559621e35fe0cf5b88b901d71ceadd381f49653a08  gcc-201-cilkrts.patch
+808e206f5e107084156fba333d4e091dcbd62f5d7756142bc292d4b0a52619f8c2aaca3617defc2f5b6552ba0439aebd33f4141329d88eab6ddf2dd637d92c08  gcc-203-libgcc_s.patch
+fc0de05b36613b732a0222ea005c90653c6a40d6761b6894af2419272f4e74875f37e26af33a9b9940669ef89269c44c46d17ca5bcd54b5cd1176e5eaf2992c1  gcc-204-linux_libc_has_function.patch
+98473bcaa77903a223ca9b0d2087c0921b287a2816d308cc32c8fe009e6cbf5dd1ae7fba27794ab8d9c09e117fe534413d91a464d1218474fc123ce0adfdc2c1  gcc-205-nopie.patch
+3287d5b443bea8ec64132bcabe869c738ae98ea8f1a86df1c5d18c927f8816edbfcefeefc47792dbbb2bcacf50319af00e01b3735d34525913b64350770ad453  gcc-207-static-pie.patch
+d08d7ead2de0429e5c9055d5b029ec2be9a8c821d22cecaf9b51f633652c493333f98963d9267fa2fa63850c50ae5eefd5f59e5910ec10d20044dac082182a8b  gcc-libgcc-always-build-gcceh.a.patch
+600fe5098dc54edaa9808fd5717af9dec058953f9ad37d49cfba1db4f7e9a7a8f02019342f75157fc575946fa693259422184de27b7ecc8386d9f3ecc0f7cc5d  gcc-gcc-4.9-musl-fortify.patch
+dbe0ee917fc7668571722364ab7c806731e3a31e8bfa30b4941b28b16b877d2a32b4a3897ef533399a28f82d43cac9b28e92de0493f0e779046db56584e07fa4  gcc-gcc-6.1-musl-libssp.patch
+bda845a6aa1854d2c883910b115f79ccfa93dfc2b5eac69a3a236d83eb34cadc140731d616ffc24698c7abc8878dd15f231bcc5119f1860e575a120b311706c7  gcc-boehm-gc-musl.patch
+fa62556719449caec6b2b434355bfbcaa5ae55ffe017b3e1f827f66a2aae21b79c571ee7a4ce723ea69169bc3a6447e73650991a200cc372adf2f102677518d7  gcc-gcc-pure64.patch
+2253941f3d19b6d08801d3782f5f5ed56c3b73fbc9d3561a8f01c702963ac4fab91599c686076e7081eb6a80c37ccd33591ae978996d6eee1dc0ce0f1c50259a  gcc-fix-gcj-stdgnu14-link.patch
+f89ddeb21bc8f97e6a850a6b70b4501a8f3e49a4bc8cc82897488decda5d98ad01cb7f6c8b392d452e9579924a523bc75da6e0648c1c976d42e40af48b10343b  gcc-fix-gcj-musl.patch
+54d67cc008b735e47771314171930c5d8b8f5f5dc97fcf4214824c105c808f3e75d22d5a4fdf5068ed0457fa0d46c60cfb442e276259a4a5e9b8722a027d18e6  gcc-fix-gcj-iconv-musl.patch
+abe9aaf9aa956058d0386a4396a511d176a46bb3906b90e952383646cdc158cbeb0a5dc616a1ccb1ca7d49fd0b5e351532aa15a3b13362abbf1ca4266f54a687  gcc-gcc-4.8-build-args.patch
+35d6d59f0b7b968f282f56767c9e0823a7bdc5aa0d450aca50fbd802649a7ca608b47671244a3faa208a9b0d6832cabb5a22724157dc817b2c0ad63d09f93282  gcc-fix-cxxflags-passing.patch
+9016b257abd8fa981de44a49512e35db814d1cbb47c1a87cd31c12d4ae20b13e9e149fe41691a7ec3c95bbcfde8a79194a8d2eaf547ceade3a246fad67c47dd8  gcc-ada-fixes.patch
+3f5bc334d9f73d06f5f7c876738d02356acdd08958bea0e4d2095ebf15c2c2ec4e411abdae0297505ae9a1699ca01b17338e853184e84663203b192b0d35fc19  gcc-ada-shared.patch
+631d4bdef6d8bde34df7978bb53ec28c3c909cf1f87139e5f148138d0f09adc58b41ecf0148bbf50fb4bc916c411e9bf8a2b6c046c75c0e77d754d8c35bcd4d7  gcc-ada-musl.patch
+fa44c8158111627aa0e91c43e7cc3aa38642c2041c96532dd4f0932dae4d6f92ea2850b683abcf10e7e120299d42ea6b69adc00002a514c76be8e39e99fa052b  gcc-ada-aarch64-multiarch.patch
+4b4a0ff306a8ef34ff6e3284fbfca869012164a47ba7cb099085c1dd03e6ca0cdd462f82710e08c9a02895adc7484e4c5eef17b5aa264cf5d978fe8ad78eea93  gcc-300-main-gcc-add-musl-s390x-dynamic-linker.patch
+385bc2fa50204f678964e5148c6170f572701dab920fbec8301f505bda34d182cde0adb7da042fee71719e12fb59f59181897f9b1bb4f4716ff59aad46ca1998  gcc-310-build-gcj-s390x.patch
+f4ef08454e28c8732db69115e4998ec153399e8d229dd27f923dbdcf57b68128a65640d026cc7f45b58ba8764ab1eb575d4eb6d6dfc550a87a183f8b94e76181  gcc-320-libffi-gnulinux.patch
+8efd028febb962ae100be32f72f7450c4f77d67ad96a5f47072136cdf47043f9d54835a87c7ab5aaa0fa0108c4c7a97ba2d7732d5aaf2efce70fe1f7e1c39d6e  gcc-330-gccgo-link-to-ucontext.patch
+24c8708f64b9b7945b3f07e9bbecf17ab8bcde2524f49cbd694ca2f6146ccc3f13bb027db282f326525ea79d50a2868fa3fa2b0d688a914b5ea77bbfd7e5cbe4  gcc-331-gccgo-use-real-off_t-type.patch
+cf19fcc6abee70210a9061e5385fe361a5eb59a74f7d34297420a53e351400da23a060164bef5b322daba4be90019481731acf93c45fb5a93430018f1aa7ce35  gcc-332-gccgo-remove-ustat.patch
+d5eb8d289a1de1f9d85d5451a81265a1aac3eea79a555cc4bfaa60cb7c3f80c00ee1ea3791a8069bc22783f3534d6ad20bfaa4e11252f49f9ffa27843315c0ee  gcc-libgo-musl-1.2.3.patch
+01c71cd5881fc07ea3b9b980697e89b3ca0fe98502958ceafc3fca18b2604c844e2f457feab711baf8e03f00a5383b0e38aac7eb954034e306f43d4a37f165ed  gcc-fix-rs6000-pie.patch
+1860593584f629d24d5b6db14b0a3412e9f93449b663aaa4981301a0923db0159314905e694f27366fbfef72dce06636ab6df86862b7e9e9564847e03bee82c1  gcc-add-classic_table-support.patch
+4e1b421ed72668b66ecbcb0a34afa99d2a34cb2ea9ee51c4aad605fc8a0e94e3bfbabae4ebe236efc5ec86fc01a472cbe93f36fe25cf579714939d8102a9b84a  gcc-lra-pentium.patch
+67a75a94fdba69de96b98dbc2978a50cb197857c464b81f7c956176da7066b3be937e40cb15e0870fc1e7382d662c5101bcd18cf457fc4112de41802042b51c4  gcc-gcc-5.4.0-locale.patch
+ca9e2747fc0ed5b5c35a7df6ae48482855c2663882b5e7a86e65efa5910b3be77380361fe21668718a3e68f6362306a440fa86bff6c50b4d92d6c75ce65a47e8  gcc-isl-fix.patch"
diff --git a/legacy/gcc6/001_all_default-ssp-strong.patch b/user/openjdk7/gcc-001_all_default-ssp-strong.patch
index 95949eb00..95949eb00 100644
--- a/legacy/gcc6/001_all_default-ssp-strong.patch
+++ b/user/openjdk7/gcc-001_all_default-ssp-strong.patch
diff --git a/legacy/gcc6/002_all_default-relro.patch b/user/openjdk7/gcc-002_all_default-relro.patch
index c461017dc..c461017dc 100644
--- a/legacy/gcc6/002_all_default-relro.patch
+++ b/user/openjdk7/gcc-002_all_default-relro.patch
diff --git a/legacy/gcc6/003_all_default-fortify-source.patch b/user/openjdk7/gcc-003_all_default-fortify-source.patch
index 6ca803343..6ca803343 100644
--- a/legacy/gcc6/003_all_default-fortify-source.patch
+++ b/user/openjdk7/gcc-003_all_default-fortify-source.patch
diff --git a/legacy/gcc6/005_all_default-as-needed.patch b/user/openjdk7/gcc-005_all_default-as-needed.patch
index ee4f7962a..ee4f7962a 100644
--- a/legacy/gcc6/005_all_default-as-needed.patch
+++ b/user/openjdk7/gcc-005_all_default-as-needed.patch
diff --git a/legacy/gcc6/011_all_default-warn-format-security.patch b/user/openjdk7/gcc-011_all_default-warn-format-security.patch
index a58383a8e..a58383a8e 100644
--- a/legacy/gcc6/011_all_default-warn-format-security.patch
+++ b/user/openjdk7/gcc-011_all_default-warn-format-security.patch
diff --git a/legacy/gcc6/012_all_default-warn-trampolines.patch b/user/openjdk7/gcc-012_all_default-warn-trampolines.patch
index 9ab4378d4..9ab4378d4 100644
--- a/legacy/gcc6/012_all_default-warn-trampolines.patch
+++ b/user/openjdk7/gcc-012_all_default-warn-trampolines.patch
diff --git a/legacy/gcc6/020_all_msgfmt-libstdc++-link.patch b/user/openjdk7/gcc-020_all_msgfmt-libstdc++-link.patch
index a70ea50a0..a70ea50a0 100644
--- a/legacy/gcc6/020_all_msgfmt-libstdc++-link.patch
+++ b/user/openjdk7/gcc-020_all_msgfmt-libstdc++-link.patch
diff --git a/legacy/gcc6/050_all_libiberty-asprintf.patch b/user/openjdk7/gcc-050_all_libiberty-asprintf.patch
index bee0c4c23..bee0c4c23 100644
--- a/legacy/gcc6/050_all_libiberty-asprintf.patch
+++ b/user/openjdk7/gcc-050_all_libiberty-asprintf.patch
diff --git a/legacy/gcc6/051_all_libiberty-pic.patch b/user/openjdk7/gcc-051_all_libiberty-pic.patch
index b6160a730..b6160a730 100644
--- a/legacy/gcc6/051_all_libiberty-pic.patch
+++ b/user/openjdk7/gcc-051_all_libiberty-pic.patch
diff --git a/legacy/gcc6/053_all_libitm-no-fortify-source.patch b/user/openjdk7/gcc-053_all_libitm-no-fortify-source.patch
index 5ab15afc3..5ab15afc3 100644
--- a/legacy/gcc6/053_all_libitm-no-fortify-source.patch
+++ b/user/openjdk7/gcc-053_all_libitm-no-fortify-source.patch
diff --git a/legacy/gcc6/067_all_gcc-poison-system-directories.patch b/user/openjdk7/gcc-067_all_gcc-poison-system-directories.patch
index 103671617..103671617 100644
--- a/legacy/gcc6/067_all_gcc-poison-system-directories.patch
+++ b/user/openjdk7/gcc-067_all_gcc-poison-system-directories.patch
diff --git a/legacy/gcc6/090_all_pr55930-dependency-tracking.patch b/user/openjdk7/gcc-090_all_pr55930-dependency-tracking.patch
index a8743e08c..a8743e08c 100644
--- a/legacy/gcc6/090_all_pr55930-dependency-tracking.patch
+++ b/user/openjdk7/gcc-090_all_pr55930-dependency-tracking.patch
diff --git a/legacy/gcc6/201-cilkrts.patch b/user/openjdk7/gcc-201-cilkrts.patch
index 4aac10d6d..4aac10d6d 100644
--- a/legacy/gcc6/201-cilkrts.patch
+++ b/user/openjdk7/gcc-201-cilkrts.patch
diff --git a/legacy/gcc6/203-libgcc_s.patch b/user/openjdk7/gcc-203-libgcc_s.patch
index c74351c71..c74351c71 100644
--- a/legacy/gcc6/203-libgcc_s.patch
+++ b/user/openjdk7/gcc-203-libgcc_s.patch
diff --git a/legacy/gcc6/204-linux_libc_has_function.patch b/user/openjdk7/gcc-204-linux_libc_has_function.patch
index 2dcedc3a7..2dcedc3a7 100644
--- a/legacy/gcc6/204-linux_libc_has_function.patch
+++ b/user/openjdk7/gcc-204-linux_libc_has_function.patch
diff --git a/legacy/gcc6/205-nopie.patch b/user/openjdk7/gcc-205-nopie.patch
index e3da94d10..e3da94d10 100644
--- a/legacy/gcc6/205-nopie.patch
+++ b/user/openjdk7/gcc-205-nopie.patch
diff --git a/legacy/gcc6/207-static-pie.patch b/user/openjdk7/gcc-207-static-pie.patch
index 9355c584b..9355c584b 100644
--- a/legacy/gcc6/207-static-pie.patch
+++ b/user/openjdk7/gcc-207-static-pie.patch
diff --git a/legacy/gcc6/300-main-gcc-add-musl-s390x-dynamic-linker.patch b/user/openjdk7/gcc-300-main-gcc-add-musl-s390x-dynamic-linker.patch
index 241957871..241957871 100644
--- a/legacy/gcc6/300-main-gcc-add-musl-s390x-dynamic-linker.patch
+++ b/user/openjdk7/gcc-300-main-gcc-add-musl-s390x-dynamic-linker.patch
diff --git a/legacy/gcc6/310-build-gcj-s390x.patch b/user/openjdk7/gcc-310-build-gcj-s390x.patch
index 1e522ee15..1e522ee15 100644
--- a/legacy/gcc6/310-build-gcj-s390x.patch
+++ b/user/openjdk7/gcc-310-build-gcj-s390x.patch
diff --git a/legacy/gcc6/320-libffi-gnulinux.patch b/user/openjdk7/gcc-320-libffi-gnulinux.patch
index b3b4fc931..b3b4fc931 100644
--- a/legacy/gcc6/320-libffi-gnulinux.patch
+++ b/user/openjdk7/gcc-320-libffi-gnulinux.patch
diff --git a/legacy/gcc6/330-gccgo-link-to-ucontext.patch b/user/openjdk7/gcc-330-gccgo-link-to-ucontext.patch
index 8aa60ca54..8aa60ca54 100644
--- a/legacy/gcc6/330-gccgo-link-to-ucontext.patch
+++ b/user/openjdk7/gcc-330-gccgo-link-to-ucontext.patch
diff --git a/legacy/gcc6/331-gccgo-use-real-off_t-type.patch b/user/openjdk7/gcc-331-gccgo-use-real-off_t-type.patch
index 1c8c43e9e..1c8c43e9e 100644
--- a/legacy/gcc6/331-gccgo-use-real-off_t-type.patch
+++ b/user/openjdk7/gcc-331-gccgo-use-real-off_t-type.patch
diff --git a/legacy/gcc6/332-gccgo-remove-ustat.patch b/user/openjdk7/gcc-332-gccgo-remove-ustat.patch
index 90aa65ad7..90aa65ad7 100644
--- a/legacy/gcc6/332-gccgo-remove-ustat.patch
+++ b/user/openjdk7/gcc-332-gccgo-remove-ustat.patch
diff --git a/legacy/gcc6/ada-aarch64-multiarch.patch b/user/openjdk7/gcc-ada-aarch64-multiarch.patch
index ac60b6f6a..ac60b6f6a 100644
--- a/legacy/gcc6/ada-aarch64-multiarch.patch
+++ b/user/openjdk7/gcc-ada-aarch64-multiarch.patch
diff --git a/legacy/gcc6/ada-fixes.patch b/user/openjdk7/gcc-ada-fixes.patch
index ba4ea42b4..ba4ea42b4 100644
--- a/legacy/gcc6/ada-fixes.patch
+++ b/user/openjdk7/gcc-ada-fixes.patch
diff --git a/legacy/gcc6/ada-musl.patch b/user/openjdk7/gcc-ada-musl.patch
index 464c3d57d..464c3d57d 100644
--- a/legacy/gcc6/ada-musl.patch
+++ b/user/openjdk7/gcc-ada-musl.patch
diff --git a/legacy/gcc6/ada-shared.patch b/user/openjdk7/gcc-ada-shared.patch
index 6f1c16aff..6f1c16aff 100644
--- a/legacy/gcc6/ada-shared.patch
+++ b/user/openjdk7/gcc-ada-shared.patch
diff --git a/legacy/gcc6/add-classic_table-support.patch b/user/openjdk7/gcc-add-classic_table-support.patch
index e74929302..e74929302 100644
--- a/legacy/gcc6/add-classic_table-support.patch
+++ b/user/openjdk7/gcc-add-classic_table-support.patch
diff --git a/legacy/gcc6/boehm-gc-musl.patch b/user/openjdk7/gcc-boehm-gc-musl.patch
index 2f106cba1..2f106cba1 100644
--- a/legacy/gcc6/boehm-gc-musl.patch
+++ b/user/openjdk7/gcc-boehm-gc-musl.patch
diff --git a/legacy/gcc6/fix-cxxflags-passing.patch b/user/openjdk7/gcc-fix-cxxflags-passing.patch
index 8eb1de77d..8eb1de77d 100644
--- a/legacy/gcc6/fix-cxxflags-passing.patch
+++ b/user/openjdk7/gcc-fix-cxxflags-passing.patch
diff --git a/legacy/gcc6/fix-gcj-iconv-musl.patch b/user/openjdk7/gcc-fix-gcj-iconv-musl.patch
index b0015751e..b0015751e 100644
--- a/legacy/gcc6/fix-gcj-iconv-musl.patch
+++ b/user/openjdk7/gcc-fix-gcj-iconv-musl.patch
diff --git a/legacy/gcc6/fix-gcj-musl.patch b/user/openjdk7/gcc-fix-gcj-musl.patch
index d26f510c0..d26f510c0 100644
--- a/legacy/gcc6/fix-gcj-musl.patch
+++ b/user/openjdk7/gcc-fix-gcj-musl.patch
diff --git a/legacy/gcc6/fix-gcj-stdgnu14-link.patch b/user/openjdk7/gcc-fix-gcj-stdgnu14-link.patch
index 2b2ce0fa5..2b2ce0fa5 100644
--- a/legacy/gcc6/fix-gcj-stdgnu14-link.patch
+++ b/user/openjdk7/gcc-fix-gcj-stdgnu14-link.patch
diff --git a/legacy/gcc6/fix-rs6000-pie.patch b/user/openjdk7/gcc-fix-rs6000-pie.patch
index 1fbc31a56..1fbc31a56 100644
--- a/legacy/gcc6/fix-rs6000-pie.patch
+++ b/user/openjdk7/gcc-fix-rs6000-pie.patch
diff --git a/legacy/gcc6/gcc-4.8-build-args.patch b/user/openjdk7/gcc-gcc-4.8-build-args.patch
index c27e00961..c27e00961 100644
--- a/legacy/gcc6/gcc-4.8-build-args.patch
+++ b/user/openjdk7/gcc-gcc-4.8-build-args.patch
diff --git a/legacy/gcc6/gcc-4.9-musl-fortify.patch b/user/openjdk7/gcc-gcc-4.9-musl-fortify.patch
index daae954c8..daae954c8 100644
--- a/legacy/gcc6/gcc-4.9-musl-fortify.patch
+++ b/user/openjdk7/gcc-gcc-4.9-musl-fortify.patch
diff --git a/legacy/gcc6/gcc-5.4.0-locale.patch b/user/openjdk7/gcc-gcc-5.4.0-locale.patch
index dca3ba9e8..dca3ba9e8 100644
--- a/legacy/gcc6/gcc-5.4.0-locale.patch
+++ b/user/openjdk7/gcc-gcc-5.4.0-locale.patch
diff --git a/legacy/gcc6/gcc-6.1-musl-libssp.patch b/user/openjdk7/gcc-gcc-6.1-musl-libssp.patch
index fe5c61434..fe5c61434 100644
--- a/legacy/gcc6/gcc-6.1-musl-libssp.patch
+++ b/user/openjdk7/gcc-gcc-6.1-musl-libssp.patch
diff --git a/legacy/gcc6/gcc-pure64.patch b/user/openjdk7/gcc-gcc-pure64.patch
index 2c350fe5a..2c350fe5a 100644
--- a/legacy/gcc6/gcc-pure64.patch
+++ b/user/openjdk7/gcc-gcc-pure64.patch
diff --git a/legacy/gcc6/isl-fix.patch b/user/openjdk7/gcc-isl-fix.patch
index d8d294c0e..d8d294c0e 100644
--- a/legacy/gcc6/isl-fix.patch
+++ b/user/openjdk7/gcc-isl-fix.patch
diff --git a/legacy/gcc6/libgcc-always-build-gcceh.a.patch b/user/openjdk7/gcc-libgcc-always-build-gcceh.a.patch
index 74ae89730..74ae89730 100644
--- a/legacy/gcc6/libgcc-always-build-gcceh.a.patch
+++ b/user/openjdk7/gcc-libgcc-always-build-gcceh.a.patch
diff --git a/legacy/gcc6/libgo-musl-1.2.3.patch b/user/openjdk7/gcc-libgo-musl-1.2.3.patch
index 8873d44eb..8873d44eb 100644
--- a/legacy/gcc6/libgo-musl-1.2.3.patch
+++ b/user/openjdk7/gcc-libgo-musl-1.2.3.patch
diff --git a/legacy/gcc6/lra-pentium.patch b/user/openjdk7/gcc-lra-pentium.patch
index e876bcc39..e876bcc39 100644
--- a/legacy/gcc6/lra-pentium.patch
+++ b/user/openjdk7/gcc-lra-pentium.patch
diff --git a/legacy/openjdk7/icedtea-cpio.patch b/user/openjdk7/icedtea-cpio.patch
index c66c1ca60..c66c1ca60 100644
--- a/legacy/openjdk7/icedtea-cpio.patch
+++ b/user/openjdk7/icedtea-cpio.patch
diff --git a/legacy/openjdk7/icedtea-hotspot-musl-ppc.patch b/user/openjdk7/icedtea-hotspot-musl-ppc.patch
index eca684884..eca684884 100644
--- a/legacy/openjdk7/icedtea-hotspot-musl-ppc.patch
+++ b/user/openjdk7/icedtea-hotspot-musl-ppc.patch
diff --git a/legacy/openjdk7/icedtea-hotspot-musl.patch b/user/openjdk7/icedtea-hotspot-musl.patch
index 1da903148..1da903148 100644
--- a/legacy/openjdk7/icedtea-hotspot-musl.patch
+++ b/user/openjdk7/icedtea-hotspot-musl.patch
diff --git a/legacy/openjdk7/icedtea-hotspot-noagent-musl.patch b/user/openjdk7/icedtea-hotspot-noagent-musl.patch
index 37604acca..37604acca 100644
--- a/legacy/openjdk7/icedtea-hotspot-noagent-musl.patch
+++ b/user/openjdk7/icedtea-hotspot-noagent-musl.patch
diff --git a/legacy/openjdk7/icedtea-hotspot-uclibc-fixes.patch b/user/openjdk7/icedtea-hotspot-uclibc-fixes.patch
index 1c1d82276..1c1d82276 100644
--- a/legacy/openjdk7/icedtea-hotspot-uclibc-fixes.patch
+++ b/user/openjdk7/icedtea-hotspot-uclibc-fixes.patch
diff --git a/legacy/openjdk7/icedtea-jdk-execinfo.patch b/user/openjdk7/icedtea-jdk-execinfo.patch
index a6499dcb0..a6499dcb0 100644
--- a/legacy/openjdk7/icedtea-jdk-execinfo.patch
+++ b/user/openjdk7/icedtea-jdk-execinfo.patch
diff --git a/legacy/openjdk7/icedtea-jdk-fix-build.patch b/user/openjdk7/icedtea-jdk-fix-build.patch
index 9fae895b6..9fae895b6 100644
--- a/legacy/openjdk7/icedtea-jdk-fix-build.patch
+++ b/user/openjdk7/icedtea-jdk-fix-build.patch
diff --git a/legacy/openjdk7/icedtea-jdk-fix-ipv6-init.patch b/user/openjdk7/icedtea-jdk-fix-ipv6-init.patch
index 11f3bf6dd..11f3bf6dd 100644
--- a/legacy/openjdk7/icedtea-jdk-fix-ipv6-init.patch
+++ b/user/openjdk7/icedtea-jdk-fix-ipv6-init.patch
diff --git a/legacy/openjdk7/icedtea-jdk-musl.patch b/user/openjdk7/icedtea-jdk-musl.patch
index 49c16d73a..49c16d73a 100644
--- a/legacy/openjdk7/icedtea-jdk-musl.patch
+++ b/user/openjdk7/icedtea-jdk-musl.patch
diff --git a/legacy/openjdk7/icedtea-jdk-no-lib-nsl-uclibc.patch b/user/openjdk7/icedtea-jdk-no-lib-nsl-uclibc.patch
index 26f89bb54..26f89bb54 100644
--- a/legacy/openjdk7/icedtea-jdk-no-lib-nsl-uclibc.patch
+++ b/user/openjdk7/icedtea-jdk-no-lib-nsl-uclibc.patch
diff --git a/legacy/openjdk7/icedtea-jdk-no-soname.patch b/user/openjdk7/icedtea-jdk-no-soname.patch
index fe6bbb732..fe6bbb732 100644
--- a/legacy/openjdk7/icedtea-jdk-no-soname.patch
+++ b/user/openjdk7/icedtea-jdk-no-soname.patch
diff --git a/user/openjdk7/icedtea-newer-freetype.patch b/user/openjdk7/icedtea-newer-freetype.patch
new file mode 100644
index 000000000..b2839e351
--- /dev/null
+++ b/user/openjdk7/icedtea-newer-freetype.patch
@@ -0,0 +1,21 @@
+--- openjdk/jdk/make/common/shared/Defs-versions.gmk	2022-09-01 15:40:10.645995564 +0000
++++ openjdk/jdk/make/common/shared/Defs-versions.gmk	2022-09-01 15:41:20.383447148 +0000
+@@ -213,7 +213,7 @@
+ # Generic
+ REQUIRED_ANT_VER          = 1.7.1
+ REQUIRED_BOOT_VER         = 1.6
+-REQUIRED_FREETYPE_VERSION = 2.2.1
++REQUIRED_FREETYPE_VERSION = 2.10.0
+ REQUIRED_MAKE_VER         = 3.81
+ REQUIRED_UNZIP_VER        = 5.12
+ REQUIRED_ZIP_VER          = 2.2
+--- patches/boot/revert-6973616.patch	2022-09-01 16:12:53.569629968 +0000
++++ patches/boot/revert-6973616.patch	2022-09-01 16:13:07.797914209 +0000
+@@ -7,6 +7,6 @@
+  REQUIRED_ANT_VER          = 1.7.1
+ -REQUIRED_BOOT_VER         = 1.6
+ +REQUIRED_BOOT_VER         = 1.5
+- REQUIRED_FREETYPE_VERSION = 2.2.1
++ REQUIRED_FREETYPE_VERSION = 2.10.0
+  REQUIRED_MAKE_VER         = 3.81
+  REQUIRED_UNZIP_VER        = 5.12
diff --git a/legacy/openjdk7/icedtea-remove-gawk.patch b/user/openjdk7/icedtea-remove-gawk.patch
index 98e9878b7..98e9878b7 100644
--- a/legacy/openjdk7/icedtea-remove-gawk.patch
+++ b/user/openjdk7/icedtea-remove-gawk.patch
diff --git a/legacy/openjdk7/icedtea-tar.patch b/user/openjdk7/icedtea-tar.patch
index 98c280184..98c280184 100644
--- a/legacy/openjdk7/icedtea-tar.patch
+++ b/user/openjdk7/icedtea-tar.patch
diff --git a/legacy/openjdk7/icedtea-xattr.patch b/user/openjdk7/icedtea-xattr.patch
index 51aee48c4..51aee48c4 100644
--- a/legacy/openjdk7/icedtea-xattr.patch
+++ b/user/openjdk7/icedtea-xattr.patch
diff --git a/user/openjdk7/project-autoconf-2xx.patch b/user/openjdk7/project-autoconf-2xx.patch
new file mode 100644
index 000000000..7930aac2a
--- /dev/null
+++ b/user/openjdk7/project-autoconf-2xx.patch
@@ -0,0 +1,30 @@
+diff -ur a/autogen.sh b/autogen.sh
+--- a/autogen.sh	2022-02-04 04:38:57.470000000 +0000
++++ b/autogen.sh	2022-02-04 04:40:25.330000000 +0000
+@@ -11,7 +11,7 @@
+         AUTOCONF_VERSION=`${AUTOCONF} --version | head -1 | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
+ #        echo ${AUTOCONF_VERSION}
+         case ${AUTOCONF_VERSION} in
+-            2.59* | 2.6[0-9]* )
++            2.59* | 2.[0-9]* )
+                 HAVE_AUTOCONF=true
+                 break;
+                 ;;
+@@ -28,7 +28,7 @@
+         AUTOHEADER_VERSION=`${AUTOHEADER} --version | head -1 | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
+ #        echo ${AUTOHEADER_VERSION}
+         case ${AUTOHEADER_VERSION} in
+-            2.59* | 2.6[0-9]* )
++            2.59* | 2.[0-9]* )
+                 HAVE_AUTOHEADER=true
+                 break;
+                 ;;
+@@ -45,7 +45,7 @@
+         AUTORECONF_VERSION=`${AUTORECONF} --version | head -1 | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
+ #        echo ${AUTORECONF_VERSION}
+         case ${AUTORECONF_VERSION} in
+-            2.59* | 2.6[0-9]* )
++            2.59* | 2.[0-9]* )
+                 HAVE_AUTORECONF=true
+                 break;
+                 ;;
diff --git a/legacy/openjdk7/remove-gawk.patch b/user/openjdk7/remove-gawk.patch
index dccddbab9..dccddbab9 100644
--- a/legacy/openjdk7/remove-gawk.patch
+++ b/user/openjdk7/remove-gawk.patch
diff --git a/legacy/openjdk7/xattr.patch b/user/openjdk7/xattr.patch
index 258f9f12d..258f9f12d 100644
--- a/legacy/openjdk7/xattr.patch
+++ b/user/openjdk7/xattr.patch