diff options
| author | glewis <glewis@FreeBSD.org> | 2002-04-12 13:00:52 +0800 |
|---|---|---|
| committer | glewis <glewis@FreeBSD.org> | 2002-04-12 13:00:52 +0800 |
| commit | 040c70ea38d5274ab0ce58386c0f0cba6fd02832 (patch) | |
| tree | 2f2165e5b509d128f7165ea4488c25cd9d8477c3 | |
| parent | e7e7a7d2783bf0ca992d8faf9976016972797390 (diff) | |
| download | freebsd-ports-gnome-040c70ea38d5274ab0ce58386c0f0cba6fd02832.tar.gz freebsd-ports-gnome-040c70ea38d5274ab0ce58386c0f0cba6fd02832.tar.zst freebsd-ports-gnome-040c70ea38d5274ab0ce58386c0f0cba6fd02832.zip | |
A better fix for creating src.jar. Using tar by itself fails because the
argument list is too long. Hence the first patch invoked tar once for
each file. This works, but is inefficient. This version of the patch
uses cpio in pass through mode to copy all the files at once.
PR: 35658
Submitted by: "Remco van 't Veer" <rwvtveer@xs4all.nl>
Reviewed by: sobomax
Approved by: sobomax
| -rw-r--r-- | java/jdk13/files/patch-common::Release.gmk | 9 | ||||
| -rw-r--r-- | java/jdk14/files/patch-common::Release.gmk | 9 | ||||
| -rw-r--r-- | java/jdk15/files/patch-common::Release.gmk | 9 | ||||
| -rw-r--r-- | java/jdk16/files/patch-common::Release.gmk | 9 |
4 files changed, 16 insertions, 20 deletions
diff --git a/java/jdk13/files/patch-common::Release.gmk b/java/jdk13/files/patch-common::Release.gmk index 9ad3203816e6..eebba86583d7 100644 --- a/java/jdk13/files/patch-common::Release.gmk +++ b/java/jdk13/files/patch-common::Release.gmk @@ -4,17 +4,16 @@ RCS file: /data/java/JDK2/javasrc_1_3_scsl/j2sdk1.3.1/make/common/Release.gmk,v retrieving revision 1.7 diff -u -r1.7 common/Release.gmk --- common/Release.gmk 21 Jan 2002 22:40:08 -0000 1.7 -+++ common/Release.gmk 9 Mar 2002 18:01:51 -0000 -@@ -521,10 +521,18 @@ ++++ common/Release.gmk 10 Apr 2002 18:02:30 -0000 +@@ -521,10 +521,17 @@ @# src.jar @# $(MKDIR) -p $(JDK_IMAGE_DIR)/src +ifeq ($(PLATFORM), bsd) + # Avoid the "argument list too long" problem. + ($(CD) $(SHARE_SRC)/classes; \ -+ for list in `$(FIND) $(SOURCES) -name CVS -prune -o -name SCCS -prune -o -name '*.java' -print`; do \ -+ $(TAR) cf - $$list | ($(CD) $(JDK_IMAGE_DIR)/src; $(TAR) xvf -); \ -+ done) ++ $(FIND) $(SOURCES) -name CVS -prune -o -name SCCS -prune -o -name '*.java' -print \ ++ | $(CPIO) -pd $(JDK_IMAGE_DIR)/src) +else ($(CD) $(SHARE_SRC)/classes; $(TAR) cf - \ `$(FIND) $(SOURCES) -name CVS -prune -o -name SCCS -prune -o \ diff --git a/java/jdk14/files/patch-common::Release.gmk b/java/jdk14/files/patch-common::Release.gmk index 9ad3203816e6..eebba86583d7 100644 --- a/java/jdk14/files/patch-common::Release.gmk +++ b/java/jdk14/files/patch-common::Release.gmk @@ -4,17 +4,16 @@ RCS file: /data/java/JDK2/javasrc_1_3_scsl/j2sdk1.3.1/make/common/Release.gmk,v retrieving revision 1.7 diff -u -r1.7 common/Release.gmk --- common/Release.gmk 21 Jan 2002 22:40:08 -0000 1.7 -+++ common/Release.gmk 9 Mar 2002 18:01:51 -0000 -@@ -521,10 +521,18 @@ ++++ common/Release.gmk 10 Apr 2002 18:02:30 -0000 +@@ -521,10 +521,17 @@ @# src.jar @# $(MKDIR) -p $(JDK_IMAGE_DIR)/src +ifeq ($(PLATFORM), bsd) + # Avoid the "argument list too long" problem. + ($(CD) $(SHARE_SRC)/classes; \ -+ for list in `$(FIND) $(SOURCES) -name CVS -prune -o -name SCCS -prune -o -name '*.java' -print`; do \ -+ $(TAR) cf - $$list | ($(CD) $(JDK_IMAGE_DIR)/src; $(TAR) xvf -); \ -+ done) ++ $(FIND) $(SOURCES) -name CVS -prune -o -name SCCS -prune -o -name '*.java' -print \ ++ | $(CPIO) -pd $(JDK_IMAGE_DIR)/src) +else ($(CD) $(SHARE_SRC)/classes; $(TAR) cf - \ `$(FIND) $(SOURCES) -name CVS -prune -o -name SCCS -prune -o \ diff --git a/java/jdk15/files/patch-common::Release.gmk b/java/jdk15/files/patch-common::Release.gmk index 9ad3203816e6..eebba86583d7 100644 --- a/java/jdk15/files/patch-common::Release.gmk +++ b/java/jdk15/files/patch-common::Release.gmk @@ -4,17 +4,16 @@ RCS file: /data/java/JDK2/javasrc_1_3_scsl/j2sdk1.3.1/make/common/Release.gmk,v retrieving revision 1.7 diff -u -r1.7 common/Release.gmk --- common/Release.gmk 21 Jan 2002 22:40:08 -0000 1.7 -+++ common/Release.gmk 9 Mar 2002 18:01:51 -0000 -@@ -521,10 +521,18 @@ ++++ common/Release.gmk 10 Apr 2002 18:02:30 -0000 +@@ -521,10 +521,17 @@ @# src.jar @# $(MKDIR) -p $(JDK_IMAGE_DIR)/src +ifeq ($(PLATFORM), bsd) + # Avoid the "argument list too long" problem. + ($(CD) $(SHARE_SRC)/classes; \ -+ for list in `$(FIND) $(SOURCES) -name CVS -prune -o -name SCCS -prune -o -name '*.java' -print`; do \ -+ $(TAR) cf - $$list | ($(CD) $(JDK_IMAGE_DIR)/src; $(TAR) xvf -); \ -+ done) ++ $(FIND) $(SOURCES) -name CVS -prune -o -name SCCS -prune -o -name '*.java' -print \ ++ | $(CPIO) -pd $(JDK_IMAGE_DIR)/src) +else ($(CD) $(SHARE_SRC)/classes; $(TAR) cf - \ `$(FIND) $(SOURCES) -name CVS -prune -o -name SCCS -prune -o \ diff --git a/java/jdk16/files/patch-common::Release.gmk b/java/jdk16/files/patch-common::Release.gmk index 9ad3203816e6..eebba86583d7 100644 --- a/java/jdk16/files/patch-common::Release.gmk +++ b/java/jdk16/files/patch-common::Release.gmk @@ -4,17 +4,16 @@ RCS file: /data/java/JDK2/javasrc_1_3_scsl/j2sdk1.3.1/make/common/Release.gmk,v retrieving revision 1.7 diff -u -r1.7 common/Release.gmk --- common/Release.gmk 21 Jan 2002 22:40:08 -0000 1.7 -+++ common/Release.gmk 9 Mar 2002 18:01:51 -0000 -@@ -521,10 +521,18 @@ ++++ common/Release.gmk 10 Apr 2002 18:02:30 -0000 +@@ -521,10 +521,17 @@ @# src.jar @# $(MKDIR) -p $(JDK_IMAGE_DIR)/src +ifeq ($(PLATFORM), bsd) + # Avoid the "argument list too long" problem. + ($(CD) $(SHARE_SRC)/classes; \ -+ for list in `$(FIND) $(SOURCES) -name CVS -prune -o -name SCCS -prune -o -name '*.java' -print`; do \ -+ $(TAR) cf - $$list | ($(CD) $(JDK_IMAGE_DIR)/src; $(TAR) xvf -); \ -+ done) ++ $(FIND) $(SOURCES) -name CVS -prune -o -name SCCS -prune -o -name '*.java' -print \ ++ | $(CPIO) -pd $(JDK_IMAGE_DIR)/src) +else ($(CD) $(SHARE_SRC)/classes; $(TAR) cf - \ `$(FIND) $(SOURCES) -name CVS -prune -o -name SCCS -prune -o \ |