Index: head/math/libpgmath/Makefile =================================================================== --- head/math/libpgmath/Makefile (revision 515073) +++ head/math/libpgmath/Makefile (revision 515074) @@ -1,38 +1,39 @@ # Created by: Johannes M Dieterich # $FreeBSD$ PORTNAME= libpgmath DISTVERSION= g20191020 +PORTREVISION= 1 CATEGORIES= math MAINTAINER= jmd@FreeBSD.org COMMENT= Compiler-callable math intrinsics library LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt ONLY_FOR_ARCHS= amd64 LLVM_VER= 70 BUILD_DEPENDS= llvm${LLVM_VER}>=0:devel/llvm${LLVM_VER} RUN_DEPENDS= llvm${LLVM_VER}>=0:devel/llvm${LLVM_VER} USES= cmake USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= flang-compiler GH_PROJECT= flang GH_TAGNAME= d07daf3 CC= ${LOCALBASE}/llvm${LLVM_VER}/bin/clang CXX= ${LOCALBASE}/llvm${LLVM_VER}/bin/clang++ CMAKE_ARGS+= -DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config${LLVM_VER} -DLIBPGMATH_LLVM_LIT_EXECUTABLE=${LOCALBASE}/llvm${LLVM_VER}/bin/llvm-lit WRKSRC_SUBDIR= runtime/libpgmath PLIST_FILES= lib/libpgmath.a \ lib/libpgmath.so .include Index: head/math/libpgmath/files/patch-lib_CMakeLists.txt =================================================================== --- head/math/libpgmath/files/patch-lib_CMakeLists.txt (revision 515073) +++ head/math/libpgmath/files/patch-lib_CMakeLists.txt (revision 515074) @@ -1,25 +1,30 @@ ---- lib/CMakeLists.txt.orig 2019-10-20 13:54:36 UTC +--- lib/CMakeLists.txt.orig 2019-10-09 20:28:35 UTC +++ lib/CMakeLists.txt @@ -15,6 +15,11 @@ # # This value will be the same as LIBPGMATH_SYSTEM_PROCESSOR + +if ("${LIBPGMATH_SYSTEM_PROCESSOR}" STREQUAL "amd64") + set(LIBPGMATH_SYSTEM_PROCESSOR "x86_64") +endif () + set(PROCESSOR ${LIBPGMATH_SYSTEM_PROCESSOR}) if(${LIBPGMATH_WITH_GENERIC} OR (NOT ${LIBPGMATH_SYSTEM_PROCESSOR} MATCHES "x86_64|aarch64")) set(PROCESSOR "generic") -@@ -23,6 +28,10 @@ endif() - find_program(SH_PROGRAM NAMES sh bash) +@@ -30,13 +35,13 @@ if(${LIBPGMATH_SYSTEM_PROCESSOR} MATCHES "x86_64" AND + set(DEFINITIONS_L1 + HOST_LINUX LINUX LINUX86 LINUX8664 MAXCPUS=256 MAXCPUSL=8 MAXCPUSR=8 + TARGET_LINUX TARGET_LINUX_X86 TARGET_LINUX_X8664 TARGET_X86 TARGET_X8664 +- __gnu_linux__ PG_PIC) ++ __gnu_linux__ linux PG_PIC) + set(FLAGS_L1 "-m64 -O3 ") - set_property(GLOBAL APPEND PROPERTY "TARGET_OBJECTS") -+ -+if ("${LIBPGMATH_SYSTEM_NAME}" STREQUAL "FreeBSD") -+ set(LIBPGMATH_SYSTEM_NAME "Linux") -+endif () + set(DEFINITIONS_L2 + LINUX LINUX86 LINUX8664 MAXCPUS=256 MAXCPUSL=8 MAXCPUSR=8 __gnu_linux__ + TARGET_LINUX TARGET_LINUX_X86 TARGET_LINUX_X8664 TARGET_X86 TARGET_X8664 +- PG_PIC) ++ linux PG_PIC) + set(FLAGS_L2 "-m64 -O3 -mtune=core-avx2 -march=core-avx2 ") - if(${LIBPGMATH_SYSTEM_PROCESSOR} MATCHES "x86_64" AND NOT ${LIBPGMATH_WITH_GENERIC}) - if(${LIBPGMATH_SYSTEM_NAME} MATCHES "Linux") + # common