← Back to branch summary

~ubuntu-branches/ubuntu/precise/openjdk-7/precise-security

« back to all changes in this revision

Viewing changes to patches/boot/jar.patch

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose, Damien Raude-Morvan, Matthias Klose
  • Date: 2011-07-10 14:28:17 UTC
  • mfrom: (1.1.4 upstream) (8.1.2 experimental)
  • Revision ID: james.westby@ubuntu.com-20110710142817-tl5xz1zv1aejnbi1
Tags: 7~b143-2.0~pre1-1
[ Damien Raude-Morvan ]
* New b143 code drop.
* Drop d/patches/7031385.diff: Merged upstream.
* Drop d/patches/jamvm-oj7.patch: Merged upstream.
* Manpages are now ja_JP.UTF-8 instead of ja_JP.eucJP

[ Matthias Klose ]
* Apply fix for IcedTea issue #753, #757.
* Update s390 hotspot build fixes.
* Re-enable zero on i386.

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/boot/jar.patch
1
 
diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/common/Release.gmk openjdk-boot/jdk/make/common/Release.gmk
2
 
--- ../openjdk.orig/openjdk-boot/jdk/make/common/Release.gmk    2009-10-30 16:49:37.000000000 +0000
3
 
+++ openjdk-boot/jdk/make/common/Release.gmk    2009-10-30 16:59:16.000000000 +0000
4
 
@@ -650,10 +650,21 @@
 
1
diff -Nru openjdk-boot.orig/jdk/make/common/Release.gmk openjdk-boot/jdk/make/common/Release.gmk
 
2
--- openjdk-boot.orig/jdk/make/common/Release.gmk       2011-06-13 16:08:46.000000000 +0100
 
3
+++ openjdk-boot/jdk/make/common/Release.gmk    2011-06-13 17:06:49.515488800 +0100
 
4
@@ -627,9 +627,19 @@
5
5
 RESOURCES_JAR=$(ABS_TEMPDIR)/resources-orig.jar
6
 
 $(RESOURCES_JAR): $(RES_JAR_FILELIST) $(JAR_MANIFEST_FILE)
 
6
 $(RESOURCES_JAR): $(RES_JAR_FILELIST) $(OTHER_JAR_MANIFEST_FILE)
7
7
        $(prep-target)
8
8
+ifneq (,$(JAR_KNOWS_ATFILE))
9
9
        $(CD) $(CLASSBINDIR) && \
10
 
            $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
 
10
            $(BOOT_JAR_CMD) $(CREATE_JAR_OPTS) $(OTHER_JAR_MANIFEST_FILE) $@ \
11
11
                @$(RES_JAR_FILELIST) $(BOOT_JAR_JFLAGS)
12
 
-       @$(CD) $(CLASSBINDIR) && $(java-vm-cleanup)
13
 
+       @$(CD) $(CLASSBINDIR)
14
12
+else ifneq (,$(JAR_ACCEPTS_STDIN_LIST))
15
13
+       (cd $(CLASSBINDIR) && $(CAT) $(RES_JAR_FILELIST) | \
16
 
+       $(BOOT_JAR_CMD) c0mf@ $(JAR_MANIFEST_FILE) $@ \
 
14
+       $(BOOT_JAR_CMD) $(CREATE_JAR_OPTS)@ $(OTHER_JAR_MANIFEST_FILE) $@ \
17
15
+           $(BOOT_JAR_JFLAGS))
18
16
+else
19
17
+       (cd $(CLASSBINDIR) && \
20
 
+       $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
 
18
+       $(BOOT_JAR_CMD) $(CREATE_JAR_OPTS) $(OTHER_JAR_MANIFEST_FILE) $@ \
21
19
+           $(BOOT_JAR_JFLAGS) `cat $(RES_JAR_FILELIST)`)
22
20
+endif
23
 
+       $(java-vm-cleanup)
 
21
        @$(CD) $(CLASSBINDIR) && $(java-vm-cleanup)
24
22
 
25
23
 # Create jsse.jar containing SunJSSE implementation classes
26
 
 JSSE_JAR=$(ABS_TEMPDIR)/jsse-orig.jar
27
 
@@ -711,9 +722,19 @@
 
24
@@ -683,9 +693,19 @@
28
25
 RT_JAR=$(ABS_TEMPDIR)/rt-orig.jar
29
 
 $(RT_JAR): $(RT_JAR_FILELIST) $(JAR_MANIFEST_FILE)
 
26
 $(RT_JAR): $(RT_JAR_FILELIST) $(RT_JAR_MANIFEST_FILE)
30
27
        $(prep-target)
31
28
+ifneq (,$(JAR_KNOWS_ATFILE))
32
29
        $(CD) $(CLASSBINDIR) && \
33
 
            $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
 
30
            $(BOOT_JAR_CMD) $(CREATE_JAR_OPTS) $(RT_JAR_MANIFEST_FILE) $@ \
34
31
                @$(RT_JAR_FILELIST) $(BOOT_JAR_JFLAGS)
35
32
+else ifneq (,$(JAR_ACCEPTS_STDIN_LIST))
36
33
+       $(CD) $(CLASSBINDIR) && $(CAT) $(RT_JAR_FILELIST) | \
37
 
+           $(BOOT_JAR_CMD) c0mf@ $(JAR_MANIFEST_FILE) $@ \
 
34
+           $(BOOT_JAR_CMD) $(CREATE_JAR_OPTS)@ $(RT_JAR_MANIFEST_FILE) $@ \
38
35
+               $(BOOT_JAR_JFLAGS)
39
36
+else
40
37
+       $(CD) $(CLASSBINDIR) && \
41
 
+           $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
 
38
+           $(BOOT_JAR_CMD) $(CREATE_JAR_OPTS) $(RT_JAR_MANIFEST_FILE) $@ \
42
39
+               $(BOOT_JAR_JFLAGS) `cat $(RT_JAR_FILELIST)`
43
40
+endif
44
41
        @$(CD) $(CLASSBINDIR) && $(java-vm-cleanup)