Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 30 Apr 2022 21:26:49 GMT
From:      Piotr Kubaj <pkubaj@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 0000ac03c1bc - main - security/klee: fix packaging on powerpc64le
Message-ID:  <202204302126.23ULQnK1046160@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0000ac03c1bcb687228bece7881a7f38c7f0a617

commit 0000ac03c1bcb687228bece7881a7f38c7f0a617
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2022-04-30 20:01:04 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2022-04-30 21:26:31 +0000

    security/klee: fix packaging on powerpc64le
    
    powerpc64le doesn't have multilib libraries, since there's no 32-bit little-endian POWER.
---
 security/klee/Makefile  | 10 ++++++++++
 security/klee/pkg-plist | 48 ++++++++++++++++++++++++------------------------
 2 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/security/klee/Makefile b/security/klee/Makefile
index effce070f48e..4993a09f7315 100644
--- a/security/klee/Makefile
+++ b/security/klee/Makefile
@@ -47,4 +47,14 @@ STP_CMAKE_BOOL=		ENABLE_SOLVER_STP
 STP_LIB_DEPENDS=	libstp.so:math/stp \
 			libcryptominisat5.so:math/cryptominisat
 
+.include <bsd.port.options.mk>
+
+.if ${ARCH} == powerpc64le
+PLIST_SUB=	32BIT="@comment " \
+		64BIT=""
+.else
+PLIST_SUB=	32BIT="" \
+		64BIT=""
+.endif
+
 .include <bsd.port.mk>
diff --git a/security/klee/pkg-plist b/security/klee/pkg-plist
index 8e0ae5be1e93..4110da8a62da 100644
--- a/security/klee/pkg-plist
+++ b/security/klee/pkg-plist
@@ -7,48 +7,48 @@ bin/klee-stats
 bin/klee-zesti
 bin/ktest-tool
 include/klee/klee.h
-lib/klee/runtime/libkleeRuntimeFortify32_Debug+Asserts.bca
-lib/klee/runtime/libkleeRuntimeFortify32_Debug.bca
-lib/klee/runtime/libkleeRuntimeFortify32_Release+Asserts.bca
-lib/klee/runtime/libkleeRuntimeFortify32_Release+Debug+Asserts.bca
-lib/klee/runtime/libkleeRuntimeFortify32_Release+Debug.bca
-lib/klee/runtime/libkleeRuntimeFortify32_Release.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeFortify32_Debug+Asserts.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeFortify32_Debug.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeFortify32_Release+Asserts.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeFortify32_Release+Debug+Asserts.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeFortify32_Release+Debug.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeFortify32_Release.bca
 lib/klee/runtime/libkleeRuntimeFortify64_Debug+Asserts.bca
 lib/klee/runtime/libkleeRuntimeFortify64_Debug.bca
 lib/klee/runtime/libkleeRuntimeFortify64_Release+Asserts.bca
 lib/klee/runtime/libkleeRuntimeFortify64_Release+Debug+Asserts.bca
 lib/klee/runtime/libkleeRuntimeFortify64_Release+Debug.bca
 lib/klee/runtime/libkleeRuntimeFortify64_Release.bca
-lib/klee/runtime/libkleeRuntimeFreestanding32_Debug+Asserts.bca
-lib/klee/runtime/libkleeRuntimeFreestanding32_Debug.bca
-lib/klee/runtime/libkleeRuntimeFreestanding32_Release+Asserts.bca
-lib/klee/runtime/libkleeRuntimeFreestanding32_Release+Debug+Asserts.bca
-lib/klee/runtime/libkleeRuntimeFreestanding32_Release+Debug.bca
-lib/klee/runtime/libkleeRuntimeFreestanding32_Release.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeFreestanding32_Debug+Asserts.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeFreestanding32_Debug.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeFreestanding32_Release+Asserts.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeFreestanding32_Release+Debug+Asserts.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeFreestanding32_Release+Debug.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeFreestanding32_Release.bca
 lib/klee/runtime/libkleeRuntimeFreestanding64_Debug+Asserts.bca
 lib/klee/runtime/libkleeRuntimeFreestanding64_Debug.bca
 lib/klee/runtime/libkleeRuntimeFreestanding64_Release+Asserts.bca
 lib/klee/runtime/libkleeRuntimeFreestanding64_Release+Debug+Asserts.bca
 lib/klee/runtime/libkleeRuntimeFreestanding64_Release+Debug.bca
 lib/klee/runtime/libkleeRuntimeFreestanding64_Release.bca
-lib/klee/runtime/libkleeRuntimeIntrinsic32_Debug+Asserts.bca
-lib/klee/runtime/libkleeRuntimeIntrinsic32_Debug.bca
-lib/klee/runtime/libkleeRuntimeIntrinsic32_Release+Asserts.bca
-lib/klee/runtime/libkleeRuntimeIntrinsic32_Release+Debug+Asserts.bca
-lib/klee/runtime/libkleeRuntimeIntrinsic32_Release+Debug.bca
-lib/klee/runtime/libkleeRuntimeIntrinsic32_Release.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeIntrinsic32_Debug+Asserts.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeIntrinsic32_Debug.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeIntrinsic32_Release+Asserts.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeIntrinsic32_Release+Debug+Asserts.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeIntrinsic32_Release+Debug.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeIntrinsic32_Release.bca
 lib/klee/runtime/libkleeRuntimeIntrinsic64_Debug+Asserts.bca
 lib/klee/runtime/libkleeRuntimeIntrinsic64_Debug.bca
 lib/klee/runtime/libkleeRuntimeIntrinsic64_Release+Asserts.bca
 lib/klee/runtime/libkleeRuntimeIntrinsic64_Release+Debug+Asserts.bca
 lib/klee/runtime/libkleeRuntimeIntrinsic64_Release+Debug.bca
 lib/klee/runtime/libkleeRuntimeIntrinsic64_Release.bca
-lib/klee/runtime/libkleeRuntimeKLEELibc32_Debug+Asserts.bca
-lib/klee/runtime/libkleeRuntimeKLEELibc32_Debug.bca
-lib/klee/runtime/libkleeRuntimeKLEELibc32_Release+Asserts.bca
-lib/klee/runtime/libkleeRuntimeKLEELibc32_Release+Debug+Asserts.bca
-lib/klee/runtime/libkleeRuntimeKLEELibc32_Release+Debug.bca
-lib/klee/runtime/libkleeRuntimeKLEELibc32_Release.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeKLEELibc32_Debug+Asserts.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeKLEELibc32_Debug.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeKLEELibc32_Release+Asserts.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeKLEELibc32_Release+Debug+Asserts.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeKLEELibc32_Release+Debug.bca
+%%32BIT%%lib/klee/runtime/libkleeRuntimeKLEELibc32_Release.bca
 lib/klee/runtime/libkleeRuntimeKLEELibc64_Debug+Asserts.bca
 lib/klee/runtime/libkleeRuntimeKLEELibc64_Debug.bca
 lib/klee/runtime/libkleeRuntimeKLEELibc64_Release+Asserts.bca



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202204302126.23ULQnK1046160>