head 1.8; access; symbols pkgsrc-2020Q1:1.7.0.12 pkgsrc-2020Q1-base:1.7 pkgsrc-2019Q4:1.7.0.14 pkgsrc-2019Q4-base:1.7 pkgsrc-2019Q3:1.7.0.10 pkgsrc-2019Q3-base:1.7 pkgsrc-2019Q2:1.7.0.8 pkgsrc-2019Q2-base:1.7 pkgsrc-2019Q1:1.7.0.6 pkgsrc-2019Q1-base:1.7 pkgsrc-2018Q4:1.7.0.4 pkgsrc-2018Q4-base:1.7 pkgsrc-2018Q3:1.7.0.2 pkgsrc-2018Q3-base:1.7 pkgsrc-2018Q2:1.6.0.30 pkgsrc-2018Q2-base:1.6 pkgsrc-2018Q1:1.6.0.28 pkgsrc-2018Q1-base:1.6 pkgsrc-2017Q4:1.6.0.26 pkgsrc-2017Q4-base:1.6 pkgsrc-2017Q3:1.6.0.24 pkgsrc-2017Q3-base:1.6 pkgsrc-2017Q2:1.6.0.20 pkgsrc-2017Q2-base:1.6 pkgsrc-2017Q1:1.6.0.18 pkgsrc-2017Q1-base:1.6 pkgsrc-2016Q4:1.6.0.16 pkgsrc-2016Q4-base:1.6 pkgsrc-2016Q3:1.6.0.14 pkgsrc-2016Q3-base:1.6 pkgsrc-2016Q2:1.6.0.12 pkgsrc-2016Q2-base:1.6 pkgsrc-2016Q1:1.6.0.10 pkgsrc-2016Q1-base:1.6 pkgsrc-2015Q4:1.6.0.8 pkgsrc-2015Q4-base:1.6 pkgsrc-2015Q3:1.6.0.6 pkgsrc-2015Q3-base:1.6 pkgsrc-2015Q2:1.6.0.4 pkgsrc-2015Q2-base:1.6 pkgsrc-2015Q1:1.6.0.2 pkgsrc-2015Q1-base:1.6 pkgsrc-2014Q4:1.5.0.14 pkgsrc-2014Q4-base:1.5 pkgsrc-2014Q3:1.5.0.12 pkgsrc-2014Q3-base:1.5 pkgsrc-2014Q2:1.5.0.10 pkgsrc-2014Q2-base:1.5 pkgsrc-2014Q1:1.5.0.8 pkgsrc-2014Q1-base:1.5 pkgsrc-2013Q4:1.5.0.6 pkgsrc-2013Q4-base:1.5 pkgsrc-2013Q3:1.5.0.4 pkgsrc-2013Q3-base:1.5 pkgsrc-2013Q2:1.5.0.2 pkgsrc-2013Q2-base:1.5 pkgsrc-2013Q1:1.2.0.28 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.26 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.24 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.22 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.20 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.18 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.16 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.14 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.12 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.10 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.8 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.6 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.4 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.2 pkgsrc-2009Q4-base:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.8 date 2020.05.17.00.47.06; author tnn; state dead; branches; next 1.7; commitid by06jUrXKAUzQw8C; 1.7 date 2018.09.14.15.53.46; author tnn; state Exp; branches; next 1.6; commitid NhXZQDmsbCWWu5SA; 1.6 date 2015.02.21.20.21.56; author tnn; state Exp; branches; next 1.5; commitid 83HYg20yXsZaOUay; 1.5 date 2013.06.23.17.39.43; author jperkin; state Exp; branches; next 1.4; commitid lfz1J27UHljKrLUw; 1.4 date 2013.06.15.09.31.05; author jperkin; state Exp; branches; next 1.3; commitid gr72iqj6cRdUZGTw; 1.3 date 2013.06.02.06.12.28; author ryoon; state Exp; branches; next 1.2; commitid j8SPqZax02Hdk0Sw; 1.2 date 2009.10.18.10.21.01; author tnn; state Exp; branches; next 1.1; 1.1 date 2009.10.14.11.26.15; author tnn; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2009.10.14.11.26.15; author tnn; state Exp; branches; next ; desc @@ 1.8 log @retire lang/openjdk7 @ text @$NetBSD: patch-ah,v 1.7 2018/09/14 15:53:46 tnn Exp $ DragonFly support. Disable SunOS multiarch. Add ARM support. --- jdk/make/common/shared/Platform.gmk.orig 2017-08-13 05:55:12.000000000 +0000 +++ jdk/make/common/shared/Platform.gmk @@@@ -119,7 +119,7 @@@@ ifeq ($(SYSTEM_UNAME), SunOS) ARCH := $(shell isainfo -n) # ISA_DIR is used to locate 64-bit specific libraries which are generally # in the same general place as other libraries under the ./$(ARCH) directory - ISA_DIR = /$(ARCH) + NOMULTIARCHISA_DIR = /$(ARCH) endif # Need to maintain the jre/lib/i386 location for 32-bit Intel ifeq ($(ARCH), i586) @@@@ -241,6 +241,13 @@@@ ifeq ($(SYSTEM_UNAME), Linux) MB_OF_MEMORY := $(shell free -m | fgrep Mem: | awk '{print $$2;}' ) endif +ifeq ($(SYSTEM_UNAME), DragonFly) + PLATFORM = bsd + OS_NAME = dragonfly + OS_VENDOR = DragonFlyBSD + REQUIRED_OS_VERSION = 2.4 +endif + ifeq ($(SYSTEM_UNAME), Darwin) PLATFORM = macosx OS_NAME = darwin @@@@ -340,7 +347,7 @@@@ endif ifeq ($(PLATFORM), bsd) OS_VERSION := $(shell uname -r) # Arch and OS name/version - mach := $(shell uname -m) + mach := $(shell uname -p) archExpr = case "$(mach)" in \ i[3-9]86) \ echo i586 \ @@@@ -357,6 +364,12 @@@@ ifeq ($(PLATFORM), bsd) "Power Macintosh") \ echo ppc \ ;; \ + *arm*) \ + echo arm \ + ;; \ + aarch64) \ + echo aarch64 \ + ;; \ *) \ echo $(mach) \ ;; \ @@@@ -365,7 +378,7 @@@@ ifeq ($(PLATFORM), bsd) ARCH_FAMILY := $(ARCH) # i586, sparc, and ppc are 32 bit, amd64 and sparc64 are 64 - ifneq (,$(findstring $(ARCH), i586 sparc ppc)) + ifneq (,$(findstring $(ARCH), i586 sparc ppc arm)) ARCH_DATA_MODEL=32 else ARCH_DATA_MODEL=64 @@@@ -388,9 +401,9 @@@@ ifeq ($(PLATFORM), bsd) REQUIRED_FREE_SPACE=1500000 # How much RAM does this machine have: ifeq ($(OS_VENDOR), OpenBSD) - MB_OF_MEMORY=$(shell sysctl -n hw.physmem | awk '{print int($$NF / 1048576); }' ) + MB_OF_MEMORY=$(shell /sbin/sysctl -n hw.physmem | awk '{print int($$NF / 1048576); }' ) else - MB_OF_MEMORY=$(shell (sysctl -n hw.physmem64 2> /dev/null || sysctl -n hw.physmem) | awk '{print int($$NF / 1048576); }' ) + MB_OF_MEMORY=$(shell (/sbin/sysctl -n hw.physmem64 2> /dev/null || sysctl -n hw.physmem) | awk '{print int($$NF / 1048576); }' ) endif endif @ 1.7 log @openjdk[78]: add support for NetBSD-*-aarch64 @ text @d1 1 a1 1 $NetBSD$ @ 1.6 log @Fix more ARM defines @ text @d7 1 a7 1 --- jdk/make/common/shared/Platform.gmk.orig 2015-01-26 15:20:57.000000000 +0000 d18 1 a18 1 @@@@ -224,6 +224,13 @@@@ ifeq ($(SYSTEM_UNAME), Linux) d32 10 a41 1 @@@@ -340,6 +347,9 @@@@ ifeq ($(PLATFORM), bsd) d48 3 d54 1 a54 1 @@@@ -348,7 +358,7 @@@@ ifeq ($(PLATFORM), bsd) d63 1 a63 1 @@@@ -371,9 +381,9 @@@@ ifeq ($(PLATFORM), bsd) @ 1.5 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: patch-ah,v 1.4 2013/06/15 09:31:05 jperkin Exp $ a3 1 d5 1 d7 1 a7 1 --- jdk/make/common/shared/Platform.gmk.orig 2013-06-21 13:12:13.786915027 +0000 d32 20 a51 1 @@@@ -371,9 +378,9 @@@@ ifeq ($(PLATFORM), bsd) @ 1.4 log @Add SunOS/GCC support. With huge thanks to "jesse" from #SmartOS who did the bulk of the porting work. Tested on SmartOS 32-bit. 64-bit builds currently fail, they should hopefully be fixed soon. @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.3 2013/06/02 06:12:28 ryoon Exp $ d5 3 a7 1 --- jdk/make/common/shared/Platform.gmk.orig 2013-05-29 03:57:57.000000000 +0000 d9 9 @ 1.3 log @Update to 1.7.21 (7u21) * Update with FreeBSD ports' patch-set file. * Add patches from icedtea's rhino.patch file. * Tested on NetBSD/amd64 current, NetBSD/i386 6.1, NetBSD/amd64 6.0.1, and DragonFly/i386 3.2.2. Changelog: * Unknown because I do not know previous version, 1.7.0.147.20110811. * Many bugs and security bugs should be fixed. @ text @d1 3 a3 1 $NetBSD: patch-ah,v 1.2 2009/10/18 10:21:01 tnn Exp $ @ 1.2 log @Add initial support for DragonFly/i386 2.4. (only build tested) @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- jdk/make/common/shared/Platform.gmk.orig 2009-10-17 16:49:37.000000000 +0200 d5 2 a6 2 @@@@ -218,6 +218,13 @@@@ ifeq ($(SYSTEM_UNAME), FreeBSD) REQUIRED_OS_VERSION = 6.0 d17 1 a17 1 PLATFORM = bsd d19 1 a19 1 @@@@ -288,9 +295,9 @@@@ ifeq ($(PLATFORM), bsd) @ 1.1 log @Initial revision @ text @d3 1 a3 1 --- jdk/make/common/shared/Platform.gmk.orig 2009-10-12 18:15:48.000000000 +0200 d5 15 a19 1 @@@@ -288,9 +288,9 @@@@ ifeq ($(PLATFORM), bsd) @ 1.1.1.1 log @Might as well import this now to let a wider audience experiment with it. This is openjdk 1.7.0 b72 + bsd-port. From pkgsrc-wip. @ text @@