← Back to branch summary

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

« back to all changes in this revision

Viewing changes to Makefile.am

  • 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:
Makefile.am
1
1
# Dependencies
2
2
 
3
 
OPENJDK_VERSION = b136
4
 
 
5
 
CORBA_CHANGESET = b62418551e20
6
 
HOTSPOT_CHANGESET = 591c7dc0b2ee
7
 
JAXP_CHANGESET = 1c2f25bf36b1
8
 
JAXWS_CHANGESET = 339c2d381d80
9
 
JDK_CHANGESET = 1571aa7abe47
10
 
LANGTOOLS_CHANGESET = 8e26c4aee63c
11
 
OPENJDK_CHANGESET = d4aea1a51d62
12
 
 
13
 
CORBA_SHA256SUM = 60f8494b1ebf58db75fe8871dcbee1f6e4bd1d8d6c9b6ce49dad7a6a6340c4ac
14
 
HOTSPOT_SHA256SUM = 6b2c5c9f5c1c603f742ddabb567d4abac23b91186ead4c1fc9d9643a07798e82
15
 
JAXP_SHA256SUM = 9db874ee86a073776674b138c3bcd0b1b2bc90d31ed48d59f88021e93ac8a8d0
16
 
JAXWS_SHA256SUM = 078ad45ced056d147344418e72dce6dca65e01c4ebf2b7008b74733774bcb24c
17
 
JDK_SHA256SUM = 6d12de7cecd01c4ddef1a28fc393dfe5f8d66dea80b7d1484e028e8b921ac219
18
 
LANGTOOLS_SHA256SUM = e1beab78534a3a0fb18404c3c200e8866da275c7c656172c9f295f11203e5f39
19
 
OPENJDK_SHA256SUM = 856b791751e56f64cc10e4826eefc9af9882969b179595c9642f7c9771965e7d
 
3
OPENJDK_VERSION = b143
 
4
 
 
5
CORBA_CHANGESET = 279c876d1001
 
6
HOTSPOT_CHANGESET = f7e8b10f51c6
 
7
JAXP_CHANGESET = d8cdc48a42bd
 
8
JAXWS_CHANGESET = e514ae6ec042
 
9
JDK_CHANGESET = d28f54a421b1
 
10
LANGTOOLS_CHANGESET = 1316e51b3995
 
11
OPENJDK_CHANGESET = 2108c94c0d3d
 
12
 
 
13
CORBA_SHA256SUM = 8d0b3dcbc5e160b0909e66a7b2aaa5f0783892d7ce2df4b7c3a00bb4eee7e882
 
14
HOTSPOT_SHA256SUM = 1d4643b4a8fb093403eca0bca69e8b6cabf5db4dc7df157650fdbd6f91580246
 
15
JAXP_SHA256SUM = 9244b44984c255e54e37a4556c4985f5356bd611de536f2bae58f9aa1d82bb7d
 
16
JAXWS_SHA256SUM = 44022c1546f6589f9bac6aa8079642aadf0c43e61afc074b841d3f6dd6e30609
 
17
JDK_SHA256SUM = ba69d9e4cdd1a92bda3aaaf0fcabafa3663f01e19ee3575fd3d81c6c2027e653
 
18
LANGTOOLS_SHA256SUM = 022e167d31a948cebe9ea163b4e3dafdc6d23acba16b40170b00c4b24f4a14d0
 
19
OPENJDK_SHA256SUM = e2ce820b0da226ef334252469ba9e7a6186b35023f3c68751befaaffc6f86ee0
20
20
 
21
21
CACAO_VERSION = d6264eb66506
22
22
CACAO_SHA256SUM = 94ea7899e806ccbc33a732b5113a8f969d8b1f4ce7ffd27cf04577054f65f63c
24
24
CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.bz2
25
25
CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2
26
26
 
27
 
JAMVM_VERSION = b56aca6c30847390c67ae6b1cae1c6ae0f2c6650
28
 
JAMVM_SHA256SUM = 57d2b2de2a82b667a4cd470b486d9f6e461fcc1a9eca554d65cb5253a35b6c8c
 
27
JAMVM_VERSION = f8b8e8e78ec057a5852ff8c0f3386b48f3eca907
 
28
JAMVM_SHA256SUM = 4107152b0a840656f3551c9b21cb52696417ba6d597457a8b34c86437f9ce64e
29
29
JAMVM_BASE_URL = http://icedtea.classpath.org/download/drops/jamvm
30
30
JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz
31
31
JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz
32
32
 
33
33
JAXWS_DROP_URL = http://icedtea.classpath.org/download/drops
34
 
JAXWS_DROP_ZIP = jdk7-jaxws2_2_2-2010_12_14.zip
35
 
JAXWS_DROP_SHA256SUM = ef3115dde8ed9a7129e65aab8b1499e11621e343559e6e5a8df9c4542848fb9b
 
34
JAXWS_DROP_ZIP = jdk7-jaxws2_2_4-b02-2011_05_09.zip
 
35
JAXWS_DROP_SHA256SUM = 2fd874aae97a4206c8f4cd93ee419c09f95c3f684349182b66b6ee9010c72f84
36
36
JAF_DROP_URL = http://icedtea.classpath.org/download/drops
37
37
JAF_DROP_ZIP = jdk7-jaf-2010_08_19.zip
38
38
JAF_DROP_SHA256SUM = e6aefedfdbb4673e8019583d1344fb162b94e1b10382c362364dbbfd5889c09e
39
39
JAXP_DROP_URL = http://icedtea.classpath.org/download/drops
40
 
JAXP_DROP_ZIP = jaxp-1_4_5-dev1.zip
41
 
JAXP_DROP_SHA256SUM = 050cba755c2632dc5ec5ffcdb17f2f4d36a018306c357fdd5c8996d877954de5
 
40
JAXP_DROP_ZIP = jaxp-1_4_5.zip
 
41
JAXP_DROP_SHA256SUM = 8145a789a61d21d0ff9902e4dc1c7ba492bb407ee614187dc933321922249ddb
42
42
 
43
43
ICEDTEA_PREFIX = icedtea7-forest
44
44
ICEDTEA_HG_URL = http://icedtea.classpath.org/hg/$(ICEDTEA_PREFIX)
247
247
 
248
248
ICEDTEA_PATCHES = \
249
249
        patches/text-relocations.patch \
250
 
        patches/rmi_amd64.patch \
251
250
        patches/demos.patch \
252
251
        patches/headers.patch \
253
252
        patches/gcc-suffix.patch \
272
271
        patches/lc_ctype.patch \
273
272
        patches/tests-jdk.patch \
274
273
        patches/linker-libs-order.patch \
275
 
        patches/testenv.patch \
276
274
        patches/samejvm-safe.patch \
277
275
        patches/pr261.patch \
278
276
        patches/parisc-opt.patch \
308
306
        patches/cacao/ignore-tests.patch
309
307
endif
310
308
 
311
 
if BUILD_JAMVM
312
 
ICEDTEA_PATCHES += \
313
 
        patches/jamvm/ignore-unknown-options.patch
314
 
endif
315
 
 
316
309
if ENABLE_PULSE_JAVA
317
310
ICEDTEA_PATCHES += \
318
311
        patches/pulse-soundproperties.patch
352
345
        patches/boot/xbootclasspath.patch \
353
346
        patches/boot/icedteart.patch \
354
347
        patches/boot/jar.patch \
355
 
        patches/boot/javah.patch \
356
348
        patches/boot/symbols.patch \
357
349
        patches/boot/tobin.patch \
358
350
        patches/boot/test_gamma.patch \
380
372
endif
381
373
 
382
374
if CP40188_JAVAH
383
 
ICEDTEA_BOOT_PATCHES += patches/boot/pr40188.patch
 
375
ICEDTEA_BOOT_PATCHES += patches/boot/pr40188.patch \
 
376
        patches/boot/javah.patch
384
377
endif
385
378
 
386
379
if CP40616
405
398
 
406
399
if JAVAC_LACKS_DIAMOND
407
400
ICEDTEA_BOOT_PATCHES += patches/boot/ecj-diamond.patch
 
401
else
 
402
ICEDTEA_BOOT_PATCHES += patches/boot/compile-for-7.patch
408
403
endif
409
404
 
410
405
ICEDTEA_BOOT_PATCHES += $(DISTRIBUTION_BOOT_PATCHES)
1343
1338
        rm -rf $(abs_top_builddir)/generated.build
1344
1339
        rm -f stamps/generated.stamp
1345
1340
 
1346
 
stamps/patch-fsg.stamp: stamps/extract.stamp stamps/sanitise-openjdk.stamp
 
1341
stamps/patch-fsg.stamp: stamps/extract.stamp
1347
1342
        mkdir -p stamps ; \
1348
1343
        rm -f stamps/patch-fsg.stamp.tmp ; \
1349
1344
        touch stamps/patch-fsg.stamp.tmp ; \
1394
1389
          rm -f stamps/patch-fsg.stamp ; \
1395
1390
        fi
1396
1391
 
1397
 
stamps/patch.stamp: stamps/extract.stamp stamps/patch-fsg.stamp
 
1392
stamps/patch.stamp: stamps/patch-fsg.stamp
1398
1393
        mkdir -p stamps ; \
1399
1394
        rm -f stamps/patch.stamp.tmp ; \
1400
1395
        touch stamps/patch.stamp.tmp ; \