/hg/release/icedtea7-forest-2.4/jdk: 2 new changesets

[andrew at icedtea.classpath.org]

changeset a2c172404305 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=a2c172404305
author: andrew
date: Wed Feb 05 11:24:21 2014 +0000

	Link against $(LIBDL) if SYSTEM_CUPS is not true


changeset f582aad1fce8 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=f582aad1fce8
author: andrew
date: Wed Feb 19 21:08:02 2014 +0000

	PR1679: Allow OpenJDK to build on PaX-enabled kernels


diffstat:

 make/com/sun/jmx/Makefile |  10 ++++++++--
 make/sun/awt/mawt.gmk     |   3 ++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diffs (45 lines):

diff -r e44a1aa00614 -r f582aad1fce8 make/com/sun/jmx/Makefile
--- a/make/com/sun/jmx/Makefile	Mon Feb 03 14:10:39 2014 +0900
+++ b/make/com/sun/jmx/Makefile	Wed Feb 19 21:08:02 2014 +0000
@@ -114,13 +114,19 @@
 endif
 
 ifeq ($(CROSS_COMPILE_ARCH),)
-RMIC = $(RMIC_JAVA) $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main
+RMIC_VM = $(RMIC_JAVA)
 else
-RMIC = $(BOOT_JAVA_CMD)  $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main
+RMIC_VM = $(BOOT_JAVA_CMD)
 endif  
+RMIC = $(RMIC_VM) $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main
 
 $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
 	$(prep-target)
+	if [ -x $(PAX_COMMAND) ] ; then \
+	  if [ -w $(RMIC_VM) ] ; then \
+	    $(PAX_COMMAND) $(PAX_COMMAND_ARGS) $(RMIC_VM) ; \
+	  fi ; \
+	fi
 	$(RMIC) -classpath "$(CLASSDESTDIR)"    \
                 -d $(CLASSDESTDIR)              \
                 -v1.2                           \
diff -r e44a1aa00614 -r f582aad1fce8 make/sun/awt/mawt.gmk
--- a/make/sun/awt/mawt.gmk	Mon Feb 03 14:10:39 2014 +0900
+++ b/make/sun/awt/mawt.gmk	Wed Feb 19 21:08:02 2014 +0000
@@ -192,6 +192,8 @@
 
 ifdef USE_SYSTEM_CUPS
   OTHER_LDLIBS += $(CUPS_LIBS)
+else
+  OTHER_LDLIBS += $(LIBDL)
 endif
 
 ifdef USE_SYSTEM_FONTCONFIG
@@ -219,7 +221,6 @@
 
 ifdef USE_SYSTEM_CUPS
   CPPFLAGS += -DUSE_SYSTEM_CUPS
-  LDFLAGS += $(CUPS_LIBS)
 else
   CPPFLAGS += -I$(PLATFORM_SRC)/native/common/deps
 endif