summaryrefslogtreecommitdiff
path: root/jtools
diff options
context:
space:
mode:
Diffstat (limited to 'jtools')
-rw-r--r--jtools/ant/Makefile2
-rw-r--r--jtools/files.needed1
-rw-r--r--jtools/gcj/Makefile4
-rw-r--r--jtools/gcj/patches/disable-ldd-check.patch20
-rw-r--r--jtools/gcj/patches/no-lib64.patch100
-rw-r--r--jtools/jamvm/Makefile7
-rw-r--r--jtools/jikes/Makefile2
-rw-r--r--jtools/openjdk/Makefile4
-rw-r--r--jtools/openjdk/patches/iconv.patch36
-rw-r--r--jtools/openjdk/patches/remove-libnsl.patch72
10 files changed, 237 insertions, 11 deletions
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
+ #define SPEC_32 "m32"
+diff -Nur gcc-4.5.3.orig/gcc/config/i386/t-linux64 gcc-4.5.3/gcc/config/i386/t-linux64
+--- gcc-4.5.3.orig/gcc/config/i386/t-linux64 2009-04-21 21:03:23.000000000 +0200
++++ gcc-4.5.3/gcc/config/i386/t-linux64 2011-08-24 06:35:30.000000000 +0200
+@@ -25,7 +25,7 @@
+
+ MULTILIB_OPTIONS = m64/m32
+ MULTILIB_DIRNAMES = 64 32
+-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
++MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
+
+ LIBGCC = stmp-multilib
+ INSTALL_LIBGCC = install-multilib
+diff -Nur gcc-4.5.3.orig/gcc/config/mips/linux64.h gcc-4.5.3/gcc/config/mips/linux64.h
+--- gcc-4.5.3.orig/gcc/config/mips/linux64.h 2009-02-20 16:20:38.000000000 +0100
++++ gcc-4.5.3/gcc/config/mips/linux64.h 2011-08-24 06:35:30.000000000 +0200
+@@ -36,9 +36,9 @@
+ %{profile:-lc_p} %{!profile:-lc}}"
+
+ #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1"
+-#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
+-#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld.so.1"
++#define GLIBC_DYNAMIC_LINKERN32 "/lib/ld.so.1"
++#define UCLIBC_DYNAMIC_LINKERN32 "/lib/ld-uClibc.so.0"
+ #define LINUX_DYNAMIC_LINKERN32 \
+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32)
+
+diff -Nur gcc-4.5.3.orig/gcc/config/mips/t-linux64 gcc-4.5.3/gcc/config/mips/t-linux64
+--- gcc-4.5.3.orig/gcc/config/mips/t-linux64 2009-04-21 21:03:23.000000000 +0200
++++ gcc-4.5.3/gcc/config/mips/t-linux64 2011-08-24 06:35:30.000000000 +0200
+@@ -18,7 +18,7 @@
+
+ MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
+ MULTILIB_DIRNAMES = n32 32 64
+-MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64
++MULTILIB_OSDIRNAMES = ../lib ../lib ../lib
+
+ EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
+
+diff -Nur gcc-4.5.3.orig/gcc/config/rs6000/linux64.h gcc-4.5.3/gcc/config/rs6000/linux64.h
+--- gcc-4.5.3.orig/gcc/config/rs6000/linux64.h 2010-11-17 07:09:53.000000000 +0100
++++ gcc-4.5.3/gcc/config/rs6000/linux64.h 2011-08-24 06:35:30.000000000 +0200
+@@ -341,7 +341,7 @@
+ #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
+
+ #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
+ #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
+ #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
+ #if UCLIBC_DEFAULT
+diff -Nur gcc-4.5.3.orig/gcc/config/rs6000/t-linux64 gcc-4.5.3/gcc/config/rs6000/t-linux64
+--- gcc-4.5.3.orig/gcc/config/rs6000/t-linux64 2009-04-21 21:03:23.000000000 +0200
++++ gcc-4.5.3/gcc/config/rs6000/t-linux64 2011-08-24 06:35:30.000000000 +0200
+@@ -36,7 +36,7 @@
+ MULTILIB_EXTRA_OPTS = fPIC mstrict-align
+ MULTILIB_EXCEPTIONS = m64/msoft-float
+ MULTILIB_EXCLUSIONS = m64/!m32/msoft-float
+-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
++MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
+ MULTILIB_MATCHES = $(MULTILIB_MATCHES_FLOAT)
+
+ softfp_wrap_start := '\#ifndef __powerpc64__'
+diff -Nur gcc-4.5.3.orig/gcc/config/sparc/linux64.h gcc-4.5.3/gcc/config/sparc/linux64.h
+--- gcc-4.5.3.orig/gcc/config/sparc/linux64.h 2010-09-22 23:15:37.000000000 +0200
++++ gcc-4.5.3/gcc/config/sparc/linux64.h 2011-08-24 06:36:52.000000000 +0200
+@@ -110,7 +110,7 @@
+ /* If ELF is the default format, we should not use /lib/elf. */
+
+ #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2"
+
+ #ifdef SPARC_BI_ARCH
+
+diff -Nur gcc-4.5.3.orig/gcc/config/sparc/t-linux64 gcc-4.5.3/gcc/config/sparc/t-linux64
+--- gcc-4.5.3.orig/gcc/config/sparc/t-linux64 2010-10-04 18:54:26.000000000 +0200
++++ gcc-4.5.3/gcc/config/sparc/t-linux64 2011-08-24 06:37:15.000000000 +0200
+@@ -26,7 +26,7 @@
+
+ MULTILIB_OPTIONS = m64/m32
+ MULTILIB_DIRNAMES = 64 32
+-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
++MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
+
+ LIBGCC = stmp-multilib
+ INSTALL_LIBGCC = install-multilib
diff --git a/jtools/jamvm/Makefile b/jtools/jamvm/Makefile
index a85b2d6c8..1775ff5aa 100644
--- a/jtools/jamvm/Makefile
+++ b/jtools/jamvm/Makefile
@@ -6,14 +6,9 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= jamvm
PKG_VERSION:= 1.5.4
PKG_RELEASE:= 2
-PKG_MD5SUM:= 63220327925ace13756ae334c55a3baa
+PKG_MD5SUM:= 7654e9657691f5f09c4f481ed4686176
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jamvm/}
-ifeq (Darwin,${OStype})
-CC_FOR_BUILD:=${CC_FOR_BUILD} -m32
-CXX_FOR_BUILD:=${CXX_FOR_BUILD} -m32
-endif
-
include ../rules.mk
install: ${STAGING_JAVA_HOST_DIR}/usr/bin/jamvm
diff --git a/jtools/jikes/Makefile b/jtools/jikes/Makefile
index c26a0f45b..1d619c8eb 100644
--- a/jtools/jikes/Makefile
+++ b/jtools/jikes/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= jikes
PKG_VERSION:= 1.22
PKG_RELEASE:= 1
-PKG_MD5SUM:= 14d4bdfac236e347d806c6743dba48c6
+PKG_MD5SUM:= cda958c7fef6b43b803e1d1ef9afcb85
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jikes/Jikes/1.22/}
DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/jtools/openjdk/Makefile b/jtools/openjdk/Makefile
index 12426a8d2..600db055b 100644
--- a/jtools/openjdk/Makefile
+++ b/jtools/openjdk/Makefile
@@ -59,7 +59,9 @@ $(WRKDIST)/.extract: $(WRKDIST)/.extract_done
cd ${WRKDIST}; tar xzf ${TOPDIR}/dl/${XALAN_NAME}_${XALAN_VERSION}-bin.tar.gz
mkdir -p ${WRKBUILD}/drops
cd ${TOPDIR}/dl; cp jaxp144_01.zip jdk6-jaf-b20.zip jdk6-jaxws-b20.zip ${WRKBUILD}/drops
- cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/*.patch
+ cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/openjdk.patch
+ cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/iconv.patch
+ cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/remove-libnsl.patch
touch $@
$(WRKDIST)/.configured: ${WRKDIST}/.extract
diff --git a/jtools/openjdk/patches/iconv.patch b/jtools/openjdk/patches/iconv.patch
new file mode 100644
index 000000000..c607d2195
--- /dev/null
+++ b/jtools/openjdk/patches/iconv.patch
@@ -0,0 +1,36 @@
+
+ add required linker flags.
+
+--- openjdk-6.orig/jdk/make/java/instrument/Makefile 2011-02-28 17:06:10.000000000 +0100
++++ openjdk-6/jdk/make/java/instrument/Makefile 2011-04-11 23:14:27.571411016 +0200
+@@ -123,6 +123,8 @@
+ # We don't want to link against -ljava
+ JAVALIB=
+
++LDLIBS += -liconv
++
+ #
+ # Add to ambient vpath so we pick up the library files
+ #
+--- openjdk-6.orig/jdk/make/java/npt/Makefile 2011-02-28 17:06:11.000000000 +0100
++++ openjdk-6/jdk/make/java/npt/Makefile 2011-04-11 23:14:07.017670197 +0200
+@@ -65,6 +65,8 @@
+ # We don't want to link against -ljava
+ JAVALIB=
+
++LDLIBS += -liconv
++
+ # Add -export options to explicitly spell exported symbols
+ ifeq ($(PLATFORM), windows)
+ OTHER_LCF += -export:nptInitialize -export:nptTerminate
+--- openjdk-6.orig/jdk/make/sun/splashscreen/Makefile 2011-02-28 17:06:12.000000000 +0100
++++ openjdk-6/jdk/make/sun/splashscreen/Makefile 2011-04-11 23:15:07.221411030 +0200
+@@ -55,6 +55,8 @@
+
+ JAVALIB=
+
++LDLIBS += -liconv
++
+ #
+ # C Flags
+ #
diff --git a/jtools/openjdk/patches/remove-libnsl.patch b/jtools/openjdk/patches/remove-libnsl.patch
new file mode 100644
index 000000000..d867d436b
--- /dev/null
+++ b/jtools/openjdk/patches/remove-libnsl.patch
@@ -0,0 +1,72 @@
+
+ remove libnsl from linking.
+
+--- openjdk-6.orig/jdk/make/java/hpi/hpi_common.gmk 2011-02-28 17:06:10.000000000 +0100
++++ openjdk-6/jdk/make/java/hpi/hpi_common.gmk 2011-04-10 20:05:01.417672476 +0200
+@@ -86,5 +86,5 @@
+ # Things that must be linked in.
+ #
+ ifneq ($(PLATFORM), windows)
+-OTHER_LDLIBS += $(LIBSOCKET) -lnsl $(LIBM) -ldl
++OTHER_LDLIBS += $(LIBSOCKET) $(LIBM) -ldl
+ endif
+--- openjdk-6.orig/jdk/make/java/java/Makefile 2011-02-28 17:06:10.000000000 +0100
++++ openjdk-6/jdk/make/java/java/Makefile 2011-04-10 20:05:20.637673621 +0200
+@@ -205,7 +205,7 @@
+ OTHER_LDLIBS += $(JVMLIB) -libpath:$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) fdlibm.lib \
+ -libpath:$(OBJDIR)/../../../verify/$(OBJDIRNAME) verify.lib
+ else
+-OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) -lnsl -ldl \
++OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) -ldl \
+ -L$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) -lfdlibm.$(ARCH)
+ endif
+
+--- openjdk-6.orig/jdk/make/java/net/Makefile 2011-02-28 17:06:10.000000000 +0100
++++ openjdk-6/jdk/make/java/net/Makefile 2011-04-10 20:05:39.537672169 +0200
+@@ -97,7 +97,7 @@
+ # Will not compile at warning level 3 if warnings are fatal
+ COMPILER_WARNINGS_FATAL=false
+ else
+- OTHER_LDLIBS = $(LIBSOCKET) -lnsl -ldl $(JVMLIB)
++ OTHER_LDLIBS = $(LIBSOCKET) -ldl $(JVMLIB)
+ endif
+ ifeq ($(PLATFORM), linux)
+ OTHER_LDLIBS += -lpthread
+--- openjdk-6.orig/jdk/make/jpda/transport/socket/Makefile 2011-02-28 17:06:11.000000000 +0100
++++ openjdk-6/jdk/make/jpda/transport/socket/Makefile 2011-04-10 20:06:06.037672449 +0200
+@@ -42,11 +42,11 @@
+ endif
+
+ ifeq ($(PLATFORM), linux)
+- OTHER_LDLIBS += -lnsl $(LIBSOCKET) -lpthread
++ OTHER_LDLIBS += $(LIBSOCKET) -lpthread
+ endif
+
+ ifeq ($(PLATFORM), solaris)
+- OTHER_LDLIBS += -lnsl $(LIBSOCKET)
++ OTHER_LDLIBS += $(LIBSOCKET)
+ endif
+
+ ifeq ($(PLATFORM), windows)
+--- openjdk-6.orig/jdk/make/java/java_hprof_demo/Makefile 2011-02-28 17:06:10.000000000 +0100
++++ openjdk-6/jdk/make/java/java_hprof_demo/Makefile 2011-04-10 20:28:43.287672398 +0200
+@@ -83,7 +83,7 @@
+ ifeq ($(PLATFORM), windows)
+ OTHER_LDLIBS += wsock32.lib winmm.lib
+ else
+- OTHER_LDLIBS += $(LIBSOCKET) -lnsl -ldl
++ OTHER_LDLIBS += $(LIBSOCKET) -ldl
+ endif
+
+ #
+--- openjdk-6.orig/jdk/make/mkdemo/jvmti/hprof/Makefile 2011-02-28 17:06:11.000000000 +0100
++++ openjdk-6/jdk/make/mkdemo/jvmti/hprof/Makefile 2011-04-11 10:23:11.538911604 +0200
+@@ -42,7 +42,7 @@
+ OTHER_LDLIBS += $(LIBSOCKET) -lnsl -ldl
+ endif
+ ifeq ($(PLATFORM), linux)
+- OTHER_LDLIBS += $(LIBSOCKET) -lnsl -ldl -lpthread
++ OTHER_LDLIBS += $(LIBSOCKET) -ldl -lpthread
+ endif
+
+ #