diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-11-17 12:51:22 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-11-17 12:51:22 +0100 |
| commit | 9f02979caebb6e900fe101a257d8e6c344a7a173 (patch) | |
| tree | 350b808ae23e8abb4ff08d472b76104a89e1f35a | |
| parent | afb9908771db100ee97bb933fcca850c4f49af5a (diff) | |
| parent | ee3c54b1570b9dd8ea900a11d496ced1ad1ae356 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
118 files changed, 255965 insertions, 177233 deletions
@@ -76,12 +76,12 @@ depends on !ADK_TOOLCHAIN_ONLY && !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_ choice prompt "Kernel Version" -config ADK_KERNEL_VERSION_2_6_39 - prompt "2.6.39" +config ADK_KERNEL_VERSION_2_6_39_4 + prompt "2.6.39.4" boolean -config ADK_KERNEL_VERSION_3_0_4 - prompt "3.0.4" +config ADK_KERNEL_VERSION_3_0_8 + prompt "3.0.8" boolean endchoice diff --git a/jtools/ant/Makefile b/jtools/ant/Makefile index 537668a21..06a7f750c 100644 --- a/jtools/ant/Makefile +++ b/jtools/ant/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= ant PKG_VERSION:= 1.8.2 PKG_RELEASE:= 1 -PKG_MD5SUM:= 63220327925ace13756ae334c55a3baa +PKG_MD5SUM:= 0d9e108afcd15b820150b8085c96d2b1 PKG_SITES:= http://www.apache.org/dist/ant/source/ DISTFILES:= apache-$(PKG_NAME)-$(PKG_VERSION)-src.tar.bz2 diff --git a/jtools/files.needed b/jtools/files.needed index 055a359fc..c6a1de4ba 100644 --- a/jtools/files.needed +++ b/jtools/files.needed @@ -9,4 +9,3 @@ XTest.h;libXtst freetype.h;freetype asoundlib.h;libasound ffi.h;libffi -Xproto.h;libXp diff --git a/jtools/gcj/Makefile b/jtools/gcj/Makefile index 45302e723..429574c7c 100644 --- a/jtools/gcj/Makefile +++ b/jtools/gcj/Makefile @@ -13,7 +13,7 @@ DISTFILES:= gcc-$(PKG_VERSION).tar.bz2 WRKDIST= ${WRKDIR}/gcc-${PKG_VERSION} include ../rules.mk -GCJ_ENV+= JAR=no +GCJ_ENV+= "JAR=no LDFLAGS=-liconv" install: ${STAGING_JAVA_HOST_DIR}/usr/bin/gcj @@ -29,6 +29,8 @@ $(WRKBUILD)/.configured: ${WRKDIST}/.prepared --with-mpc=$(STAGING_HOST_DIR) \ --with-mpfr=$(STAGING_HOST_DIR) \ --with-gmp=$(STAGING_HOST_DIR) \ + --disable-nls \ + --without-libiconv-prefix \ --disable-libmudflap \ --disable-libgomp \ --disable-biarch \ diff --git a/jtools/gcj/patches/disable-ldd-check.patch b/jtools/gcj/patches/disable-ldd-check.patch new file mode 100644 index 000000000..370ffc9a8 --- /dev/null +++ b/jtools/gcj/patches/disable-ldd-check.patch @@ -0,0 +1,20 @@ +diff -Nur gcc-4.5.3.orig/gcc/configure gcc-4.5.3/gcc/configure +--- gcc-4.5.3.orig/gcc/configure 2010-12-03 13:35:37.000000000 +0100 ++++ gcc-4.5.3/gcc/configure 2011-10-19 11:29:26.155085565 +0200 +@@ -24579,16 +24579,7 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_as_gnu_unique_object" >&5 + $as_echo "$gcc_cv_as_gnu_unique_object" >&6; } + if test $gcc_cv_as_gnu_unique_object = yes; then +- # Also check for ld.so support, i.e. glibc 2.11 or higher. +- if test x$host = x$build -a x$host = x$target && +- glibcver=`ldd --version 2>/dev/null | sed 's/.* //;q'`; then +- glibcmajor=`expr "$glibcver" : "\([0-9]*\)"` +- glibcminor=`expr "$glibcver" : "[2-9]*\.\([0-9]*\)"` +- glibcnum=`expr $glibcmajor \* 1000 + $glibcminor` +- if test "$glibcnum" -ge 2011 ; then + enable_gnu_unique_object=yes +- fi +- fi + fi + fi + diff --git a/jtools/gcj/patches/no-lib64.patch b/jtools/gcj/patches/no-lib64.patch new file mode 100644 index 000000000..5c6e0b045 --- /dev/null +++ b/jtools/gcj/patches/no-lib64.patch @@ -0,0 +1,100 @@ +diff -Nur gcc-4.5.3.orig/gcc/config/i386/linux64.h gcc-4.5.3/gcc/config/i386/linux64.h +--- gcc-4.5.3.orig/gcc/config/i386/linux64.h 2010-03-24 21:44:48.000000000 +0100 ++++ gcc-4.5.3/gcc/config/i386/linux64.h 2011-08-24 06:35:30.000000000 +0200 +@@ -59,7 +59,7 @@ + done. */ + + #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" ++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" + + #if TARGET_64BIT_DEFAULT |