diff options
33 files changed, 9019 insertions, 201 deletions
@@ -1,3 +1,7 @@ +- cleanup toolchain building, add toolchain archiv creation target +- update uclibc to git +- update gcc to 4.8.2 +- port opkg with gpg signing - restart network (kill wpa_supplicant) - essid with spaces - add grsec kernel patch diff --git a/mk/vars.mk b/mk/vars.mk index 349c1ebb6..ffd729ff4 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -218,7 +218,7 @@ QUIET:= else QUIET:= --quiet endif -FETCH_CMD?= wget --timeout=$(ADK_WGET_TIMEOUT) -t 3 $(QUIET) +FETCH_CMD?= wget --timeout=$(ADK_WGET_TIMEOUT) -t 3 --no-check-certificate $(QUIET) ifeq ($(ADK_HOST_CYGWIN),y) EXEEXT:= .exe diff --git a/package/cairo/Makefile b/package/cairo/Makefile index 8b26cbfdb..2429c545b 100644 --- a/package/cairo/Makefile +++ b/package/cairo/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cairo PKG_VERSION:= 1.12.16 -PKG_RELEASE:= 1 +PKG_RELEASE:= 4 PKG_MD5SUM:= a1304edcdc99282f478b995ee5f8f854 PKG_DESCR:= cairo graphics library PKG_SECTION:= libs @@ -33,7 +33,10 @@ endif CONFIGURE_ARGS+= --enable-ft=yes \ --enable-fc=yes \ --enable-tee=yes \ - --enable-xlib=yes + --enable-xlib=yes \ + --enable-pdf=yes \ + --disable-test-surfaces \ + --disable-full-testing cairo-install: ${INSTALL_DIR} ${IDIR_CAIRO}/usr/lib/cairo diff --git a/package/cairo/patches/patch-Makefile_in b/package/cairo/patches/patch-Makefile_in new file mode 100644 index 000000000..266149788 --- /dev/null +++ b/package/cairo/patches/patch-Makefile_in @@ -0,0 +1,20 @@ +--- cairo-1.12.16.orig/Makefile.in 2013-08-26 19:00:44.000000000 +0200 ++++ cairo-1.12.16/Makefile.in 2014-02-10 14:44:58.000000000 +0100 +@@ -80,7 +80,7 @@ EXTRA_PROGRAMS = + TESTS = + check_PROGRAMS = + # libpng is required for our test programs +-@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_1 = boilerplate test perf ++@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_1 = boilerplate perf + subdir = . + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/build/aclocal.cairo.m4 \ +@@ -439,7 +439,7 @@ MAINTAINERCLEANFILES = Makefile.in $(src + # $(srcdir)/build/Makefile.win32.features-h \ + # $(NULL) + ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS} +-DIST_SUBDIRS = src doc util boilerplate test perf ++DIST_SUBDIRS = src doc util boilerplate perf + SUBDIRS = src doc util $(am__append_1) + DISTCHECK_CONFIGURE_FLAGS = \ + --enable-gtk-doc \ diff --git a/package/eglibc/files/libc.so.sparc b/package/eglibc/files/libc.so.sparc new file mode 100644 index 000000000..91fa2c87d --- /dev/null +++ b/package/eglibc/files/libc.so.sparc @@ -0,0 +1,5 @@ +/* GNU ld script + Use the shared library, but some functions are only in + the static library, so try that secondarily. */ +OUTPUT_FORMAT(elf32-sparc) +GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux.so.2 ) ) diff --git a/package/hdparm/patches/patch-Makefile b/package/hdparm/patches/patch-Makefile new file mode 100644 index 000000000..a354cfaa5 --- /dev/null +++ b/package/hdparm/patches/patch-Makefile @@ -0,0 +1,15 @@ +--- hdparm-9.43.orig/Makefile 2012-03-08 21:14:40.000000000 +0100 ++++ hdparm-9.43/Makefile 2014-02-07 20:38:09.000000000 +0100 +@@ -48,9 +48,9 @@ install: all hdparm.8 + if [ -f $(DESTDIR)$(sbindir)/hdparm ]; then rm -f $(DESTDIR)$(sbindir)/hdparm ; fi + if [ -f $(DESTDIR)$(mandir)/man8/hdparm.8 ]; then rm -f $(DESTDIR)$(mandir)/man8/hdparm.8 ;\ + elif [ -f $(DESTDIR)$(oldmandir)/man8/hdparm.8 ]; then rm -f $(DESTDIR)$(oldmandir)/man8/hdparm.8 ; fi +- $(INSTALL_PROGRAM) -D hdparm $(DESTDIR)$(sbindir)/hdparm +- if [ -d $(DESTDIR)$(mandir) ]; then $(INSTALL_DATA) -D hdparm.8 $(DESTDIR)$(mandir)/man8/hdparm.8 ;\ +- elif [ -d $(DESTDIR)$(oldmandir) ]; then $(INSTALL_DATA) -D hdparm.8 $(DESTDIR)$(oldmandir)/man8/hdparm.8 ; fi ++ $(INSTALL_PROGRAM) hdparm $(DESTDIR)$(sbindir)/hdparm ++ if [ -d $(DESTDIR)$(mandir) ]; then $(INSTALL_DATA) hdparm.8 $(DESTDIR)$(mandir)/man8/hdparm.8 ;\ ++ elif [ -d $(DESTDIR)$(oldmandir) ]; then $(INSTALL_DATA) hdparm.8 $(DESTDIR)$(oldmandir)/man8/hdparm.8 ; fi + + clean: + -rm -f hdparm $(OBJS) core 2>/dev/null diff --git a/package/iproute2/patches/patch-netem_normal_c b/package/iproute2/patches/patch-netem_normal_c index 719899301..3eada6d03 100644 --- a/package/iproute2/patches/patch-netem_normal_c +++ b/package/iproute2/patches/patch-netem_normal_c @@ -1,10 +1,13 @@ ---- iproute2-2.6.29-1.orig/netem/normal.c 2009-03-24 23:40:54.000000000 +0100 -+++ iproute2-2.6.29-1/netem/normal.c 2009-12-11 16:35:38.000000000 +0100 -@@ -8,7 +8,6 @@ +--- iproute2-3.12.0.orig/netem/normal.c 2013-11-23 02:10:33.000000000 +0100 ++++ iproute2-3.12.0/netem/normal.c 2014-02-09 11:40:30.000000000 +0100 +@@ -8,9 +8,7 @@ #include <string.h> #include <limits.h> -#include <linux/types.h> - #include <linux/pkt_sched.h> - +-#include <linux/pkt_sched.h> +- ++#define NETEM_DIST_SCALE 8192 #define TABLESIZE 16384 + #define TABLEFACTOR NETEM_DIST_SCALE + diff --git a/package/iproute2/patches/patch-netem_pareto_c b/package/iproute2/patches/patch-netem_pareto_c new file mode 100644 index 000000000..b422a56a0 --- /dev/null +++ b/package/iproute2/patches/patch-netem_pareto_c @@ -0,0 +1,14 @@ +--- iproute2-3.12.0.orig/netem/pareto.c 2013-11-23 02:10:33.000000000 +0100 ++++ iproute2-3.12.0/netem/pareto.c 2014-02-09 11:46:07.000000000 +0100 +@@ -7,10 +7,8 @@ + #include <math.h> + #include <limits.h> + +-#include <linux/types.h> +-#include <linux/pkt_sched.h> +- + static const double a=3.0; ++#define NETEM_DIST_SCALE 8192 + #define TABLESIZE 16384 + #define TABLEFACTOR NETEM_DIST_SCALE + diff --git a/package/iproute2/patches/patch-netem_paretonormal_c b/package/iproute2/patches/patch-netem_paretonormal_c index d2c2ac4b6..5ff674e5a 100644 --- a/package/iproute2/patches/patch-netem_paretonormal_c +++ b/package/iproute2/patches/patch-netem_paretonormal_c @@ -1,6 +1,6 @@ ---- iproute2-2.6.29-1.orig/netem/paretonormal.c 2009-03-24 23:40:54.000000000 +0100 -+++ iproute2-2.6.29-1/netem/paretonormal.c 2009-12-11 16:59:02.000000000 +0100 -@@ -11,11 +11,9 @@ +--- iproute2-3.12.0.orig/netem/paretonormal.c 2013-11-23 02:10:33.000000000 +0100 ++++ iproute2-3.12.0/netem/paretonormal.c 2014-02-09 12:22:09.000000000 +0100 +@@ -11,15 +11,11 @@ */ #include <stdio.h> #include <stdlib.h> @@ -9,6 +9,11 @@ #include <math.h> #include <limits.h> -#include <malloc.h> +- +-#include <linux/types.h> +-#include <linux/pkt_sched.h> + ++#define NETEM_DIST_SCALE 8192 + #define TABLESIZE 16384 + #define TABLEFACTOR NETEM_DIST_SCALE - #include <linux/types.h> - #include <linux/pkt_sched.h> diff --git a/package/iproute2/patches/patch-tc_tc_core_h b/package/iproute2/patches/patch-tc_tc_core_h new file mode 100644 index 000000000..2716b71c8 --- /dev/null +++ b/package/iproute2/patches/patch-tc_tc_core_h @@ -0,0 +1,11 @@ +--- iproute2-3.12.0.orig/tc/tc_core.h 2013-11-23 02:10:33.000000000 +0100 ++++ iproute2-3.12.0/tc/tc_core.h 2014-02-08 20:19:59.000000000 +0100 +@@ -1,7 +1,7 @@ + #ifndef _TC_CORE_H_ + #define _TC_CORE_H_ 1 + +-#include <asm/types.h> ++#include <sys/types.h> + #include <linux/pkt_sched.h> + + #define TIME_UNITS_PER_SEC 1000000 diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile index f38332834..781aefb6f 100644 --- a/package/ipsec-tools/Makefile +++ b/package/ipsec-tools/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ipsec-tools -PKG_VERSION:= 0.8.0 +PKG_VERSION:= 0.8.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= b79aae3055a51f8de5c0f1b8ca6cf619 +PKG_MD5SUM:= d38b39f291ba2962387c3232e7335dd8 PKG_DESCR:= IPsec management tools PKG_SECTION:= net/security PKG_BUILDDEP:= openssl flex @@ -14,6 +14,7 @@ PKG_DEPENDS:= libopenssl PKG_URL:= http://ipsec-tools.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=ipsec-tools/} +PKG_LIBC_DEPENDS:= uclibc eglibc glibc PKG_CFLINE_IPSEC_TOOLS:=depends on !ADK_TOOLCHAIN_ONLY DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 @@ -25,6 +26,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,IPSEC_TOOLS,ipsec-tools,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) +TARGET_CPPFLAGS+= -I${LINUX_DIR}/include CONFIGURE_ARGS+= --with-kernel-headers="${LINUX_DIR}/include" \ --without-readline \ --disable-security-context \ diff --git a/package/ipsec-tools/patches/patch-ltmain_sh b/package/ipsec-tools/patches/patch-ltmain_sh deleted file mode 100644 index 9771c2407..000000000 --- a/package/ipsec-tools/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- ipsec-tools-0.8.0.orig/ltmain.sh 2011-03-18 14:27:39.000000000 +0100 -+++ ipsec-tools-0.8.0/ltmain.sh 2011-03-31 13:16:42.511821748 +0200 -@@ -4765,7 +4765,7 @@ func_mode_link () - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" diff --git a/package/ipsec-tools/patches/patch-src_include-glibc_Makefile_in b/package/ipsec-tools/patches/patch-src_include-glibc_Makefile_in deleted file mode 100644 index f594f5d92..000000000 --- a/package/ipsec-tools/patches/patch-src_include-glibc_Makefile_in +++ /dev/null @@ -1,24 +0,0 @@ ---- ipsec-tools-0.8.0.orig/src/include-glibc/Makefile.in 2011-03-18 14:27:40.000000000 +0100 -+++ ipsec-tools-0.8.0/src/include-glibc/Makefile.in 2013-07-17 14:35:36.000000000 +0200 -@@ -183,7 +183,7 @@ EXTRA_DIST = \ - netinet/ipsec.h \ - sys/queue.h - --DISTCLEANFILES = .includes linux -+DISTCLEANFILES = linux - all: all-am - - .SUFFIXES: -@@ -370,11 +370,7 @@ uninstall-am: - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am - - --.includes: ${top_builddir}/config.status -- ln -sf $(KERNEL_INCLUDE)/linux -- touch .includes -- --all: .includes -+all: - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile index 3ea6904d2..157d9db03 100644 --- a/package/kexec-tools/Makefile +++ b/package/kexec-tools/Makefile @@ -4,15 +4,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:= kexec-tools -PKG_VERSION:= 2.0.3 +PKG_VERSION:= 2.0.5 PKG_RELEASE:= 1 -PKG_MD5SUM:= 1b362abd2e8669171a5ba50a9cc26183 +PKG_MD5SUM:= da5887e30eec16895e9d98ef072dc257 PKG_DESCR:= kexec tools PKG_SECTION:= misc PKG_DEPENDS:= zlib PKG_BUILDEP:= zlib PKG_URL:= http://kernel.org/pub/linux/utils/kernel/kexec/ -PKG_SITES:= http://kernel.org/pub/linux/utils/kernel/kexec/ +PKG_SITES:= http://openadk.org/distfiles/ PKG_ARCH_DEPENDS:= !mips !m68k PKG_CFLINE_KEXEC_TOOLS:= select ADK_KERNEL_KEXEC diff --git a/package/libgd/Makefile b/package/libgd/Makefile index 608c7ed8a..f608be694 100644 --- a/package/libgd/Makefile +++ b/package/libgd/Makefile @@ -5,11 +5,11 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libgd PKG_VERSION:= 2.1.0 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 03588159bf4faab9079849c8d709acc6 PKG_DESCR:= A library for the dynamic creation of images PKG_SECTION:= libs -PKG_DEPENDS:= libjpeg-turbo libpng +PKG_DEPENDS:= libpng libjpeg-turbo PKG_BUILDDEP:= libpng libjpeg-turbo PKG_URL:= http://www.libgd.org/ PKG_SITES:= https://bitbucket.org/libgd/gd-libgd/downloads/ @@ -26,6 +26,8 @@ CONFIGURE_ARGS+= --without-x \ --without-freetype \ --with-jpeg=${STAGING_TARGET_DIR}/usr \ --with-png=${STAGING_TARGET_DIR}/usr \ + --without-tiff \ + --without-vpx \ --without-xpm libgd-install: diff --git a/package/libstdcxx/Makefile b/package/libstdcxx/Makefile index 5c6cc2b2f..7910af6b7 100644 --- a/package/libstdcxx/Makefile +++ b/package/libstdcxx/Makefile @@ -16,12 +16,6 @@ endif endif endif -ifeq ($(ADK_LINUX_MICROBLAZE),y) -LIBSTDCXX_VER:= 18 -else -LIBSTDCXX_VER:= 17 -endif - PKG_NAME:= libstdcxx PKG_DESCR:= C++ support library PKG_SECTION:= libs @@ -41,10 +35,7 @@ do-install: ifeq ($(ADK_NATIVE),y) $(CP) /usr/lib/libstdc++.so* ${IDIR_LIBSTDCXX}/usr/lib else - (cd ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}; ln -sf libstdc++.so.6.0.${LIBSTDCXX_VER} libstdc++.so.6) - (cd ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}; ln -sf libstdc++.so.6.0.${LIBSTDCXX_VER} libstdc++.so) - (cd ${STAGING_TARGET_DIR}/${ADK_TARGET_LIBC_PATH}/; ln -sf libstdc++.so.6.0.${LIBSTDCXX_VER} libstdc++.so) - $(CP) ${STAGING_TARGET_DIR}/${ADK_TARGET_LIBC_PATH}/libstdc++.so.6.0.${LIBSTDCXX_VER} ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH} + $(CP) ${STAGING_TARGET_DIR}/${ADK_TARGET_LIBC_PATH}/libstdc++.so* ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH} -@rm ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}/libstdc++.so.*-gdb.py endif diff --git a/package/mdadm/Makefile b/package/mdadm/Makefile index e2543cf00..f140db31a 100644 --- a/package/mdadm/Makefile +++ b/package/mdadm/Makefile @@ -17,8 +17,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,MDADM,mdadm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIG_STYLE:= manual - -XAKE_FLAGS+= CROSS_COMPILE="${TARGET_CROSS}" +XAKE_FLAGS+= CROSS_COMPILE="${TARGET_CROSS}" CHECK_RUN_DIR=0 mdadm-install: ${INSTALL_DIR} ${IDIR_MDADM}/usr/sbin diff --git a/package/monit/Makefile b/package/monit/Makefile index 93681fbd5..5543fed27 100644 --- a/package/monit/Makefile +++ b/package/monit/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= monit PKG_VERSION:= 5.6 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 19dfc1ce8512e832134d06eedd96ba50 PKG_DESCR:= An utility for system services monitoring PKG_SECTION:= admin @@ -20,7 +20,8 @@ $(eval $(call PKG_template,MONIT,monit,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN CONFIGURE_ENV+= libmonit_cv_setjmp_available=yes \ libmonit_cv_vsnprintf_c99_conformant=yes -CONFIGURE_ARGS+= --with-ssl --with-ssl-dir="${STAGING_TARGET_DIR}/usr" +CONFIGURE_ARGS+= --with-ssl --with-ssl-dir="${STAGING_TARGET_DIR}/usr" \ + --without-pam monit-install: ${INSTALL_DIR} ${IDIR_MONIT}/etc diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile index d96e9ad53..5ea96d0f3 100644 --- a/package/openjdk7/Makefile +++ b/package/openjdk7/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= openjdk7 -PKG_VERSION:= 2.3.12 +PKG_VERSION:= 2.4.5 PKG_RELEASE:= 1 -PKG_MD5SUM:= 9b3afa162021e3fca6161ba8f9f7dc11 +PKG_MD5SUM:= 6dcc544657ade213d01017354a6f9858 PKG_DESCR:= OpenJDK 7 Java VM PKG_SECTION:= lang PKG_BUILDDEP:= gettext-tiny-host glib-host flex-host bison-host qemu-host @@ -74,6 +74,7 @@ CONFIGURE_COMMON:= --disable-docs \ --disable-system-gif \ --disable-system-gtk \ --disable-system-gio \ + --disable-system-kerberos \ --disable-system-fontconfig \ --disable-compile-against-syscalls \ --without-rhino @@ -83,7 +84,7 @@ CONFIGURE_ARGS+= $(CONFIGURE_COMMON) CONFIGURE_ARGS+= --disable-bootstrap CONFIGURE_ENV+= LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib -MAKE_ENV+= ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \ +MAKE_ENV+= ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/bin \ ALT_OPENWIN_HOME=$(STAGING_DIR)/usr/ \ ALT_CUPS_HEADERS_PATH=$(STAGING_DIR)/usr/include/ \ ALT_FREETYPE_HEADERS_PATH=$(STAGING_DIR)/usr/include/ \ @@ -126,6 +127,7 @@ HOST_CONFIGURE_ARGS+=\ --disable-system-gif \ --disable-system-gtk \ --disable-system-gio \ + --disable-system-kerberos \ --disable-system-fontconfig \ --disable-compile-against-syscalls \ --without-rhino \ diff --git a/package/openjdk7/patches/openadk.patch b/package/openjdk7/patches/openadk.patch index d051a0694..75884d124 100644 --- a/package/openjdk7/patches/openadk.patch +++ b/package/openjdk7/patches/openadk.patch @@ -1,16 +1,16 @@ -diff -Nur icedtea-2.3.12.orig/Makefile.in icedtea-2.3.12/Makefile.in ---- icedtea-2.3.12.orig/Makefile.in 2013-07-26 20:18:01.947711693 +0200 -+++ icedtea-2.3.12/Makefile.in 2014-01-31 17:22:30.941371226 +0100 -@@ -695,7 +695,7 @@ - $(DISTRIBUTION_PATCHES) +diff -Nur icedtea-2.4.5.orig/Makefile.in icedtea-2.4.5/Makefile.in +--- icedtea-2.4.5.orig/Makefile.in 2014-01-29 09:28:28.000000000 +0100 ++++ icedtea-2.4.5/Makefile.in 2014-02-09 18:47:29.000000000 +0100 +@@ -704,7 +704,7 @@ + $(am__append_14) $(am__append_15) $(DISTRIBUTION_PATCHES) # Bootstrapping patches -ICEDTEA_BOOT_PATCHES = patches/boot/javafiles.patch \ +ICEDTEA_BOOT_PATCHES = patches/openadk.patch patches/boot/javafiles.patch \ patches/boot/ant-javac.patch patches/boot/corba-idlj.patch \ patches/boot/corba-no-gen.patch patches/boot/corba-orb.patch \ - patches/boot/demos.patch patches/boot/ecj-fphexconstants.patch \ -@@ -2090,7 +2090,7 @@ + patches/boot/demos.patch patches/boot/fphexconstants.patch \ +@@ -2120,7 +2120,7 @@ # Optional native ecj stamps/native-ecj.stamp: mkdir -p stamps @@ -19,14 +19,3196 @@ diff -Nur icedtea-2.3.12.orig/Makefile.in icedtea-2.3.12/Makefile.in @BUILD_NATIVE_ECJ_TRUE@ --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} touch $@ -diff -Nur icedtea-2.3.12.orig/patches/openadk.patch icedtea-2.3.12/patches/openadk.patch ---- icedtea-2.3.12.orig/patches/openadk.patch 1970-01-01 01:00:00.000000000 +0100 -+++ icedtea-2.3.12/patches/openadk.patch 2014-01-31 17:30:37.666672422 +0100 -@@ -0,0 +1,562 @@ +diff -Nur icedtea-2.4.5.orig/Makefile.in.orig icedtea-2.4.5/Makefile.in.orig +--- icedtea-2.4.5.orig/Makefile.in.orig 1970-01-01 01:00:00.000000000 +0100 ++++ icedtea-2.4.5/Makefile.in.orig 2014-01-29 09:28:28.000000000 +0100 +@@ -0,0 +1,3178 @@ ++# Makefile.in generated by automake 1.14 from Makefile.am. ++# @configure_input@ ++ ++# Copyright (C) 1994-2013 Free Software Foundation, Inc. ++ ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++@SET_MAKE@ ++ ++# Dependencies ++VPATH = @srcdir@ ++am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' ++am__make_running_with_option = \ ++ case $${target_option-} in \ ++ ?) ;; \ ++ *) echo "am__make_running_with_option: internal error: invalid" \ ++ "target option '$${target_option-}' specified" >&2; \ ++ exit 1;; \ ++ esac; \ ++ has_opt=no; \ ++ sane_makeflags=$$MAKEFLAGS; \ ++ if $(am__is_gnu_make); then \ ++ sane_makeflags=$$MFLAGS; \ ++ else \ ++ case $$MAKEFLAGS in \ ++ *\\[\ \ ]*) \ ++ bs=\\; \ ++ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ ++ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ ++ esac; \ ++ fi; \ ++ skip_next=no; \ ++ strip_trailopt () \ ++ { \ ++ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ ++ }; \ ++ for flg in $$sane_makeflags; do \ ++ test $$skip_next = yes && { skip_next=no; continue; }; \ ++ case $$flg in \ ++ *=*|--*) continue;; \ ++ -*I) strip_trailopt 'I'; skip_next=yes;; \ ++ -*I?*) strip_trailopt 'I';; \ ++ -*O) strip_trailopt 'O'; skip_next=yes;; \ ++ -*O?*) strip_trailopt 'O';; \ ++ -*l) strip_trailopt 'l'; skip_next=yes;; \ ++ -*l?*) strip_trailopt 'l';; \ ++ -[dEDm]) skip_next=yes;; \ ++ -[JT]) skip_next=yes;; \ ++ esac; \ ++ case $$flg in \ ++ *$$target_option*) has_opt=yes; break;; \ ++ esac; \ ++ done; \ ++ test $$has_opt = yes ++am__make_dryrun = (target_option=n; $(am__make_running_with_option)) ++am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) ++pkgdatadir = $(datadir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ ++pkglibdir = $(libdir)/@PACKAGE@ ++pkglibexecdir = $(libexecdir)/@PACKAGE@ ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = @build@ ++host_triplet = @host@ ++ ++#PR43148 - javac fails due to missing java.util.regex.Matcher.quoteReplacement ++@LACKS_JAVA_UTIL_REGEX_MATCHER_QUOTEREPLACEMENT_TRUE@am__append_1 = \ ++@LACKS_JAVA_UTIL_REGEX_MATCHER_QUOTEREPLACEMENT_TRUE@ $(SHARE)/java/util/regex/Matcher.java ++ ++ ++#PR48033 - Missing javax.management.remote.JMXServiceURL ++@LACKS_JAVAX_MANAGEMENT_REMOTE_JMXSERVICEURL_TRUE@am__append_2 = \ ++@LACKS_JAVAX_MANAGEMENT_REMOTE_JMXSERVICEURL_TRUE@ $(SHARE)/javax/management/remote/JMXServiceURL.java ++ ++ ++#PR48034 - javax.management.modelmbean.ModelMBeanInfo ++@LACKS_JAVAX_MANAGEMENT_MODELMBEAN_MODELMBEANINFO_TRUE@am__append_3 = \ ++@LACKS_JAVAX_MANAGEMENT_MODELMBEAN_MODELMBEANINFO_TRUE@ $(SHARE)/javax/management/modelmbean/ModelMBeanInfo.java ++ ++ ++#PR42003 - Missing javax.swing.plaf.basic.BasicDirectoryModel methods cause OpenJDK build failure ++@LACKS_JAVAX_SWING_PLAF_BASIC_BASICDIRECTORYMODEL_ADDPROPERTYCHANGELISTENER_TRUE@am__append_4 = \ ++@LACKS_JAVAX_SWING_PLAF_BASIC_BASICDIRECTORYMODEL_ADDPROPERTYCHANGELISTENER_TRUE@ $(SHARE)/javax/swing/plaf/basic/BasicDirectoryModel.java ++ ++ ++#PR56553 - SSLParameters support missing ++@LACKS_JAVAX_NET_SSL_SSLCONTEXT_GETDEFAULTSSLPARAMETERS_TRUE@am__append_5 = \ ++@LACKS_JAVAX_NET_SSL_SSLCONTEXT_GETDEFAULTSSLPARAMETERS_TRUE@ $(SHARE)/javax/net/ssl/SSLContext.java ++ ++@LACKS_JAVAX_NET_SSL_SSLENGINE_SETSSLPARAMETERS_TRUE@am__append_6 = \ ++@LACKS_JAVAX_NET_SSL_SSLENGINE_SETSSLPARAMETERS_TRUE@ $(SHARE)/javax/net/ssl/SSLEngine.java ++ ++ ++#PR57008 - Add missing SslRMIServerSocketFactory constructor from 7 ++@LACKS_JAVAX_RMI_SSL_SSLRMISERVERSOCKETFACTORY_7_TRUE@am__append_7 = \ ++@LACKS_JAVAX_RMI_SSL_SSLRMISERVERSOCKETFACTORY_7_TRUE@ $(SHARE)/javax/rmi/ssl/SslRMIServerSocketFactory.java ++ ++ ++# Conditional patches ++@WITH_RHINO_TRUE@am__append_8 = \ ++@WITH_RHINO_TRUE@ patches/rhino.patch ++ ++@BUILD_CACAO_TRUE@am__append_9 = \ ++@BUILD_CACAO_TRUE@ patches/cacao/launcher.patch \ ++@BUILD_CACAO_TRUE@ patches/cacao/memory.patch ++ ++@BUILD_CACAO_FALSE@@USING_CACAO_TRUE@am__append_10 = \ ++@BUILD_CACAO_FALSE@@USING_CACAO_TRUE@ patches/cacao/memory.patch ++ ++@ENABLE_CACAO_TRUE@am__append_11 = \ ++@ENABLE_CACAO_TRUE@ patches/cacao/ignore-tests.patch ++ ++@ENABLE_PULSE_JAVA_TRUE@am__append_12 = \ ++@ENABLE_PULSE_JAVA_TRUE@ patches/pulse-soundproperties.patch ++ ++@ENABLE_SYSTEMTAP_TRUE@am__append_13 = \ ++@ENABLE_SYSTEMTAP_TRUE@ patches/systemtap_gc.patch ++ ++@ENABLE_NSS_TRUE@am__append_14 = patches/nss-config.patch ++@WITH_PAX_TRUE@am__append_15 = \ ++@WITH_PAX_TRUE@ patches/test_gamma.patch \ ++@WITH_PAX_TRUE@ patches/pax-mark-rmic-java.patch ++ ++@DISABLE_BOOTSTRAP_TOOLS_TRUE@am__append_16 = patches/boot/openjdk6-prefer_source.patch ++@DISABLE_BOOTSTRAP_TOOLS_FALSE@am__append_17 = patches/boot/bootstrap-tools.patch ++@VM_SUPPORTS_XBOOTCLASSPATH_FALSE@am__append_18 = \ ++@VM_SUPPORTS_XBOOTCLASSPATH_FALSE@ patches/boot/xbootclasspath.patch ++ ++@WITH_PAX_FALSE@am__append_19 = patches/boot/test_gamma.patch ++@CP39408_JAVAH_TRUE@am__append_20 = patches/boot/pr39408.patch ++@CP40188_JAVAH_TRUE@am__append_21 = patches/boot/pr40188.patch \ ++@CP40188_JAVAH_TRUE@ patches/boot/javah.patch ++ ++@CP45526_JAVAH_TRUE@am__append_22 = patches/boot/explicit-inner-class-headers.patch ++@CP40616_TRUE@am__append_23 = patches/boot/pr40616.patch ++@LACKS_JAVA_UTIL_SCANNER_TRUE@am__append_24 = $(SCANNER_PATCHES) ++@CP40630_TRUE@@LACKS_JAVA_UTIL_SCANNER_FALSE@am__append_25 = $(SCANNER_PATCHES) ++@JAVAC_LACKS_DIAMOND_TRUE@am__append_26 = patches/boot/ecj-diamond.patch ++@JAVAC_LACKS_DIAMOND_FALSE@@USING_CACAO_TRUE@am__append_27 = patches/boot/compile-for-7-cacao-mem.patch ++@BUILD_CACAO_TRUE@@JAVAC_LACKS_DIAMOND_FALSE@@USING_CACAO_FALSE@am__append_28 = patches/boot/compile-for-7-cacao-mem.patch ++@BUILD_CACAO_FALSE@@JAVAC_LACKS_DIAMOND_FALSE@@USING_CACAO_FALSE@am__append_29 = patches/boot/compile-for-7.patch ++@DTDTYPE_QNAME_TRUE@am__append_30 = patches/boot/jaxws-getdtdtype.patch ++@NO_BYTECODE7_TRUE@am__append_31 = patches/boot/use_target_6_for_bootstrap_classes.patch ++@ENABLE_CACAO_TRUE@am__append_32 = \ ++@ENABLE_CACAO_TRUE@ ALT_HOTSPOT_IMPORT_PATH="$(CACAO_IMPORT_PATH)" ++ ++@ENABLE_JAMVM_TRUE@am__append_33 = \ ++@ENABLE_JAMVM_TRUE@ ALT_HOTSPOT_IMPORT_PATH="$(JAMVM_IMPORT_PATH)" ++ ++@DISABLE_OPTIMIZATIONS_TRUE@am__append_34 = \ ++@DISABLE_OPTIMIZATIONS_TRUE@ NO_OPTIMIZATIONS="true" \ ++@DISABLE_OPTIMIZATIONS_TRUE@ CC_NO_OPT="-O0 -g" ++ ++@ENABLE_DOCS_FALSE@am__append_35 = \ ++@ENABLE_DOCS_FALSE@ NO_DOCS="true" ++ ++@USE_ALT_JAR_TRUE@am__append_36 = \ ++@USE_ALT_JAR_TRUE@ ALT_JAR_CMD="$(ALT_JAR_CMD)" ++ ++@HAS_HOTSPOT_REVISION_TRUE@am__append_37 = \ ++@HAS_HOTSPOT_REVISION_TRUE@ HOTSPOT_BUILD_VERSION="$(HOTSPOT_REVISION)" ++ ++@WITH_RHINO_TRUE@am__append_38 = \ ++@WITH_RHINO_TRUE@ RHINO_JAR="$(abs_top_builddir)/rhino/rhino.jar" ++ ++@USE_SYSTEM_ZLIB_TRUE@am__append_39 = \ ++@USE_SYSTEM_ZLIB_TRUE@ SYSTEM_ZLIB="true" \ ++@USE_SYSTEM_ZLIB_TRUE@ ZLIB_LIBS="${ZLIB_LIBS}" \ ++@USE_SYSTEM_ZLIB_TRUE@ ZLIB_CFLAGS="${ZLIB_CFLAGS}" ++ ++@USE_SYSTEM_LCMS_TRUE@am__append_40 = \ ++@USE_SYSTEM_LCMS_TRUE@ USE_SYSTEM_LCMS="true" \ ++@USE_SYSTEM_LCMS_TRUE@ LCMS_LIBS="${LCMS2_LIBS}" \ ++@USE_SYSTEM_LCMS_TRUE@ LCMS_CFLAGS="${LCMS2_CFLAGS}" ++ ++@USE_SYSTEM_JPEG_TRUE@am__append_41 = \ ++@USE_SYSTEM_JPEG_TRUE@ USE_SYSTEM_JPEG="true" \ ++@USE_SYSTEM_JPEG_TRUE@ JPEG_LIBS="${JPEG_LIBS}" \ ++@USE_SYSTEM_JPEG_TRUE@ JPEG_CFLAGS="${JPEG_CFLAGS}" ++ ++@USE_SYSTEM_PNG_TRUE@am__append_42 = \ ++@USE_SYSTEM_PNG_TRUE@ USE_SYSTEM_PNG="true" \ ++@USE_SYSTEM_PNG_TRUE@ PNG_LIBS="${PNG_LIBS}" \ ++@USE_SYSTEM_PNG_TRUE@ PNG_CFLAGS="${PNG_CFLAGS}" ++ ++@USE_SYSTEM_GIF_TRUE@am__append_43 = \ ++@USE_SYSTEM_GIF_TRUE@ USE_SYSTEM_GIF="true" \ ++@USE_SYSTEM_GIF_TRUE@ GIF_LIBS="${GIF_LIBS}" \ ++@USE_SYSTEM_GIF_TRUE@ GIF_CFLAGS="${GIF_CFLAGS}" ++ ++@USE_SYSTEM_GTK_TRUE@am__append_44 = \ ++@USE_SYSTEM_GTK_TRUE@ USE_SYSTEM_GTK="true" \ ++@USE_SYSTEM_GTK_TRUE@ GTK_LIBS="${GTK_LIBS}" \ ++@USE_SYSTEM_GTK_TRUE@ GTK_CFLAGS="${GTK_CFLAGS}" ++ ++@USE_SYSTEM_GIO_TRUE@am__append_45 = \ ++@USE_SYSTEM_GIO_TRUE@ USE_SYSTEM_GIO="true" \ ++@USE_SYSTEM_GIO_TRUE@ GIO_LIBS="${GIO_LIBS}" \ ++@USE_SYSTEM_GIO_TRUE@ GIO_CFLAGS="${GIO_CFLAGS}" ++ ++@USE_SYSTEM_FONTCONFIG_TRUE@am__append_46 = \ ++@USE_SYSTEM_FONTCONFIG_TRUE@ USE_SYSTEM_FONTCONFIG="true" \ ++@USE_SYSTEM_FONTCONFIG_TRUE@ FONTCONFIG_LIBS="${FONTCONFIG_LIBS}" \ ++@USE_SYSTEM_FONTCONFIG_TRUE@ FONTCONFIG_CFLAGS="${FONTCONFIG_CFLAGS}" ++ ++@USE_SYSCALL_COMPILATION_TRUE@am__append_47 = \ ++@USE_SYSCALL_COMPILATION_TRUE@ COMPILE_AGAINST_SYSCALLS="true" ++ ++@ENABLE_JAR_COMPRESSION_TRUE@am__append_48 = \ ++@ENABLE_JAR_COMPRESSION_TRUE@ COMPRESS_JARS="true" ++ ++@USE_SYSTEM_KERBEROS_TRUE@am__append_49 = \ ++@USE_SYSTEM_KERBEROS_TRUE@ SYSTEM_KRB5="true" \ ++@USE_SYSTEM_KERBEROS_TRUE@ KRB5_LIBS="${KRB5_LIBS}" \ ++@USE_SYSTEM_KERBEROS_TRUE@ KRB5_CFLAGS="${KRB5_CFLAGS}" ++ ++@ADD_SHARK_BUILD_TRUE@am__append_50 = \ ++@ADD_SHARK_BUILD_TRUE@ --enable-shark ++ ++subdir = . ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ++ $(top_srcdir)/configure $(am__configure_deps) \ ++ $(srcdir)/nss.cfg.in $(srcdir)/javac.in $(srcdir)/javap.in \ ++ $(srcdir)/javah.in $(srcdir)/tz.properties.in \ ++ $(srcdir)/pax-mark-vm.in \ ++ $(srcdir)/remove-intree-libraries.sh.in \ ++ $(top_srcdir)/tapset/hotspot.stp.in \ ++ $(top_srcdir)/tapset/hotspot_jni.stp.in \ ++ $(top_srcdir)/tapset/jsta |