head	1.2;
access;
symbols
	pkgsrc-2020Q1:1.1.0.36
	pkgsrc-2020Q1-base:1.1
	pkgsrc-2019Q4:1.1.0.58
	pkgsrc-2019Q4-base:1.1
	pkgsrc-2019Q3:1.1.0.54
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.52
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.50
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.48
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.46
	pkgsrc-2018Q3-base:1.1
	pkgsrc-2018Q2:1.1.0.44
	pkgsrc-2018Q2-base:1.1
	pkgsrc-2018Q1:1.1.0.42
	pkgsrc-2018Q1-base:1.1
	pkgsrc-2017Q4:1.1.0.40
	pkgsrc-2017Q4-base:1.1
	pkgsrc-2017Q3:1.1.0.38
	pkgsrc-2017Q3-base:1.1
	pkgsrc-2017Q2:1.1.0.34
	pkgsrc-2017Q2-base:1.1
	pkgsrc-2017Q1:1.1.0.32
	pkgsrc-2017Q1-base:1.1
	pkgsrc-2016Q4:1.1.0.30
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.28
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.26
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.24
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4:1.1.0.22
	pkgsrc-2015Q4-base:1.1
	pkgsrc-2015Q3:1.1.0.20
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.18
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.16
	pkgsrc-2015Q1-base:1.1
	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.2
date	2020.05.17.00.47.06;	author tnn;	state dead;
branches;
next	1.1;
commitid	by06jUrXKAUzQw8C;

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


desc
@@


1.2
log
@retire lang/openjdk7
@
text
@$NetBSD: patch-jdk_make_java_Makefile,v 1.1 2013/06/23 17:39:43 jperkin Exp $

Disable SunOS multiarch.

--- jdk/make/java/Makefile.orig	2013-06-18 11:53:51.041002241 +0000
+++ jdk/make/java/Makefile
@@@@ -48,7 +48,7 @@@@ SUBDIRS_misc       = npt java_crw_demo j
 
 
 ifeq ($(PLATFORM), solaris)
-  ifeq ($(ARCH_DATA_MODEL), 32)
+  ifneq ($(ARCH_DATA_MODEL), NOMULTIARCH64)
     SUBDIRS += jexec
   endif
 endif # PLATFORM
@


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
@d1 1
a1 1
$NetBSD$
@