Date: Mon, 7 Sep 2015 09:41:50 +0000 (UTC) From: Greg Lewis <glewis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r396257 - in head/java/openjdk8: . files Message-ID: <201509070941.t879fo8r060792@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glewis Date: Mon Sep 7 09:41:49 2015 New Revision: 396257 URL: https://svnweb.freebsd.org/changeset/ports/396257 Log: . Update to 8u60. Added: head/java/openjdk8/files/patch-8u60-b23 (contents, props changed) Modified: head/java/openjdk8/Makefile head/java/openjdk8/files/patch-bsd head/java/openjdk8/files/patch-bsd-test Modified: head/java/openjdk8/Makefile ============================================================================== --- head/java/openjdk8/Makefile Mon Sep 7 09:27:56 2015 (r396256) +++ head/java/openjdk8/Makefile Mon Sep 7 09:41:49 2015 (r396257) @@ -38,34 +38,127 @@ BUILD_DEPENDS+= ${UNZIP_CMD}:${PORTSDIR} ONLY_FOR_ARCHS= i386 amd64 WRKSRC= ${WRKDIR}/${PORTNAME} -DOS2UNIX_FILES= jdk/src/bsd/doc/man/java.1 \ +DOS2UNIX_FILES= jdk/src/bsd/doc/man/appletviewer.1 \ + jdk/src/bsd/doc/man/extcheck.1 \ + jdk/src/bsd/doc/man/idlj.1 \ + jdk/src/bsd/doc/man/jar.1 \ + jdk/src/bsd/doc/man/jarsigner.1 \ + jdk/src/bsd/doc/man/java.1 \ jdk/src/bsd/doc/man/javac.1 \ jdk/src/bsd/doc/man/javadoc.1 \ + jdk/src/bsd/doc/man/javah.1 \ jdk/src/bsd/doc/man/javap.1 \ jdk/src/bsd/doc/man/jcmd.1 \ + jdk/src/bsd/doc/man/jconsole.1 \ + jdk/src/bsd/doc/man/jdb.1 \ + jdk/src/bsd/doc/man/jdeps.1 \ + jdk/src/bsd/doc/man/jhat.1 \ + jdk/src/bsd/doc/man/jinfo.1 \ jdk/src/bsd/doc/man/jjs.1 \ + jdk/src/bsd/doc/man/jmap.1 \ + jdk/src/bsd/doc/man/jps.1 \ + jdk/src/bsd/doc/man/jrunscript.1 \ + jdk/src/bsd/doc/man/jsadebugd.1 \ + jdk/src/bsd/doc/man/jstack.1 \ jdk/src/bsd/doc/man/jstat.1 \ + jdk/src/bsd/doc/man/jstatd.1 \ jdk/src/bsd/doc/man/keytool.1 \ + jdk/src/bsd/doc/man/native2ascii.1 \ + jdk/src/bsd/doc/man/orbd.1 \ + jdk/src/bsd/doc/man/pack200.1 \ jdk/src/bsd/doc/man/policytool.1 \ + jdk/src/bsd/doc/man/rmic.1 \ + jdk/src/bsd/doc/man/rmid.1 \ + jdk/src/bsd/doc/man/rmiregistry.1 \ + jdk/src/bsd/doc/man/schemagen.1 \ + jdk/src/bsd/doc/man/serialver.1 \ + jdk/src/bsd/doc/man/servertool.1 \ + jdk/src/bsd/doc/man/tnameserv.1 \ + jdk/src/bsd/doc/man/unpack200.1 \ + jdk/src/bsd/doc/man/wsgen.1 \ + jdk/src/bsd/doc/man/wsimport.1 \ + jdk/src/bsd/doc/man/xjc.1 \ + jdk/src/linux/doc/man/appletviewer.1 \ + jdk/src/linux/doc/man/extcheck.1 \ + jdk/src/linux/doc/man/idlj.1 \ + jdk/src/linux/doc/man/jar.1 \ + jdk/src/linux/doc/man/jarsigner.1 \ jdk/src/linux/doc/man/java.1 \ jdk/src/linux/doc/man/javac.1 \ jdk/src/linux/doc/man/javadoc.1 \ + jdk/src/linux/doc/man/javah.1 \ jdk/src/linux/doc/man/javap.1 \ jdk/src/linux/doc/man/jcmd.1 \ + jdk/src/linux/doc/man/jconsole.1 \ + jdk/src/linux/doc/man/jdb.1 \ + jdk/src/linux/doc/man/jdeps.1 \ + jdk/src/linux/doc/man/jhat.1 \ + jdk/src/linux/doc/man/jinfo.1 \ jdk/src/linux/doc/man/jjs.1 \ + jdk/src/linux/doc/man/jmap.1 \ + jdk/src/linux/doc/man/jps.1 \ + jdk/src/linux/doc/man/jrunscript.1 \ + jdk/src/linux/doc/man/jsadebugd.1 \ + jdk/src/linux/doc/man/jstack.1 \ jdk/src/linux/doc/man/jstat.1 \ + jdk/src/linux/doc/man/jstatd.1 \ jdk/src/linux/doc/man/keytool.1 \ + jdk/src/linux/doc/man/native2ascii.1 \ + jdk/src/linux/doc/man/orbd.1 \ + jdk/src/linux/doc/man/pack200.1 \ jdk/src/linux/doc/man/policytool.1 \ + jdk/src/linux/doc/man/rmic.1 \ + jdk/src/linux/doc/man/rmid.1 \ + jdk/src/linux/doc/man/rmiregistry.1 \ + jdk/src/linux/doc/man/schemagen.1 \ + jdk/src/linux/doc/man/serialver.1 \ + jdk/src/linux/doc/man/servertool.1 \ + jdk/src/linux/doc/man/tnameserv.1 \ + jdk/src/linux/doc/man/unpack200.1 \ + jdk/src/linux/doc/man/wsgen.1 \ + jdk/src/linux/doc/man/wsimport.1 \ + jdk/src/linux/doc/man/xjc.1 \ jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties \ + jdk/src/solaris/doc/sun/man/man1/appletviewer.1 \ + jdk/src/solaris/doc/sun/man/man1/extcheck.1 \ + jdk/src/solaris/doc/sun/man/man1/idlj.1 \ + jdk/src/solaris/doc/sun/man/man1/jar.1 \ + jdk/src/solaris/doc/sun/man/man1/jarsigner.1 \ jdk/src/solaris/doc/sun/man/man1/java.1 \ jdk/src/solaris/doc/sun/man/man1/javac.1 \ jdk/src/solaris/doc/sun/man/man1/javadoc.1 \ + jdk/src/solaris/doc/sun/man/man1/javah.1 \ jdk/src/solaris/doc/sun/man/man1/javap.1 \ jdk/src/solaris/doc/sun/man/man1/jcmd.1 \ + jdk/src/solaris/doc/sun/man/man1/jconsole.1 \ + jdk/src/solaris/doc/sun/man/man1/jdb.1 \ + jdk/src/solaris/doc/sun/man/man1/jdeps.1 \ + jdk/src/solaris/doc/sun/man/man1/jhat.1 \ + jdk/src/solaris/doc/sun/man/man1/jinfo.1 \ jdk/src/solaris/doc/sun/man/man1/jjs.1 \ + jdk/src/solaris/doc/sun/man/man1/jmap.1 \ + jdk/src/solaris/doc/sun/man/man1/jps.1 \ + jdk/src/solaris/doc/sun/man/man1/jrunscript.1 \ + jdk/src/solaris/doc/sun/man/man1/jsadebugd.1 \ + jdk/src/solaris/doc/sun/man/man1/jstack.1 \ jdk/src/solaris/doc/sun/man/man1/jstat.1 \ + jdk/src/solaris/doc/sun/man/man1/jstatd.1 \ jdk/src/solaris/doc/sun/man/man1/keytool.1 \ + jdk/src/solaris/doc/sun/man/man1/native2ascii.1 \ + jdk/src/solaris/doc/sun/man/man1/orbd.1 \ + jdk/src/solaris/doc/sun/man/man1/pack200.1 \ jdk/src/solaris/doc/sun/man/man1/policytool.1 \ + jdk/src/solaris/doc/sun/man/man1/rmic.1 \ + jdk/src/solaris/doc/sun/man/man1/rmid.1 \ + jdk/src/solaris/doc/sun/man/man1/rmiregistry.1 \ + jdk/src/solaris/doc/sun/man/man1/schemagen.1 \ + jdk/src/solaris/doc/sun/man/man1/serialver.1 \ + jdk/src/solaris/doc/sun/man/man1/servertool.1 \ + jdk/src/solaris/doc/sun/man/man1/tnameserv.1 \ + jdk/src/solaris/doc/sun/man/man1/unpack200.1 \ + jdk/src/solaris/doc/sun/man/man1/wsgen.1 \ + jdk/src/solaris/doc/sun/man/man1/wsimport.1 \ + jdk/src/solaris/doc/sun/man/man1/xjc.1 \ nashorn/test/script/jfx.js \ nashorn/test/script/jfx/kaleidoscope.js \ nashorn/test/script/jfx/spread.js @@ -93,8 +186,8 @@ NO_CCACHE= yes NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 8 -JDK_UPDATE_VERSION= 51 -JDK_BUILD_NUMBER= 16 +JDK_UPDATE_VERSION= 60 +JDK_BUILD_NUMBER= 24 DIST_BUILD_NUMBER= 132 JTREG_VERSION= 4.1 JTREG_BUILD_NUMBER= b08 Added: head/java/openjdk8/files/patch-8u60-b23 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/openjdk8/files/patch-8u60-b23 Mon Sep 7 09:41:49 2015 (r396257) @@ -0,0 +1,280156 @@ +--- ./.hgtags Mon Jun 01 11:40:12 2015 -0700 ++++ ./.hgtags Wed Jul 01 21:51:50 2015 -0700 +@@ -354,7 +354,6 @@ + fde671d8b2537b6be61f67e583164b5b8b33ac5b jdk8u31-b13 + a198f93b1e0be5edce7a351b1399cb5c4e64c8f4 jdk8u31-b31 + 99c79d83152585991682bd86e21fdcfe6f6ab9b2 jdk8u31-b32 +-cf4ebf47413902376f66d2cddaf0282d49699ba7 jdk8u31-b33 + 0dccc4aca1859b1ff7dca9db214f7f38c4ddbbce jdk8u40-b00 + f8736a40a35df0c8055c8a94b96e5381b381ad33 jdk8u40-b01 + b6a148730f2b14193c308bc9c866c36ee6c08ed3 jdk8u40-b02 +@@ -383,8 +382,6 @@ + e26f15704e37f28acebb22378c4785891aaec637 jdk8u40-b25 + 7a552439756eaad0618ae82a94c034edb65f5d7e jdk8u40-b26 + 12deacac825756e266e91a906db9edab73c4c90b jdk8u40-b27 +-eee2ebbb97f136cd458d4f3a825ee40d0046f425 jdk8u40-b31 +-b92f3d486e47d29dfb1ea2096db295077328368e jdk8u40-b32 + ec4bcc6e4dcf190a165106627ed3eef1e7d94d0c jdk8u45-b00 + 635ba0c81b894a88ff737fefc9d7af398f761643 jdk8u45-b01 + 801c65bb74b770600a2d48189764e416e5cfe265 jdk8u45-b02 +@@ -400,22 +397,26 @@ + 54709b761404dd3bc1b58acf5582fa9bd70ff59a jdk8u45-b12 + 6b2f1bf5c72873d01b37103fc20ac7a63e7881dd jdk8u45-b13 + 15b679d327da9ee99c05d7ddd75512ce335d5994 jdk8u45-b14 +-438cc91b51330a61a790f0a0ac64816b565d25f0 jdk8u45-b15 +-5a4ccc33ab26b635f91ddd424742b0009a37bcc0 jdk8u45-b31 +-4597cb5171773416c4b2e1843db8592a69ff7a99 jdk8u45-b32 +-a1682688c9aec33c172146ce4be8d3969e7d76bb jdk8u51-b00 +-e04f2ee2d03d9927d2012286a9bcbf511eb887ae jdk8u51-b01 +-4dee64570ad013eb5e1cb16304f9eff558c1c5e9 jdk8u51-b02 +-df8e9cbe5a8a7ce9cf2e0a78910302d08e2dbb53 jdk8u51-b03 +-1d29a8f9bd262c4f3556e0250db80d8dc64d95d3 jdk8u51-b04 +-046d1cfaedc892bfd49570d42dd655338278d476 jdk8u51-b05 +-7875bd6e35fb6af4b150dda213d7812bdb9fcba1 jdk8u51-b06 +-2c7a34442763e809d2cf1459d5b8d6d5528f6494 jdk8u51-b07 +-a96b442d99131e87c7c974a0fa277a5f971732c6 jdk8u51-b08 +-3a95f1e13da9720a6243c0bd41688544b037e182 jdk8u51-b09 +-d99f3f935397fdc65dcb776a97110e8ff5cc519c jdk8u51-b10 +-29612174658436601ba833993227ae96117f632c jdk8u51-b11 +-f07a9ef02d513435e19fd70abcce2871d1c91342 jdk8u51-b12 +-6ef21f3e0946aaab8dc1f4e9cad21dacb97c4f8c jdk8u51-b13 +-5a2078b398485d21fa6577cf9481aa488d2e28d0 jdk8u51-b14 +-54b6481aa9e2f39699a96a4572b825b6d81f434f jdk8u51-b15 ++ae4980d195b64eec58884b233d7efd312205bac8 jdk8u60-b00 ++acf81f6fb265c1564b16fd8202a324a9022e204b jdk8u60-b01 ++2ca2e2430370d441cbe7999b76b57cadf0060327 jdk8u60-b02 ++590cc3ca1fec083de3543b18b0062651b597e376 jdk8u60-b03 ++d8d408861c2094c24e9757a67bf2941ed37ce01f jdk8u60-b04 ++e532f3672f635bd83c673c349b7563db6dd470bb jdk8u60-b05 ++74dbdbcb6aac9fd62f3599ad4e0a1f930b1e9ac1 jdk8u60-b06 ++ea714a39e902fb8729f71f2d0f634855646e297d jdk8u60-b07 ++0785e45b19c864264f2054a8130c49fe6f70925c jdk8u60-b08 ++da6d0717c74a1e2ae4498bf4dc230e20686517ed jdk8u60-b09 ++39cd90aa447ae87ed3b2968dcf1a90d08fff964d jdk8u60-b10 ++db15b96c78126b2c8a8e19dcc65cdd0b246bd12b jdk8u60-b11 ++ba0772198525025803b0fddd6a628fc2416b3b85 jdk8u60-b12 ++6ff963c0dd414da5973a00c59b9ce7feb327a8ed jdk8u60-b13 ++455a74ebdf59e91116e58d1545b15fd143624e36 jdk8u60-b14 ++7ed130e10665ae5bed82aa8c4cdc18373292a6d7 jdk8u60-b15 ++08a417ec9b3eea2f02eb02c7b7635f9701813f65 jdk8u60-b16 ++ec24cc303a2cfeb10ff0a5fb7b3d49ef47bb66f7 jdk8u60-b17 ++d1d9eb953fbbe1f63a6badb0742508ae5f0d3ab5 jdk8u60-b18 ++ff2ddaa4ea3292e2f0931a9a0c3feb33288d7d7f jdk8u60-b19 ++c641f979dff0d28dcdc4f303e9d93dda3079a456 jdk8u60-b20 ++99d323d5830fad8551038da15113639d8518a8e6 jdk8u60-b21 ++01bb22b4ebb6348efa14726ba139858d6defefcd jdk8u60-b22 +--- ./THIRD_PARTY_README Mon Jun 01 11:40:12 2015 -0700 ++++ ./THIRD_PARTY_README Wed Jul 01 21:51:50 2015 -0700 +@@ -1140,37 +1140,6 @@ + + -------------------------------------------------------------------------------- + +-%% This notice is provided with respect to JSON, which may be included +-with JRE 8 & JDK 8. +- +---- begin of LICENSE --- +- +-Copyright (c) 2002 JSON.org +- +-Permission is hereby granted, free of charge, to any person obtaining a copy +-of this software and associated documentation files (the "Software"), to deal +-in the Software without restriction, including without limitation the rights +-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +-copies of the Software, and to permit persons to whom the Software is +-furnished to do so, subject to the following conditions: +- +-The above copyright notice and this permission notice shall be included in all +-copies or substantial portions of the Software. +- +-The Software shall be used for Good, not Evil. +- +-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +-SOFTWARE. +- +---- end of LICENSE --- +- +-------------------------------------------------------------------------------- +- + %% This notice is provided with respect to Kerberos functionality, which + which may be included with JRE 8, JDK 8, and OpenJDK 8. + +@@ -1250,7 +1219,7 @@ + + ------------------------------------------------------------------------------- + +-%% This notice is provided with respect to libpng 1.6.16, which may be ++%% This notice is provided with respect to libpng 1.6.16, which may be + included with JRE 8, JDK 8, and OpenJDK 8. + + --- begin of LICENSE --- +@@ -1370,7 +1339,7 @@ + + ------------------------------------------------------------------------------- + +-%% This notice is provided with respect to libungif 4.1.3, which may be ++%% This notice is provided with respect to GIFLIB 5.1.1 & libungif 4.1.3, which may be + included with JRE 8, JDK 8, and OpenJDK 8. + + --- begin of LICENSE --- +@@ -1399,13 +1368,13 @@ + + ------------------------------------------------------------------------------- + +-%% This notice is provided with respect to Little CMS 2.5, which may be ++%% This notice is provided with respect to Little CMS 2.7, which may be + included with JRE 8, JDK 8, and OpenJDK 8. + + --- begin of LICENSE --- + + Little CMS +-Copyright (c) 1998-2011 Marti Maria Saguer ++Copyright (c) 1998-2015 Marti Maria Saguer + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal +--- ./common/autoconf/basics.m4 Mon Jun 01 11:40:12 2015 -0700 ++++ ./common/autoconf/basics.m4 Wed Jul 01 21:51:50 2015 -0700 +@@ -1,5 +1,5 @@ + # +-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. ++# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. + # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + # + # This code is free software; you can redistribute it and/or modify it +@@ -386,6 +386,12 @@ + [TOOLS_DIR=$with_tools_dir] + ) + ++ # Xcode version will be validated later ++ AC_ARG_WITH([xcode-path], [AS_HELP_STRING([--with-xcode-path], ++ [explicit path to Xcode 4 (generally for building on 10.9 and later)])], ++ [XCODE_PATH=$with_xcode_path] ++ ) ++ + AC_ARG_WITH([devkit], [AS_HELP_STRING([--with-devkit], + [use this directory as base for tools-dir and sys-root (for cross-compiling)])], + [ +@@ -634,10 +640,6 @@ + # We can build without it. + LDD="true" + fi +- AC_PATH_PROG(OTOOL, otool) +- if test "x$OTOOL" = "x"; then +- OTOOL="true" +- fi + AC_PATH_PROGS(READELF, [readelf greadelf]) + AC_PATH_PROG(HG, hg) + AC_PATH_PROG(STAT, stat) +--- ./common/autoconf/basics_windows.m4 Mon Jun 01 11:40:12 2015 -0700 ++++ ./common/autoconf/basics_windows.m4 Wed Jul 01 21:51:50 2015 -0700 +@@ -312,8 +312,8 @@ + WINDOWS_ENV_VENDOR='cygwin' + WINDOWS_ENV_VERSION="$CYGWIN_VERSION" + +- CYGWIN_VERSION_OK=`$ECHO $CYGWIN_VERSION | $GREP ^1.7.` +- if test "x$CYGWIN_VERSION_OK" = x; then ++ CYGWIN_VERSION_OLD=`$ECHO $CYGWIN_VERSION | $GREP -e '^1\.[0-6]'` ++ if test "x$CYGWIN_VERSION_OLD" != x; then + AC_MSG_NOTICE([Your cygwin is too old. You are running $CYGWIN_VERSION, but at least cygwin 1.7 is required. Please upgrade.]) + AC_MSG_ERROR([Cannot continue]) + fi +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ ./common/autoconf/build-aux/autoconf-config.sub Wed Jul 01 21:51:50 2015 -0700 +@@ -0,0 +1,1684 @@ ++#! /bin/sh ++ ++# ++# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. ++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++# ++# This code is free software; you can redistribute it and/or modify it ++# under the terms of the GNU General Public License version 2 only, as ++# published by the Free Software Foundation. Oracle designates this ++# particular file as subject to the "Classpath" exception as provided ++# by Oracle in the LICENSE file that accompanied this code. ++# ++# This code is distributed in the hope that it will be useful, but WITHOUT ++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++# version 2 for more details (a copy is included in the LICENSE file that ++# accompanied this code). ++# ++# You should have received a copy of the GNU General Public License version ++# 2 along with this work; if not, write to the Free Software Foundation, ++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++# ++# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++# or visit www.oracle.com if you need additional information or have any ++# questions. ++# ++ ++# Configuration validation subroutine script. ++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ++# Free Software Foundation, Inc. ++ ++timestamp='2008-01-16' ++ ++# This file is (in principle) common to ALL GNU software. ++# The presence of a machine in this file suggests that SOME GNU software ++# can handle that machine. It does not imply ALL GNU software can. ++# ++# This file is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA ++# 02110-1301, USA. ++# ++# As a special exception to the GNU General Public License, if you ++# distribute this file as part of a program that contains a ++# configuration script generated by Autoconf, you may include it under ++# the same distribution terms that you use for the rest of that program. ++ ++ ++# Please send patches to <config-patches@gnu.org>. Submit a context ++# diff and a properly formatted ChangeLog entry. ++# ++# Configuration subroutine to validate and canonicalize a configuration type. ++# Supply the specified configuration type as an argument. ++# If it is invalid, we print an error message on stderr and exit with code 1. ++# Otherwise, we print the canonical config type on stdout and succeed. ++ ++# This file is supposed to be the same for all GNU packages ++# and recognize all the CPU types, system types and aliases ++# that are meaningful with *any* GNU software. ++# Each package is responsible for reporting which valid configurations ++# it does not support. The user should be able to distinguish ++# a failure to support a valid configuration from a meaningless ++# configuration. ++ ++# The goal of this file is to map all the various variations of a given ++# machine specification into a single specification in the form: ++# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM ++# or in some cases, the newer four-part form: ++# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM ++# It is wrong to echo any other type of specification. ++ ++me=`echo "$0" | sed -e 's,.*/,,'` ++ ++usage="\ ++Usage: $0 [OPTION] CPU-MFR-OPSYS ++ $0 [OPTION] ALIAS ++ ++Canonicalize a configuration name. ++ ++Operation modes: ++ -h, --help print this help, then exit ++ -t, --time-stamp print date of last modification, then exit ++ -v, --version print version number, then exit ++ ++Report bugs and patches to <config-patches@gnu.org>." ++ ++version="\ ++GNU config.sub ($timestamp) ++ ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, ++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++ ++This is free software; see the source for copying conditions. There is NO ++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." ++ ++help=" ++Try \`$me --help' for more information." ++ ++# Parse command line ++while test $# -gt 0 ; do ++ case $1 in ++ --time-stamp | --time* | -t ) ++ echo "$timestamp" ; exit ;; ++ --version | -v ) ++ echo "$version" ; exit ;; ++ --help | --h* | -h ) ++ echo "$usage"; exit ;; ++ -- ) # Stop option processing ++ shift; break ;; ++ - ) # Use stdin as input. ++ break ;; ++ -* ) ++ echo "$me: invalid option $1$help" ++ exit 1 ;; ++ ++ *local*) ++ # First pass through any local machine types. ++ echo $1 ++ exit ;; ++ ++ * ) ++ break ;; ++ esac ++done ++ ++case $# in ++ 0) echo "$me: missing argument$help" >&2 ++ exit 1;; ++ 1) ;; ++ *) echo "$me: too many arguments$help" >&2 ++ exit 1;; ++esac ++ ++# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). ++# Here we must recognize all the valid KERNEL-OS combinations. ++maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` ++case $maybe_os in ++ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ ++ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ ++ storm-chaos* | os2-emx* | rtmk-nova*) ++ os=-$maybe_os ++ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ++ ;; ++ *) ++ basic_machine=`echo $1 | sed 's/-[^-]*$//'` ++ if [ $basic_machine != $1 ] ++ then os=`echo $1 | sed 's/.*-/-/'` ++ else os=; fi ++ ;; ++esac ++ ++### Let's recognize common machines as not being operating systems so ++### that things like config.sub decstation-3100 work. We also ++### recognize some manufacturers as not being operating systems, so we ++### can provide default operating systems below. ++case $os in ++ -sun*os*) ++ # Prevent following clause from handling this invalid input. ++ ;; ++ -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ ++ -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ ++ -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ ++ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ ++ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ ++ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ ++ -apple | -axis | -knuth | -cray) ++ os= ++ basic_machine=$1 ++ ;; ++ -sim | -cisco | -oki | -wec | -winbond) ++ os= ++ basic_machine=$1 ++ ;; ++ -scout) ++ ;; ++ -wrs) ++ os=-vxworks ++ basic_machine=$1 ++ ;; ++ -chorusos*) ++ os=-chorusos ++ basic_machine=$1 ++ ;; ++ -chorusrdb) ++ os=-chorusrdb ++ basic_machine=$1 ++ ;; ++ -hiux*) ++ os=-hiuxwe2 ++ ;; ++ -sco6) ++ os=-sco5v6 ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -sco5) ++ os=-sco3.2v5 ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -sco4) ++ os=-sco3.2v4 ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -sco3.2.[4-9]*) ++ os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -sco3.2v[4-9]*) ++ # Don't forget version if it is 3.2v4 or newer. ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -sco5v6*) ++ # Don't forget version if it is 3.2v4 or newer. ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -sco*) ++ os=-sco3.2v2 ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -udk*) ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -isc) ++ os=-isc2.2 ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -clix*) ++ basic_machine=clipper-intergraph ++ ;; ++ -isc*) ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -lynx*) ++ os=-lynxos ++ ;; ++ -ptx*) ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` ++ ;; ++ -windowsnt*) ++ os=`echo $os | sed -e 's/windowsnt/winnt/'` ++ ;; ++ -psos*) ++ os=-psos ++ ;; ++ -mint | -mint[0-9]*) ++ basic_machine=m68k-atari ++ os=-mint ++ ;; ++esac ++ ++# Decode aliases for certain CPU-COMPANY combinations. ++case $basic_machine in ++ # Recognize the basic CPU types without company name. ++ # Some are omitted here because they have special meanings below. ++ 1750a | 580 \ ++ | a29k \ ++ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ ++ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ ++ | am33_2.0 \ ++ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ ++ | bfin \ ++ | c4x | clipper \ ++ | d10v | d30v | dlx | dsp16xx \ ++ | fido | fr30 | frv \ ++ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ ++ | i370 | i860 | i960 | ia64 \ ++ | ip2k | iq2000 \ ++ | m32c | m32r | m32rle | m68000 | m68k | m88k \ ++ | maxq | mb | microblaze | mcore | mep \ ++ | mips | mipsbe | mipseb | mipsel | mipsle \ ++ | mips16 \ ++ | mips64 | mips64el \ ++ | mips64vr | mips64vrel \ ++ | mips64orion | mips64orionel \ ++ | mips64vr4100 | mips64vr4100el \ ++ | mips64vr4300 | mips64vr4300el \ ++ | mips64vr5000 | mips64vr5000el \ ++ | mips64vr5900 | mips64vr5900el \ ++ | mipsisa32 | mipsisa32el \ ++ | mipsisa32r2 | mipsisa32r2el \ ++ | mipsisa64 | mipsisa64el \ ++ | mipsisa64r2 | mipsisa64r2el \ ++ | mipsisa64sb1 | mipsisa64sb1el \ ++ | mipsisa64sr71k | mipsisa64sr71kel \ ++ | mipstx39 | mipstx39el \ ++ | mn10200 | mn10300 \ ++ | mt \ ++ | msp430 \ ++ | nios | nios2 \ ++ | ns16k | ns32k \ ++ | or32 \ ++ | pdp10 | pdp11 | pj | pjl \ ++ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ ++ | pyramid \ ++ | score \ ++ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ ++ | sh64 | sh64le \ ++ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ ++ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ ++ | spu | strongarm \ ++ | tahoe | thumb | tic4x | tic80 | tron \ ++ | v850 | v850e \ ++ | we32k \ ++ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ ++ | z8k) ++ basic_machine=$basic_machine-unknown ++ ;; ++ m6811 | m68hc11 | m6812 | m68hc12) ++ # Motorola 68HC11/12. ++ basic_machine=$basic_machine-unknown ++ os=-none ++ ;; ++ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ++ ;; ++ ms1) ++ basic_machine=mt-unknown ++ ;; ++ ++ # We use `pc' rather than `unknown' ++ # because (1) that's what they normally are, and ++ # (2) the word "unknown" tends to confuse beginning users. ++ i*86 | x86_64) ++ basic_machine=$basic_machine-pc ++ ;; ++ # Object if more than one company name word. ++ *-*-*) ++ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 ++ exit 1 ++ ;; ++ # Recognize the basic CPU types with company name. ++ 580-* \ ++ | a29k-* \ ++ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ ++ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ ++ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ ++ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ ++ | avr-* | avr32-* \ ++ | bfin-* | bs2000-* \ ++ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ ++ | clipper-* | craynv-* | cydra-* \ ++ | d10v-* | d30v-* | dlx-* \ ++ | elxsi-* \ ++ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ ++ | h8300-* | h8500-* \ ++ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ ++ | i*86-* | i860-* | i960-* | ia64-* \ ++ | ip2k-* | iq2000-* \ ++ | m32c-* | m32r-* | m32rle-* \ ++ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ ++ | m88110-* | m88k-* | maxq-* | mcore-* \ ++ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ ++ | mips16-* \ ++ | mips64-* | mips64el-* \ ++ | mips64vr-* | mips64vrel-* \ ++ | mips64orion-* | mips64orionel-* \ ++ | mips64vr4100-* | mips64vr4100el-* \ ++ | mips64vr4300-* | mips64vr4300el-* \ ++ | mips64vr5000-* | mips64vr5000el-* \ ++ | mips64vr5900-* | mips64vr5900el-* \ ++ | mipsisa32-* | mipsisa32el-* \ ++ | mipsisa32r2-* | mipsisa32r2el-* \ ++ | mipsisa64-* | mipsisa64el-* \ ++ | mipsisa64r2-* | mipsisa64r2el-* \ ++ | mipsisa64sb1-* | mipsisa64sb1el-* \ ++ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ ++ | mipstx39-* | mipstx39el-* \ ++ | mmix-* \ ++ | mt-* \ ++ | msp430-* \ ++ | nios-* | nios2-* \ ++ | none-* | np1-* | ns16k-* | ns32k-* \ ++ | orion-* \ ++ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ ++ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ ++ | pyramid-* \ ++ | romp-* | rs6000-* \ ++ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ ++ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ ++ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ ++ | sparclite-* \ ++ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ ++ | tahoe-* | thumb-* \ ++ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ ++ | tron-* \ ++ | v850-* | v850e-* | vax-* \ ++ | we32k-* \ ++ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ ++ | xstormy16-* | xtensa*-* \ ++ | ymp-* \ ++ | z8k-*) ++ ;; ++ # Recognize the basic CPU types without company name, with glob match. ++ xtensa*) ++ basic_machine=$basic_machine-unknown ++ ;; ++ # Recognize the various machine names and aliases which stand ++ # for a CPU type and a company and sometimes even an OS. ++ 386bsd) ++ basic_machine=i386-unknown ++ os=-bsd ++ ;; ++ 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) ++ basic_machine=m68000-att ++ ;; ++ 3b*) ++ basic_machine=we32k-att ++ ;; ++ a29khif) ++ basic_machine=a29k-amd ++ os=-udi ++ ;; ++ abacus) ++ basic_machine=abacus-unknown ++ ;; ++ adobe68k) ++ basic_machine=m68010-adobe ++ os=-scout ++ ;; ++ alliant | fx80) ++ basic_machine=fx80-alliant ++ ;; ++ altos | altos3068) ++ basic_machine=m68k-altos ++ ;; ++ am29k) ++ basic_machine=a29k-none ++ os=-bsd ++ ;; ++ amd64) ++ basic_machine=x86_64-pc ++ ;; ++ amd64-*) ++ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ amdahl) ++ basic_machine=580-amdahl ++ os=-sysv ++ ;; ++ amiga | amiga-*) ++ basic_machine=m68k-unknown ++ ;; ++ amigaos | amigados) ++ basic_machine=m68k-unknown ++ os=-amigaos ++ ;; ++ amigaunix | amix) ++ basic_machine=m68k-unknown ++ os=-sysv4 ++ ;; ++ apollo68) ++ basic_machine=m68k-apollo ++ os=-sysv ++ ;; ++ apollo68bsd) ++ basic_machine=m68k-apollo ++ os=-bsd ++ ;; ++ aux) ++ basic_machine=m68k-apple ++ os=-aux ++ ;; ++ balance) ++ basic_machine=ns32k-sequent ++ os=-dynix ++ ;; ++ blackfin) ++ basic_machine=bfin-unknown ++ os=-linux ++ ;; ++ blackfin-*) ++ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; ++ c90) ++ basic_machine=c90-cray ++ os=-unicos ++ ;; ++ convex-c1) ++ basic_machine=c1-convex ++ os=-bsd ++ ;; ++ convex-c2) ++ basic_machine=c2-convex ++ os=-bsd ++ ;; ++ convex-c32) ++ basic_machine=c32-convex ++ os=-bsd ++ ;; ++ convex-c34) ++ basic_machine=c34-convex ++ os=-bsd ++ ;; ++ convex-c38) ++ basic_machine=c38-convex ++ os=-bsd ++ ;; ++ cray | j90) ++ basic_machine=j90-cray ++ os=-unicos ++ ;; ++ craynv) ++ basic_machine=craynv-cray ++ os=-unicosmp ++ ;; ++ cr16) ++ basic_machine=cr16-unknown ++ os=-elf ++ ;; ++ crds | unos) ++ basic_machine=m68k-crds ++ ;; ++ crisv32 | crisv32-* | etraxfs*) ++ basic_machine=crisv32-axis ++ ;; ++ cris | cris-* | etrax*) ++ basic_machine=cris-axis ++ ;; ++ crx) ++ basic_machine=crx-unknown ++ os=-elf ++ ;; ++ da30 | da30-*) ++ basic_machine=m68k-da30 ++ ;; ++ decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) ++ basic_machine=mips-dec ++ ;; ++ decsystem10* | dec10*) ++ basic_machine=pdp10-dec ++ os=-tops10 ++ ;; ++ decsystem20* | dec20*) ++ basic_machine=pdp10-dec ++ os=-tops20 ++ ;; ++ delta | 3300 | motorola-3300 | motorola-delta \ ++ | 3300-motorola | delta-motorola) ++ basic_machine=m68k-motorola ++ ;; ++ delta88) ++ basic_machine=m88k-motorola ++ os=-sysv3 ++ ;; ++ djgpp) ++ basic_machine=i586-pc ++ os=-msdosdjgpp ++ ;; ++ dpx20 | dpx20-*) ++ basic_machine=rs6000-bull ++ os=-bosx ++ ;; ++ dpx2* | dpx2*-bull) ++ basic_machine=m68k-bull ++ os=-sysv3 ++ ;; ++ ebmon29k) ++ basic_machine=a29k-amd ++ os=-ebmon ++ ;; ++ elxsi) ++ basic_machine=elxsi-elxsi ++ os=-bsd ++ ;; ++ encore | umax | mmax) ++ basic_machine=ns32k-encore ++ ;; ++ es1800 | OSE68k | ose68k | ose | OSE) ++ basic_machine=m68k-ericsson ++ os=-ose ++ ;; ++ fx2800) ++ basic_machine=i860-alliant ++ ;; ++ genix) ++ basic_machine=ns32k-ns ++ ;; ++ gmicro) ++ basic_machine=tron-gmicro ++ os=-sysv ++ ;; ++ go32) ++ basic_machine=i386-pc ++ os=-go32 ++ ;; ++ h3050r* | hiux*) ++ basic_machine=hppa1.1-hitachi ++ os=-hiuxwe2 ++ ;; ++ h8300hms) ++ basic_machine=h8300-hitachi ++ os=-hms ++ ;; ++ h8300xray) ++ basic_machine=h8300-hitachi ++ os=-xray ++ ;; ++ h8500hms) ++ basic_machine=h8500-hitachi ++ os=-hms ++ ;; ++ harris) ++ basic_machine=m88k-harris ++ os=-sysv3 ++ ;; ++ hp300-*) ++ basic_machine=m68k-hp ++ ;; ++ hp300bsd) ++ basic_machine=m68k-hp ++ os=-bsd ++ ;; ++ hp300hpux) ++ basic_machine=m68k-hp ++ os=-hpux ++ ;; ++ hp3k9[0-9][0-9] | hp9[0-9][0-9]) ++ basic_machine=hppa1.0-hp ++ ;; ++ hp9k2[0-9][0-9] | hp9k31[0-9]) ++ basic_machine=m68000-hp ++ ;; ++ hp9k3[2-9][0-9]) ++ basic_machine=m68k-hp ++ ;; ++ hp9k6[0-9][0-9] | hp6[0-9][0-9]) ++ basic_machine=hppa1.0-hp ++ ;; ++ hp9k7[0-79][0-9] | hp7[0-79][0-9]) ++ basic_machine=hppa1.1-hp ++ ;; ++ hp9k78[0-9] | hp78[0-9]) ++ # FIXME: really hppa2.0-hp ++ basic_machine=hppa1.1-hp ++ ;; ++ hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) ++ # FIXME: really hppa2.0-hp ++ basic_machine=hppa1.1-hp ++ ;; ++ hp9k8[0-9][13679] | hp8[0-9][13679]) ++ basic_machine=hppa1.1-hp ++ ;; ++ hp9k8[0-9][0-9] | hp8[0-9][0-9]) ++ basic_machine=hppa1.0-hp ++ ;; ++ hppa-next) ++ os=-nextstep3 ++ ;; ++ hppaosf) ++ basic_machine=hppa1.1-hp ++ os=-osf ++ ;; ++ hppro) ++ basic_machine=hppa1.1-hp ++ os=-proelf ++ ;; ++ i370-ibm* | ibm*) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509070941.t879fo8r060792>