diff options
| author |   Stefan Jones <cretin@gentoo.org> | 2003-04-16 17:26:05 +0000 |
|---|---|---|
| committer | Stefan Jones <cretin@gentoo.org> | 2003-04-16 17:26:05 +0000 |
| commit | 26806480af7d14d46caaee140a3820932aad0bc1 (patch) | |
| tree | d25a23330ceceaf3ee9b39583ea0e42aa332ff1c /dev-java | |
| parent | bug 18828 (diff) | |
| download | gentoo-2-26806480af7d14d46caaee140a3820932aad0bc1.tar.gz gentoo-2-26806480af7d14d46caaee140a3820932aad0bc1.tar.bz2 gentoo-2-26806480af7d14d46caaee140a3820932aad0bc1.zip | |
Fix motif with glibc-2.3.2
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/sun-j2sdk/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/sun-j2sdk/files/1.4.1/j2sdk-1.4.1-force-motif.patch | 35 |
2 files changed, 22 insertions, 18 deletions
diff --git a/dev-java/sun-j2sdk/ChangeLog b/dev-java/sun-j2sdk/ChangeLog index e6fdbbaa34e3..3f0305eb4f44 100644 --- a/dev-java/sun-j2sdk/ChangeLog +++ b/dev-java/sun-j2sdk/ChangeLog @@ -1,10 +1,13 @@ # ChangeLog for dev-java/sun-j2sdk # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/ChangeLog,v 1.15 2003/04/15 13:51:16 cretin Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/ChangeLog,v 1.16 2003/04/16 17:26:05 cretin Exp $ 06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords *sun-j2sdk-1.4.1 (12 Jan 2003) + 16 Apr 2003; Stefan Jones <cretin@gentoo.org> files/1.4.1/j2sdk-1.4.1-force-motif.patch : + Edit so motif compiles with newer glibc-2.3.2 (gencat problem) + 15 Apr 2003; Stefan Jones <cretin@gentoo.org>: Added patch so it compiles with nptl diff --git a/dev-java/sun-j2sdk/files/1.4.1/j2sdk-1.4.1-force-motif.patch b/dev-java/sun-j2sdk/files/1.4.1/j2sdk-1.4.1-force-motif.patch index 0676e6805dc2..2b5c99d59f4c 100644 --- a/dev-java/sun-j2sdk/files/1.4.1/j2sdk-1.4.1-force-motif.patch +++ b/dev-java/sun-j2sdk/files/1.4.1/j2sdk-1.4.1-force-motif.patch @@ -1,6 +1,6 @@ -diff -ru j2sdk.orig/control/make/motif-rules.gmk j2sdk/control/make/motif-rules.gmk ---- j2sdk.orig/control/make/motif-rules.gmk 2002-09-06 07:00:16.000000000 +0000 -+++ j2sdk/control/make/motif-rules.gmk 2003-01-13 18:21:50.000000000 +0000 +diff -ur j2sdk/control/make/motif-rules.gmk j2sdk.new/control/make/motif-rules.gmk +--- j2sdk/control/make/motif-rules.gmk 2002-09-06 08:00:16.000000000 +0100 ++++ j2sdk.new/control/make/motif-rules.gmk 2003-04-16 15:35:39.000000000 +0100 @@ -25,7 +25,10 @@ ABS_MOTIF_DIR := $(shell $(CD) $(MOTIF_DIR); $(PWD)) endif @@ -13,17 +13,18 @@ diff -ru j2sdk.orig/control/make/motif-rules.gmk j2sdk/control/make/motif-rules. motif: motif-build motif-install -@@ -34,6 +37,9 @@ +@@ -34,8 +37,8 @@ motif-build: ifdef BUILD_MOTIF $(CD) $(MOTIF_TOPDIR)/lib/Xm ; \ -+ $(CD) util ; \ -+ $(MAKE) -k ; \ -+ $(CD) .. ; \ - $(MAKE) MAKEFLAGS= ARCH_DATA_MODEL=$(ARCH_DATA_MODEL); \ - $(MAKE) includes MAKEFLAGS= ARCH_DATA_MODEL=$(ARCH_DATA_MODEL) +- $(MAKE) MAKEFLAGS= ARCH_DATA_MODEL=$(ARCH_DATA_MODEL); \ +- $(MAKE) includes MAKEFLAGS= ARCH_DATA_MODEL=$(ARCH_DATA_MODEL) ++ $(MAKE) -k MAKEFLAGS= ARCH_DATA_MODEL=$(ARCH_DATA_MODEL); \ ++ $(MAKE) -k includes MAKEFLAGS= ARCH_DATA_MODEL=$(ARCH_DATA_MODEL) endif -@@ -43,15 +49,14 @@ + + motif-install: motif-install-lib motif-install-include +@@ -43,15 +46,14 @@ motif-install-lib: $(MOTIF_DIR)/lib ifdef BUILD_MOTIF $(CD) $(MOTIF_DIR)/lib; \ @@ -43,7 +44,7 @@ diff -ru j2sdk.orig/control/make/motif-rules.gmk j2sdk/control/make/motif-rules. endif # # clobber the workspace, but note that the motif code misses some -@@ -62,7 +67,7 @@ +@@ -62,7 +64,7 @@ ifdef BUILD_MOTIF ( $(CD) $(MOTIF_TOPDIR)/lib/Xm ; \ $(MAKE) clean MAKEFLAGS= ARCH_DATA_MODEL=$(ARCH_DATA_MODEL); ); \ @@ -52,9 +53,9 @@ diff -ru j2sdk.orig/control/make/motif-rules.gmk j2sdk/control/make/motif-rules. $(MOTIF_TOPDIR)/lib/Xm/Xm.msg $(RM) -r $(MOTIF_TOPDIR)/lib/Xm/exports $(RM) -r $(MOTIF_DIR)/lib $(MOTIF_DIR)/include $(MOTIF_DIR) -diff -ru j2sdk.orig/j2se/make/sun/awt/Makefile j2sdk/j2se/make/sun/awt/Makefile ---- j2sdk.orig/j2se/make/sun/awt/Makefile 2002-09-06 07:08:23.000000000 +0000 -+++ j2sdk/j2se/make/sun/awt/Makefile 2003-01-13 18:05:35.000000000 +0000 +diff -ur j2sdk/j2se/make/sun/awt/Makefile j2sdk.new/j2se/make/sun/awt/Makefile +--- j2sdk/j2se/make/sun/awt/Makefile 2002-09-06 08:08:23.000000000 +0100 ++++ j2sdk.new/j2se/make/sun/awt/Makefile 2003-04-16 15:34:13.000000000 +0100 @@ -237,8 +237,10 @@ ifneq ($(PLATFORM), windows) # vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv SOLARIS/LINUX @@ -67,9 +68,9 @@ diff -ru j2sdk.orig/j2se/make/sun/awt/Makefile j2sdk/j2se/make/sun/awt/Makefile else # STATIC_MOTIF LIBXM = -lXm endif # STATIC_MOTIF -diff -ru j2sdk.orig/j2se/make/sun/awt/mawt.gmk j2sdk/j2se/make/sun/awt/mawt.gmk ---- j2sdk.orig/j2se/make/sun/awt/mawt.gmk 2002-09-06 07:08:24.000000000 +0000 -+++ j2sdk/j2se/make/sun/awt/mawt.gmk 2003-01-13 18:05:35.000000000 +0000 +diff -ur j2sdk/j2se/make/sun/awt/mawt.gmk j2sdk.new/j2se/make/sun/awt/mawt.gmk +--- j2sdk/j2se/make/sun/awt/mawt.gmk 2002-09-06 08:08:24.000000000 +0100 ++++ j2sdk.new/j2se/make/sun/awt/mawt.gmk 2003-04-16 15:34:13.000000000 +0100 @@ -125,8 +125,10 @@ else CFLAGS += -DMOTIF_VERSION=$(MOTIF_VERSION) |