svn commit: r506464 - in head: databases/ldb14 devel/cxxtools devel/stlink math/metis science/openkim security/matrixssl
Mark Linimon
linimon at FreeBSD.org
Fri Jul 12 15:41:40 UTC 2019
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 <bsd.port.pre.mk>
-.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 <bsd.port.options.mk>
-# 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 <bsd.port.pre.mk>
-.if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == mips64 || ${ARCH} == powerpc64 || ${ARCH} == sparc64
+.if ${ARCH:M*64*}
CFLAGS+= -DPSTM_64BIT
.endif
More information about the svn-ports-all
mailing list