From owner-svn-ports-head@freebsd.org Fri Jul 12 15:41:39 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CFACB15CDAB1; Fri, 12 Jul 2019 15:41:39 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 562B0756C4; Fri, 12 Jul 2019 15:41:39 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 327B8187FB; Fri, 12 Jul 2019 15:41:39 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x6CFfdpA046506; Fri, 12 Jul 2019 15:41:39 GMT (envelope-from linimon@FreeBSD.org) Received: (from linimon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6CFfc4R046500; Fri, 12 Jul 2019 15:41:38 GMT (envelope-from linimon@FreeBSD.org) Message-Id: <201907121541.x6CFfc4R046500@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: linimon set sender to linimon@FreeBSD.org using -f From: Mark Linimon Date: Fri, 12 Jul 2019 15:41:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r506464 - in head: databases/ldb14 devel/cxxtools devel/stlink math/metis science/openkim security/matrixssl X-SVN-Group: ports-head X-SVN-Commit-Author: linimon X-SVN-Commit-Paths: in head: databases/ldb14 devel/cxxtools devel/stlink math/metis science/openkim security/matrixssl X-SVN-Commit-Revision: 506464 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 562B0756C4 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.93 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.93)[-0.933,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Jul 2019 15:41:40 -0000 Author: linimon Date: Fri Jul 12 15:41:37 2019 New Revision: 506464 URL: https://svnweb.freebsd.org/changeset/ports/506464 Log: Simplify architecture tests for 64-bit. Listing each ARCH is fragile; e.g., misses some 64-bit mips variants. While here, further collapse tests for multiple variants of arm, mips, powerpc. Approved by: portmgr (tier-2 blanket) Modified: head/databases/ldb14/Makefile head/devel/cxxtools/Makefile head/devel/stlink/Makefile head/math/metis/Makefile head/science/openkim/Makefile head/security/matrixssl/Makefile Modified: head/databases/ldb14/Makefile ============================================================================== --- head/databases/ldb14/Makefile Fri Jul 12 15:39:25 2019 (r506463) +++ head/databases/ldb14/Makefile Fri Jul 12 15:41:37 2019 (r506464) @@ -78,7 +78,7 @@ LDB_LIBS= lib/libldb.so \ lib/shared-modules/ldb/tdb.so # Only for 64-bit architectures -.if ${ARCH} != armv6 && ${ARCH} != armv7 && ${ARCH} != i386 && ${ARCH} != mips && ${ARCH} != powerpc && ${ARCH} != powerpcspe +.if ${ARCH:M*64*} LDB_DEPENDS+= lmdb>=0.9.16:databases/lmdb LDB_LIBS+= lib/ldb/libldb-mdb-int.so \ lib/shared-modules/ldb/mdb.so @@ -148,7 +148,6 @@ CFLAGS+= -fno-color-diagnostics .endif CONFIGURE_ENV+= NOCOLOR=yes MAKE_ENV+= NOCOLOR=yes - LDB_MAN1= man/man1/ldbadd.1.gz \ man/man1/ldbdel.1.gz \ Modified: head/devel/cxxtools/Makefile ============================================================================== --- head/devel/cxxtools/Makefile Fri Jul 12 15:39:25 2019 (r506463) +++ head/devel/cxxtools/Makefile Fri Jul 12 15:41:37 2019 (r506464) @@ -45,19 +45,19 @@ PLIST_SUB+= X86_ONLY="" PLIST_SUB+= X86_ONLY="@comment " .endif -.if ${ARCH} == arm || ${ARCH} == armv6 || ${ARCH} == armv7 +.if ${ARCH} == aarch64 || ${ARCH:Marm*} PLIST_SUB+= ARM_ONLY="" .else PLIST_SUB+= ARM_ONLY="@comment " .endif -.if ${ARCH} == mips || ${ARCH} == mips64 +.if ${ARCH:Mmips*} PLIST_SUB+= MIPS_ONLY="" .else PLIST_SUB+= MIPS_ONLY="@comment " .endif -.if ${ARCH} == powerpc || ${ARCH} == powerpc64 +.if ${ARCH:Mpowerpc*} PLIST_SUB+= PPC_ONLY="" .else PLIST_SUB+= PPC_ONLY="@comment " Modified: head/devel/stlink/Makefile ============================================================================== --- head/devel/stlink/Makefile Fri Jul 12 15:39:25 2019 (r506463) +++ head/devel/stlink/Makefile Fri Jul 12 15:41:37 2019 (r506464) @@ -25,7 +25,7 @@ PORTDOCS= README.md tested-boards.md tutorial.md .include -.if ${ARCH} == "i386" || ${ARCH} == "powerpc" || ${ARCH} == "arm" || ${ARCH} == "armv6" || ${ARCH} == "mips" +.if ! ${ARCH:M*64*} EXTRA_PATCHES+= ${FILESDIR}/extra-pacth-32bit .endif Modified: head/math/metis/Makefile ============================================================================== --- head/math/metis/Makefile Fri Jul 12 15:39:25 2019 (r506463) +++ head/math/metis/Makefile Fri Jul 12 15:41:37 2019 (r506464) @@ -67,7 +67,7 @@ pre-configure: ${WRKSRC}/GKlib/GKlibSystem.cmake @${REINPLACE_CMD} -e "\|/home/karypis/|d" \ ${WRKSRC}/programs/CMakeLists.txt -.if ((${ARCH}=="amd64") || (${ARCH}=="aarch64") || (${ARCH}=="sparc64") || (${ARCH}=="powerpc64")) +.if ${ARCH:M*64*} @${REINPLACE_CMD}-e \ 's|IDXTYPEWIDTH 32|IDXTYPEWIDTH 64|' \ ${WRKSRC}/include/metis.h Modified: head/science/openkim/Makefile ============================================================================== --- head/science/openkim/Makefile Fri Jul 12 15:39:25 2019 (r506463) +++ head/science/openkim/Makefile Fri Jul 12 15:41:37 2019 (r506464) @@ -20,8 +20,8 @@ MAKE_JOBS_UNSAFE=yes .include -# Is there a better way to detect 32-bit systems? -.if ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == i386 || ${ARCH} == mips || ${ARCH} == powerpc +# determine if we are on a 32-bit arch +.if ! ${ARCH:M*64*} MAKE_ENV+= KIM_SYSTEM32="yes" .endif Modified: head/security/matrixssl/Makefile ============================================================================== --- head/security/matrixssl/Makefile Fri Jul 12 15:39:25 2019 (r506463) +++ head/security/matrixssl/Makefile Fri Jul 12 15:41:37 2019 (r506464) @@ -24,7 +24,7 @@ OPTIONS_DEFINE= DOCS EXAMPLES .include -.if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == mips64 || ${ARCH} == powerpc64 || ${ARCH} == sparc64 +.if ${ARCH:M*64*} CFLAGS+= -DPSTM_64BIT .endif