diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-10-17 10:54:24 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2013-10-17 10:57:56 +0000 |
| commit | 18f46d9ef713478ea3a50cf83d24c00cd039b71c (patch) | |
| tree | 0f6a3a75d440bbe7bd18e6017edefbef76e0556b /main/openjdk6/fix-with-pax.patch | |
| parent | 66912503366af8a894ed8c0bee69c55396bf2df3 (diff) | |
| download | aports-18f46d9ef713478ea3a50cf83d24c00cd039b71c.tar.bz2 aports-18f46d9ef713478ea3a50cf83d24c00cd039b71c.tar.xz | |
main/openjdk6: upgrade to icedtea6 1.12.6
* use --with-pax from upstream instead of our patches
* build without bootstrapping by default to speed up compiles
(define BOOTSTRAP=yes to do bootstrap build with gcj)
Diffstat (limited to 'main/openjdk6/fix-with-pax.patch')
| -rw-r--r-- | main/openjdk6/fix-with-pax.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/main/openjdk6/fix-with-pax.patch b/main/openjdk6/fix-with-pax.patch new file mode 100644 index 0000000000..c9125585b7 --- /dev/null +++ b/main/openjdk6/fix-with-pax.patch @@ -0,0 +1,26 @@ +--- icedtea6-1.12.6/acinclude.m4.orig ++++ icedtea6-1.12.6/acinclude.m4 +@@ -1948,10 +1948,10 @@ + xpaxctl) + case "${host_cpu}" in + i?86) +- PAX_COMMAND_ARGS="-msp" ++ PAX_COMMAND_ARGS="-c -msp" + ;; + *) +- PAX_COMMAND_ARGS="-m" ++ PAX_COMMAND_ARGS="-c -m" + ;; + esac + ;; +--- icedtea6-1.12.6/Makefile.am.orig ++++ icedtea6-1.12.6/Makefile.am +@@ -2192,7 +2192,7 @@ + fi + rm -f stamps/add-tzdata-support-ecj.stamp + +-stamps/add-archive-ecj.stamp: stamps/icedtea-ecj.stamp ++stamps/add-archive-ecj.stamp: stamps/icedtea-ecj.stamp stamps/pax-mark-vm-ecj.stamp + if !ENABLE_JAMVM + if !ENABLE_CACAO + if !ZERO_BUILD |