Mercurial > hg > release > icedtea7-2.6
changeset 2671:9e0c07300664
When building with PaX, PaX mark the output directory before running the just-built rmic.
2013-01-15 Andrew John Hughes <gnu.andrew@member.fsf.org>
* Makefile.am:
(ICEDTEA_PATCHES): Add patch when building
with PaX.
* patches/pax-mark-rmic-java.patch:
PaX mark output directory before running just-built
rmic.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Tue, 15 Jan 2013 09:40:18 +0000 |
| parents | 0c77e9a81a9b |
| children | 981d010a05bf |
| files | ChangeLog Makefile.am patches/pax-mark-rmic-java.patch |
| diffstat | 3 files changed, 22 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Sep 20 14:26:50 2013 +0100 +++ b/ChangeLog Tue Jan 15 09:40:18 2013 +0000 @@ -1,3 +1,12 @@ +2013-01-15 Andrew John Hughes <gnu.andrew@member.fsf.org> + + * Makefile.am: + (ICEDTEA_PATCHES): Add patch when building + with PaX. + * patches/pax-mark-rmic-java.patch: + PaX mark output directory before running just-built + rmic. + 2013-06-28 Andrew John Hughes <gnu.andrew@member.fsf.org> * acinclude.m4:
--- a/Makefile.am Fri Sep 20 14:26:50 2013 +0100 +++ b/Makefile.am Tue Jan 15 09:40:18 2013 +0000 @@ -296,7 +296,9 @@ endif if WITH_PAX -ICEDTEA_PATCHES += patches/test_gamma.patch +ICEDTEA_PATCHES += \ + patches/test_gamma.patch \ + patches/pax-mark-rmic-java.patch endif ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/pax-mark-rmic-java.patch Tue Jan 15 09:40:18 2013 +0000 @@ -0,0 +1,10 @@ +--- openjdk/jdk/make/com/sun/jmx/Makefile ++++ openjdk/jdk/make/com/sun/jmx/Makefile +@@ -119,6 +119,7 @@ + + $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class + $(prep-target) ++ "$(TOPDIR)"/../../pax-mark-vm "$(OUTPUTDIR)" + $(RMIC) -classpath "$(CLASSDESTDIR)" \ + -d $(CLASSDESTDIR) \ + -v1.2 \