/hg/release/icedtea7-forest-2.2/corba: 13 new changesets
dbhole at icedtea.classpath.org
dbhole at icedtea.classpath.org
Wed May 2 13:54:56 PDT 2012
changeset 6a262c36caeb in /hg/release/icedtea7-forest-2.2/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/corba?cmd=changeset;node=6a262c36caeb
author: katleman
date: Thu Feb 23 15:14:14 2012 -0800
Added tag jdk7u4-b13 for changeset f71197458980
changeset d9bf21b76f09 in /hg/release/icedtea7-forest-2.2/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/corba?cmd=changeset;node=d9bf21b76f09
author: katleman
date: Thu Mar 01 13:44:40 2012 -0800
Added tag jdk7u4-b14 for changeset 6a262c36caeb
changeset bfca64f13d58 in /hg/release/icedtea7-forest-2.2/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/corba?cmd=changeset;node=bfca64f13d58
author: katleman
date: Thu Mar 08 11:19:23 2012 -0800
Added tag jdk7u4-b15 for changeset d9bf21b76f09
changeset e2a9fe67e059 in /hg/release/icedtea7-forest-2.2/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/corba?cmd=changeset;node=e2a9fe67e059
author: katleman
date: Fri Mar 16 07:29:18 2012 -0700
Added tag jdk7u4-b16 for changeset bfca64f13d58
changeset c2eb741b947d in /hg/release/icedtea7-forest-2.2/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/corba?cmd=changeset;node=c2eb741b947d
author: katleman
date: Thu Mar 22 14:10:58 2012 -0700
Added tag jdk7u4-b17 for changeset e2a9fe67e059
changeset 8bdf527067ac in /hg/release/icedtea7-forest-2.2/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/corba?cmd=changeset;node=8bdf527067ac
author: cl
date: Thu Mar 29 15:42:11 2012 -0700
Added tag jdk7u4-b18 for changeset c2eb741b947d
changeset c844df9ea59f in /hg/release/icedtea7-forest-2.2/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/corba?cmd=changeset;node=c844df9ea59f
author: katleman
date: Thu Apr 05 15:09:46 2012 -0700
Added tag jdk7u4-b19 for changeset 8bdf527067ac
changeset 10579933ba86 in /hg/release/icedtea7-forest-2.2/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/corba?cmd=changeset;node=10579933ba86
author: jmelvin
date: Wed Apr 04 10:37:41 2012 -0400
7130404: [macosx] "os.arch" value should be "x86_64" for compatibility with Apple JDK6
Summary: On Mac OS X, align system property "os.arch" with Apple legacy JDKs. Also, improve os.name string matching by using .contains() method instead of .startsWith(). This fix spans multiple repositories.
Reviewed-by: dcubed, phh, ohair, katleman
changeset 81a59f2d7ea4 in /hg/release/icedtea7-forest-2.2/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/corba?cmd=changeset;node=81a59f2d7ea4
author: lana
date: Mon Apr 09 08:58:24 2012 -0700
Merge
changeset 91cf6d5b184c in /hg/release/icedtea7-forest-2.2/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/corba?cmd=changeset;node=91cf6d5b184c
author: katleman
date: Thu Apr 12 14:15:44 2012 -0700
Added tag jdk7u4-b20 for changeset 81a59f2d7ea4
changeset b8560e92b68c in /hg/release/icedtea7-forest-2.2/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/corba?cmd=changeset;node=b8560e92b68c
author: katleman
date: Mon Apr 16 15:03:39 2012 -0700
Added tag jdk7u4-b30 for changeset 91cf6d5b184c
changeset 1b97d80df5c4 in /hg/release/icedtea7-forest-2.2/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/corba?cmd=changeset;node=1b97d80df5c4
author: katleman
date: Fri Apr 20 11:08:55 2012 -0700
Added tag jdk7u4-b21 for changeset b8560e92b68c
changeset b165245a9c91 in /hg/release/icedtea7-forest-2.2/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/corba?cmd=changeset;node=b165245a9c91
author: Deepak Bhole <dbhole at redhat.com>
date: Wed May 02 13:12:29 2012 -0400
Merge
diffstat:
.hgtags | 16 ++++++++++++++++
make/common/shared/Platform.gmk | 26 ++++++++++++++++++--------
2 files changed, 34 insertions(+), 8 deletions(-)
diffs (127 lines):
diff -r f71197458980 -r b165245a9c91 .hgtags
--- a/.hgtags Fri Feb 17 09:46:18 2012 -0800
+++ b/.hgtags Wed May 02 13:12:29 2012 -0400
@@ -50,6 +50,7 @@
b751c528c55560cf2adeaeef24b39ca1f4d1cbf7 jdk7-b73
5d0cf59a3203b9f57aceebc33ae656b884987955 jdk7-b74
0fb137085952c8e47878e240d1cb40f14de463c4 jdk7-b75
+d728db3889da23d9f74e45154b9261a43b4acd8d icedtea7-1.12
937144222e2219939101b0129d26a872a7956b13 jdk7-b76
6881f0383f623394b5ec73f27a5f329ff55d0467 jdk7-b77
a7f7276b48cd74d8eb1baa83fbf3d1ef4a2603c8 jdk7-b78
@@ -63,6 +64,7 @@
6253e28826d16cf1aecc39ce04c8de1f6bf2df5f jdk7-b86
09a41111a401d327f65e453384d976a10154d9ea jdk7-b87
39e14d2da687c7e592142137517aaf689544820f jdk7-b88
+e805b4155d76f76d40ffae36a74546f79218c539 icedtea7-1.13
bb4424c5e778b842c064a8b1aa902b35f4397654 jdk7-b89
56ce07b0eb47b93a98a72adef0f21e602c460623 jdk7-b90
bcd2fc089227559ac5be927923609fac29f067fa jdk7-b91
@@ -111,6 +113,7 @@
918003855fa0dba5acf4bf1fe36526d2fc4c1ba8 jdk7-b134
e0b72ae5dc5e824b342801c8d1d336a55eb54e2c jdk7-b135
48ef0c712e7cbf272f47f9224db92a3c6a9e2612 jdk7-b136
+b62418551e20fa19fbf57c49d4378b7096809e60 icedtea-1.14
a66c01d8bf895261715955df0b95545c000ed6a8 jdk7-b137
78d8cf04697e9df54f7f11e195b7da29b8e345a2 jdk7-b138
60b074ec6fcf5cdf9efce22fdfb02326ed8fa2d3 jdk7-b139
@@ -123,6 +126,7 @@
770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146
36f0efbc66ef8ace3cca8aa8d0c88f3334080f8a jdk7u1-b01
73323cb3396260d93e0ab731fd2d431096ceed0f jdk7-b147
+d034cc90ecc266d78b87d1429c426669431fcc1f icedtea-2.0-branchpoint
9515a2d034b4727c11aeea36354a549fbc469c4f jdk7u1-b02
dd71cb354c573c1addcda269a7dd9144bfce9587 jdk7u1-b03
eaee830124aa453627591d8f9eccb39d7e040876 jdk7u1-b04
@@ -141,6 +145,7 @@
56b02f8ef70391a67c9fa71157a8faafbdff4b74 jdk7u2-b12
456ff1f14b14ef8cfe47cef95c8094f8443fa092 jdk7u2-b13
62b846b0c3259cae732e75df50a1b180a2541178 jdk7u2-b21
+ecb9fc90dea4720f5c1ba1354364ed610f463e41 icedtea-2.1-branchpoint
1b648adeeefa9b1fb022459e8e4f590b736c0fdd jdk7u3-b02
730fa05af5a9d10a3a7a1626d248b96d09f8069f jdk7u3-b03
7f7a9b1addb4925f4f6e17f6eb5cce986c3b626d jdk7u3-b04
@@ -157,3 +162,14 @@
23777178e7eb61859be3f7240561aa1034ff9221 jdk7u4-b10
bdc37f3c09b6008667aff77432bb6d31cbae945e jdk7u4-b11
fddc26b35a31884d64315cf7c296570245e9c481 jdk7u4-b12
+9ffa2340e018131c900e9cc12c9f3a10698aa191 icedtea-2.2-branchpoint
+f7119745898016a98cddab3e69efb41c5a5aaf78 jdk7u4-b13
+6a262c36caebb43972cbae5032cff632ce31d2cc jdk7u4-b14
+d9bf21b76f093abfe451880d5db29e4932b1e72e jdk7u4-b15
+bfca64f13d582de179d69b32cf68ed06e6271ad0 jdk7u4-b16
+e2a9fe67e0595ea101a2c0b07cd98ab401b3c25e jdk7u4-b17
+c2eb741b947d9c31137934b75df12741bbc2c7fc jdk7u4-b18
+8bdf527067aca1acf92c7083a9c249e0731ff955 jdk7u4-b19
+81a59f2d7ea4e7a880041eaa4fa4e9d2518ed35b jdk7u4-b20
+91cf6d5b184c696382fd50ad76ca1d2bfd962e91 jdk7u4-b30
+b8560e92b68c2409fa46cd784c87e7cb5a043e59 jdk7u4-b21
diff -r f71197458980 -r b165245a9c91 make/common/shared/Platform.gmk
--- a/make/common/shared/Platform.gmk Fri Feb 17 09:46:18 2012 -0800
+++ b/make/common/shared/Platform.gmk Wed May 02 13:12:29 2012 -0400
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -153,6 +153,9 @@
OS_VERSION := $(shell uname -r)
# Arch and OS name/version
mach := $(shell uname -m)
+ ifneq (,$(wildcard /usr/bin/dpkg-architecture))
+ mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/')
+ endif
archExpr = case "$(mach)" in \
i[3-9]86) \
echo i586 \
@@ -169,6 +172,9 @@
arm*) \
echo arm \
;; \
+ sh*) \
+ echo sh \
+ ;; \
*) \
echo $(mach) \
;; \
@@ -196,6 +202,9 @@
else
ARCH_DATA_MODEL=64
endif
+ ifeq ($(ARCH), sh)
+ ARCH_DATA_MODEL=32
+ endif
endif
endif
@@ -275,7 +284,7 @@
echo sparc \
;; \
x86_64) \
- echo amd64 \
+ echo x86_64 \
;; \
"Power Macintosh") \
echo ppc \
@@ -287,12 +296,13 @@
ARCH := $(shell $(archExpr) )
ARCH_FAMILY := $(ARCH)
- # Darwin x86 builds are i386/amd64 universal.
- ifeq ($(SYSTEM_UNAME), Darwin)
- ifneq ($(ARCH), ppc)
- ARCH=universal
- endif
- endif
+ # Darwin builds are currently universal but only include 64-bit
+ #
+ # ifeq ($(SYSTEM_UNAME), Darwin)
+ # ifneq ($(ARCH), ppc)
+ # ARCH=universal
+ # endif
+ # endif
# i586, sparc, and ppc are 32 bit, amd64 and sparc64 are 64
ifneq (,$(findstring $(ARCH), i586 sparc ppc universal))
More information about the distro-pkg-dev
mailing list