diff options
| author | Johannes M Dieterich <jmd@FreeBSD.org> | 2019-10-21 00:19:52 +0000 |
|---|---|---|
| committer | Johannes M Dieterich <jmd@FreeBSD.org> | 2019-10-21 00:19:52 +0000 |
| commit | 00ca22dd6c86342ef8fbfcc713a9369d011f4569 (patch) | |
| tree | efd24a2a2fd0be0d557220186e14fd6493b26c05 | |
| parent | mail/courier-pythonfilter: Spell WHITELIST_SPF_DESC correctly (diff) | |
math/libpgmath: also set the linux macro
| -rw-r--r-- | math/libpgmath/Makefile | 1 | ||||
| -rw-r--r-- | math/libpgmath/files/patch-lib_CMakeLists.txt | 25 |
2 files changed, 16 insertions, 10 deletions
diff --git a/math/libpgmath/Makefile b/math/libpgmath/Makefile index c81e3dad8e72..c97d319af784 100644 --- a/math/libpgmath/Makefile +++ b/math/libpgmath/Makefile @@ -3,6 +3,7 @@ PORTNAME= libpgmath DISTVERSION= g20191020 +PORTREVISION= 1 CATEGORIES= math MAINTAINER= jmd@FreeBSD.org diff --git a/math/libpgmath/files/patch-lib_CMakeLists.txt b/math/libpgmath/files/patch-lib_CMakeLists.txt index 3a01da370239..4f91d3a45be2 100644 --- a/math/libpgmath/files/patch-lib_CMakeLists.txt +++ b/math/libpgmath/files/patch-lib_CMakeLists.txt @@ -1,4 +1,4 @@ ---- 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 @@ # @@ -12,14 +12,19 @@ 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 |