head	1.4;
access;
symbols
	pkgsrc-2020Q1:1.3.0.2
	pkgsrc-2020Q1-base:1.3
	pkgsrc-2019Q4:1.3.0.24
	pkgsrc-2019Q4-base:1.3
	pkgsrc-2019Q3:1.3.0.20
	pkgsrc-2019Q3-base:1.3
	pkgsrc-2019Q2:1.3.0.18
	pkgsrc-2019Q2-base:1.3
	pkgsrc-2019Q1:1.3.0.16
	pkgsrc-2019Q1-base:1.3
	pkgsrc-2018Q4:1.3.0.14
	pkgsrc-2018Q4-base:1.3
	pkgsrc-2018Q3:1.3.0.12
	pkgsrc-2018Q3-base:1.3
	pkgsrc-2018Q2:1.3.0.10
	pkgsrc-2018Q2-base:1.3
	pkgsrc-2018Q1:1.3.0.8
	pkgsrc-2018Q1-base:1.3
	pkgsrc-2017Q4:1.3.0.6
	pkgsrc-2017Q4-base:1.3
	pkgsrc-2017Q3:1.3.0.4
	pkgsrc-2017Q3-base:1.3
	pkgsrc-2017Q2:1.2.0.20
	pkgsrc-2017Q2-base:1.2
	pkgsrc-2017Q1:1.2.0.18
	pkgsrc-2017Q1-base:1.2
	pkgsrc-2016Q4:1.2.0.16
	pkgsrc-2016Q4-base:1.2
	pkgsrc-2016Q3:1.2.0.14
	pkgsrc-2016Q3-base:1.2
	pkgsrc-2016Q2:1.2.0.12
	pkgsrc-2016Q2-base:1.2
	pkgsrc-2016Q1:1.2.0.10
	pkgsrc-2016Q1-base:1.2
	pkgsrc-2015Q4:1.2.0.8
	pkgsrc-2015Q4-base:1.2
	pkgsrc-2015Q3:1.2.0.6
	pkgsrc-2015Q3-base:1.2
	pkgsrc-2015Q2:1.2.0.4
	pkgsrc-2015Q2-base:1.2
	pkgsrc-2015Q1:1.2.0.2
	pkgsrc-2015Q1-base:1.2
	pkgsrc-2014Q4:1.1.0.14
	pkgsrc-2014Q4-base:1.1
	pkgsrc-2014Q3:1.1.0.12
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.10
	pkgsrc-2014Q2-base:1.1
	pkgsrc-2014Q1:1.1.0.8
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.6
	pkgsrc-2013Q4-base:1.1
	pkgsrc-2013Q3:1.1.0.4
	pkgsrc-2013Q3-base:1.1
	pkgsrc-2013Q2:1.1.0.2
	pkgsrc-2013Q2-base:1.1;
locks; strict;
comment	@# @;


1.4
date	2020.05.17.00.47.06;	author tnn;	state dead;
branches;
next	1.3;
commitid	by06jUrXKAUzQw8C;

1.3
date	2017.08.14.00.02.16;	author ryoon;	state Exp;
branches;
next	1.2;
commitid	FNK38syeYrmeY63A;

1.2
date	2015.02.10.19.31.54;	author tnn;	state Exp;
branches;
next	1.1;
commitid	5zI9LYl6z5lESu9y;

1.1
date	2013.06.23.17.39.43;	author jperkin;	state Exp;
branches;
next	;
commitid	lfz1J27UHljKrLUw;


desc
@@


1.4
log
@retire lang/openjdk7
@
text
@$NetBSD: patch-jdk_make_com_sun_jmx_Makefile,v 1.3 2017/08/14 00:02:16 ryoon Exp $

Disable SunOS multiarch.
Let the build find intermediate libs when it wants to run intermediate rmic.

--- jdk/make/com/sun/jmx/Makefile.orig	2017-08-13 05:55:12.000000000 +0000
+++ jdk/make/com/sun/jmx/Makefile
@@@@ -106,7 +106,7 @@@@ FILES_ties   = $(subst javax/management/
 
 RMIC_JAVA = $(OUTPUTDIR)/bin/java
 # need to treat 64bit solaris differently
-ifeq ($(PLATFORM)-$(LIBARCH), solaris-amd64)
+ifeq ($(PLATFORM)-$(LIBARCH), NOMULTIARCHsolaris-amd64)
 RMIC_JAVA = $(OUTPUTDIR)/bin/amd64/java
 endif
 ifeq ($(PLATFORM)-$(LIBARCH), solaris-sparcv9)
@@@@ -118,7 +118,7 @@@@ RMIC_VM = $(RMIC_JAVA)
 else
 RMIC_VM = $(BOOT_JAVA_CMD)
 endif  
-RMIC = $(RMIC_VM) $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main
+RMIC = env LD_LIBRARY_PATH=$(OUTPUTDIR)/lib/$(LIBARCH):$(OUTPUTDIR)/lib/$(LIBARCH)/jli:$(LD_LIBRARY_PATH) $(RMIC_VM) $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main
 
 $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
 	$(prep-target)
@


1.3
log
@Update to 1.7.141

* Support build and run under NetBSD PaX MPROTECT environment

Changelog:
Many bugfixes and security bugfixes
@
text
@d1 1
a1 1
$NetBSD: patch-jdk_make_com_sun_jmx_Makefile,v 1.2 2015/02/10 19:31:54 tnn Exp $
@


1.2
log
@Let the build find intermediate libs when it wants to run intermediate rmic.
@
text
@d1 1
a1 1
$NetBSD$
d6 1
a6 1
--- jdk/make/com/sun/jmx/Makefile.orig	2015-01-26 15:20:56.000000000 +0000
d17 1
a17 6
@@@@ -114,7 +114,7 @@@@ RMIC_JAVA = $(OUTPUTDIR)/bin/sparcv9/jav
 endif
 
 ifeq ($(CROSS_COMPILE_ARCH),)
-RMIC = $(RMIC_JAVA) $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main
+RMIC = env LD_LIBRARY_PATH=$(OUTPUTDIR)/lib/$(LIBARCH):$(OUTPUTDIR)/lib/$(LIBARCH)/jli:$(LD_LIBRARY_PATH) $(RMIC_JAVA) $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main
d19 1
a19 1
 RMIC = $(BOOT_JAVA_CMD)  $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main
d21 5
@


1.1
log
@Add SunOS 64-bit support.  This patch disables the default multiarch build,
creating a useable 64-bit-only package, but still leaves it possible to
re-enable it if necessary by removing the 'NOMULTIARCH' sections.
@
text
@d4 1
d6 1
a6 1
--- jdk/make/com/sun/jmx/Makefile.orig	2012-08-10 17:21:31.000000000 +0000
d17 9
@