[SCM] jigsaw packaging branch, master, updated. 5b08edbc0c8c3dceb18e25206b94cb08204aa2f1

Guillaume Mazoyer respawneral at gmail.com
Mon Jan 16 18:06:13 UTC 2012 

The following commit has been merged in the master branch:
commit 5b08edbc0c8c3dceb18e25206b94cb08204aa2f1
Author: Mandy Chung <mandy.chung at oracle.com>
Date:   Mon Jan 16 19:05:49 2012 +0100

    Sync with the latest upstream source.

diff --git a/.hg/cache/tags b/.hg/cache/tags
index 5e94dc4..3d4403b 100644
--- a/.hg/cache/tags
+++ b/.hg/cache/tags
@@ -1,5 +1,10 @@
-364 50c6783c57480b4fd02504e0d58e5083dbf82142 b10add071b36ac8a6201cf17a559dfbdf5cd0178
+411 960b2e6851862c515f414834239360268925ca66 b7acf83a5fd0481d9b1009e9ed672848716b7e62
 
+69f592185747226a9c765a9fe139c1d34d616f9c jdk8-b02
+587bb549dff83131b65f40aa51864f69562f34a7 jdk8-b03
+f42e3d9394b40a423d345b8da22687b5462e5f25 jdk8-b01
+28cf2aec4dd7c3c75efc1c15078522467c781a6d jdk8-b06
+0db7ae9f2b1017124c779bccd016c976928859a0 jdk8-b07
 59b497130f82ec809c245ffb5e521e3a5fabf8af jdk7-b58
 030142474602b4a067662fffc0c8e541de5a78df jdk7-b59
 ba12117a5e6c918578d6b2a8c693232a33289024 jdk7-b56
@@ -10,13 +15,16 @@ aea0ace7a1e43619800931d42bbf69c579361c2d jdk7-b55
 c235f4a8559d196879c56af80159f67ee5d0e720 jdk7-b53
 5111e13e44e542fe945b47ab154546daec36737d jdk7-b50
 0f0189d55ce4a1f7840da7582ac7d970b3b7ab15 jdk7-b51
+0b66a233bfb9ba2ebda1e5cdfdb0373d6c1e3c69 jdk8-b04
+b910aac18c772b823b1f7da03e2c6528725cc6de jdk8-b05
+fb1bc13260d76447e269e843859eb593fe2a8ab2 jdk8-b08
 541bdc5ad32fc33255944d0a044ad992f3d915e8 jdk7-b41
 44be42de6693063fb191989bf0e188de2fa51e7c jdk7-b40
 848e684279d2ba42577d9621d5b2e5af3823d12d jdk7-b43
 94052b87287303527125026fe4b2698cf867ea83 jdk7-b42
 99846f001ca214015578d593802d26e27246a802 jdk7-b45
 a395e3aac4744cc9033fcd819fad1239a45add52 jdk7-b44
-d7744e86dedc21a8ecf6bdb73eb191b8eaf5b0da jdk7-b47
+26fb81a1e9ceb9baffba216acd9ded62e9e9d5ab jdk8-b13
 e8a2a4d187773a62f3309b0fa265c13425bc2258 jdk7-b46
 aee93a8992d2389121eb610c00a86196f3e2b9b0 jdk7-b49
 4ae9f4bfdb98f65bd957e3fe72471b320150b38e jdk7-b48
@@ -62,6 +70,7 @@ cbc8ad9dd0e085a607427ea35411990982f19a36 jdk7-b25
 cfeea66a3fa8ca3686a7cfa2d0ce8ab0169f168d jdk7-b24
 31e08f70e88d77c2053f91c21b49a04296bdc59a jdk7-b29
 56652b46f328937f6b9b5130f1e4cd80f48868ef jdk7-b28
+8adb70647b5af5273dfe6a540f07be667cd50216 jdk8-b09
 81dfc728d7bb7e1fff4a4dc6d0f7cea5a3315667 jdk7-b109
 140fdef4ddf52244013b6157dc542cd9f677bb6f jdk7-b108
 7d396ad455c3b2f68b0d7094891c5aba7c757a6e jdk7-b107
@@ -82,6 +91,7 @@ e8ebdf41b9c01a26642848f4134f5504e8fb3233 jdk7-b115
 7220e60b097fa027e922f1aeecdd330f3e37409f jdk7-b117
 a12a9e78df8a9d534da0b4a244ed68f0de0bd58e jdk7-b118
 661360bef6ccad6c119f067f5829b207de80c936 jdk7-b119
+7203965666a4fe63bf82f5e4204f41ce6285e716 jdk7-b144
 5f5c33d417f3a14706b09a4a95e65fa7b6fa54d6 jdk7-b92
 5fc102ff48f0e787ce9cc77249841d5ff0941b75 jdk7-b93
 425ba3efabbfe0b188105c10aaf7c3c8fa8d1a38 jdk7-b90
@@ -94,6 +104,7 @@ fd3663286e77b9f13c39eee124db2beb079b3ca6 jdk7-b95
 e7f18db469a3e947b7096bfd12e87380e5a042cd jdk7-b99
 ab4ae8f4514693a9fe17ca2fec0239d8f8450d2c jdk7-b78
 20aeeb51713990dbea6929a2e100a8bbf5df70d4 jdk7-b79
+23aa7f2c80a2fa354c80decf03e7c2018177ef4e jdk8-b14
 175cb3fe615998d1004c6d3fd96e6d2e86b6772d jdk7-b70
 4c36e9853dda27bdac5ef4839a610509fbe31d34 jdk7-b71
 0d7e03b426df27c21dcc44ffb9178eacd1b04f10 jdk7-b72
@@ -102,14 +113,17 @@ ab4ae8f4514693a9fe17ca2fec0239d8f8450d2c jdk7-b78
 d1516b9f23954b29b8e76e6f4efc467c08c78133 jdk7-b75
 c8b63075403d53a208104a8a6ea5072c1cb66aab jdk7-b76
 1f17ca8353babb13f4908c1f87d11508232518c8 jdk7-b77
+1defbc57940a56f0aa41e9dee87b71e8c8b71103 jdk8-b11
+a6c4c248e8fa350c35014fa94bab5ac1a1ac3299 jdk8-b10
 cf26288a114be67c39f2758959ce50b60f5ae330 jdk7-b85
 2f3ea057d1ad56cf3b269cdc4de2741411151982 jdk7-b84
 6b1069f53fbc30663ccef49d78c31bb7d6967bde jdk7-b87
 433a60a9c0bf1b26ee7e65cebaa89c541f497aed jdk7-b86
 8403096d1fe7ff5318df9708cfec84a3fd3e1cf9 jdk7-b81
-a3242906c7747b5d9bcc3d118c7c3c69aa40f4b7 jdk7-b80
+d7744e86dedc21a8ecf6bdb73eb191b8eaf5b0da jdk7-b47
 6880a3af9addb41541e80ebe8cde6f79ec402a58 jdk7-b83
 e1176f86805fe07fd9fb9da065dc51b47712ce76 jdk7-b82
+8e2104d565baee473895d5eba20e39f85ab4bf9f jdk8-b12
 7f1ba4459972bf84b8201dc1cc4f62b1fe1c74f4 jdk7-b89
 82135c848d5fcddb065e98ae77b81077c858f593 jdk7-b88
 82e6c820c51ac27882b77755d42efefdbf1dcda0 jdk7-b69
@@ -126,4 +140,7 @@ e01380cd1de4ce048b87d059d238e5ab5e341947 jdk7-b65
 cfbbdb77eac0397b03eb99ee2e07ea00e0a7b81e jdk7-b142
 c6569c5585851dfd39b8de8e021c3c312f51af12 jdk7-b141
 dcfe74f1c6553c556e7d361c30b0b614eb5e40f6 jdk7-b140
-7203965666a4fe63bf82f5e4204f41ce6285e716 jdk7-b144
+d91364304d7c4ecd34caffdba2b840aeb0d10b51 jdk7-b147
+2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146
+55e9ebf032186c333e5964ed044419830ac02693 jdk7-b145
+a3242906c7747b5d9bcc3d118c7c3c69aa40f4b7 jdk7-b80
diff --git a/jdk/.hg/cache/branchheads b/jdk/.hg/cache/branchheads
index 1d20d56..26d3058 100644
--- a/jdk/.hg/cache/branchheads
+++ b/jdk/.hg/cache/branchheads
@@ -1,2 +1,2 @@
-22ccf6e7a09237596d9640d586f39c0ea8c2129b 4997
-22ccf6e7a09237596d9640d586f39c0ea8c2129b default
+8c6429c279e7dcc24102c2e2c69a40997018f946 5000
+8c6429c279e7dcc24102c2e2c69a40997018f946 default
diff --git a/jdk/.hg/dirstate b/jdk/.hg/dirstate
index 93c4205..0191fda 100644
Binary files a/jdk/.hg/dirstate and b/jdk/.hg/dirstate differ
diff --git a/jdk/.hg/store/00changelog.d b/jdk/.hg/store/00changelog.d
index 03ddae2..228b579 100644
Binary files a/jdk/.hg/store/00changelog.d and b/jdk/.hg/store/00changelog.d differ
diff --git a/jdk/.hg/store/00changelog.i b/jdk/.hg/store/00changelog.i
index 7e27f9a..d4a370c 100644
Binary files a/jdk/.hg/store/00changelog.i and b/jdk/.hg/store/00changelog.i differ
diff --git a/jdk/.hg/store/00manifest.d b/jdk/.hg/store/00manifest.d
index fcd9566..58b7f08 100644
Binary files a/jdk/.hg/store/00manifest.d and b/jdk/.hg/store/00manifest.d differ
diff --git a/jdk/.hg/store/00manifest.i b/jdk/.hg/store/00manifest.i
index 2422e60..297014f 100644
Binary files a/jdk/.hg/store/00manifest.i and b/jdk/.hg/store/00manifest.i differ
diff --git a/jdk/.hg/store/data/make/javax/sound/jsoundalsa/_makefile.i b/jdk/.hg/store/data/make/javax/sound/jsoundalsa/_makefile.i
index 75dcab6..c051924 100644
Binary files a/jdk/.hg/store/data/make/javax/sound/jsoundalsa/_makefile.i and b/jdk/.hg/store/data/make/javax/sound/jsoundalsa/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/modules/modules.config.i b/jdk/.hg/store/data/make/modules/modules.config.i
index 6e65ea3..aaa220e 100644
Binary files a/jdk/.hg/store/data/make/modules/modules.config.i and b/jdk/.hg/store/data/make/modules/modules.config.i differ
diff --git a/jdk/.hg/store/data/make/sun/jdbc/_makefile.i b/jdk/.hg/store/data/make/sun/jdbc/_makefile.i
index b9f0f18..4fb3892 100644
Binary files a/jdk/.hg/store/data/make/sun/jdbc/_makefile.i and b/jdk/.hg/store/data/make/sun/jdbc/_makefile.i differ
diff --git a/jdk/.hg/store/undo b/jdk/.hg/store/undo
index 932c931..34785b7 100644
Binary files a/jdk/.hg/store/undo and b/jdk/.hg/store/undo differ
diff --git a/jdk/.hg/undo.desc b/jdk/.hg/undo.desc
index d23fd9c..e39fa08 100644
--- a/jdk/.hg/undo.desc
+++ b/jdk/.hg/undo.desc
@@ -1,3 +1,3 @@
-4997
+4998
 pull
 http://hg.openjdk.java.net/jigsaw/jigsaw/jdk
diff --git a/jdk/.hg/undo.dirstate b/jdk/.hg/undo.dirstate
index 40df47d..93c4205 100644
Binary files a/jdk/.hg/undo.dirstate and b/jdk/.hg/undo.dirstate differ
diff --git a/jdk/make/javax/sound/jsoundalsa/Makefile b/jdk/make/javax/sound/jsoundalsa/Makefile
index f1b965d..ef0c71a 100644
--- a/jdk/make/javax/sound/jsoundalsa/Makefile
+++ b/jdk/make/javax/sound/jsoundalsa/Makefile
@@ -66,7 +66,7 @@ FILES_export = \
 	$(MIDIFILES_export) \
 	$(PORTFILES_export)
 
-LDFLAGS += -lasound
+OTHER_LDLIBS += -lasound
 
 CPPFLAGS += \
 	-DUSE_DAUDIO=TRUE \
diff --git a/jdk/make/modules/modules.config b/jdk/make/modules/modules.config
index a2cb813..bafcde6 100644
--- a/jdk/make/modules/modules.config
+++ b/jdk/make/modules/modules.config
@@ -187,6 +187,10 @@ module base {
 
     // resource files
     include sun/text/resources/*.icu;
+    include sun/text/resources/CharacterBreakIteratorData,
+            sun/text/resources/WordBreakIteratorData,
+            sun/text/resources/LineBreakIteratorData,
+            sun/text/resources/SentenceBreakIteratorData;
 
     exclude sun.text.bidi.*,
             sun.text.CharArrayCodePointIterator,
diff --git a/jdk/make/sun/jdbc/Makefile b/jdk/make/sun/jdbc/Makefile
index 86b67d1..4114c8b 100644
--- a/jdk/make/sun/jdbc/Makefile
+++ b/jdk/make/sun/jdbc/Makefile
@@ -62,7 +62,7 @@ ifneq ($(PLATFORM), windows)
   #    ODBC_LIBRARY_LOCATION, and delete the variable assignments below.
   #
   # Tell linker to ignore missing externals when building this shared library.
-  LDFLAGS_DEFS_OPTION = -z nodefs
+  LDFLAGS_DEFS_OPTION = -Xlinker -z -Xlinker nodefs
   # Define a place to create the fake libraries and their names.
   ODBC_LIBRARY_LOCATION = $(TEMPDIR)
   ODBC_FAKE_LIBRARIES = $(ODBC_LIBRARY_LOCATION)/libodbcinst.so $(ODBC_LIBRARY_LOCATION)/libodbc.so

-- 
jigsaw packaging

More information about the pkg-java-commits mailing list