From nobody Sat Apr 30 21:26:49 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 954411AAE0D5; Sat, 30 Apr 2022 21:26:49 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KrMqs3nfVz4cmM; Sat, 30 Apr 2022 21:26:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651354009; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vtaZUHykCUCqZirbhcD3xS1qelCOX9Ox798DP/r9GJU=; b=COl6BCOQ7AuxX0O/xXQDnCVEDG7T7jovrgtSjqOz8asjEjIdZ2fTfnpXx+iZff94UF1iBc NzTj/KZa5uJh8GdSQmE3poivWtNTuJ3+yjJdKLWTOUTCbhwcs3RIR8rFg3iWqMdU84Eq1O ZOih3pthluSdibYnlTpfFBwHLUBoOcF+KRKoKCLrrM+shuD76NZ5AuWfH4O+CTQ9Bz7cFI +OZf1gM/Bv0be1TzsxmY2v4uLOTM8TgTMvVRn+ohkAjGjOalWNsa8SOrgOXsnym9fQhRkd OFswD/CBjyRqqepRBSVisVkc1chy1/9UDsgq6/JOInTQZJDHzfNP/GwYK9OVdw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 62E10C7D; Sat, 30 Apr 2022 21:26:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23ULQnBQ046161; Sat, 30 Apr 2022 21:26:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23ULQnK1046160; Sat, 30 Apr 2022 21:26:49 GMT (envelope-from git) Date: Sat, 30 Apr 2022 21:26:49 GMT Message-Id: <202204302126.23ULQnK1046160@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 0000ac03c1bc - main - security/klee: fix packaging on powerpc64le List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0000ac03c1bcb687228bece7881a7f38c7f0a617 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651354009; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vtaZUHykCUCqZirbhcD3xS1qelCOX9Ox798DP/r9GJU=; b=alFSELaWIgmS20KWmfTTkI4DVXSh10KklMJrt+/1ogqjElmpODmCXCAmkX+ZFQQ+fQl90c OARGDJRybgabzPImpR7oHkiTXkXt8P41cqU7BzzHE0tGxIG1w+X6H+yivyiqKJGaLX0U6C Z7GY6N6VSeM9xKv2Uo36DtRaqH1ZkzajifnPg1ua71+TacnAhVVGhkqKfjx59uYdSb9hfY jTmiGFi5djEsvQ8CiOsYTIxoFOBjAuZLYEW1bNonN7l3YIEY8yVsf0kB53RbKN47gavvnx ctWclSU+ZjkFitXzaD6roFxQz8bybasmXGOUV0DN08YxWg1fmdfFb353WwozfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651354009; a=rsa-sha256; cv=none; b=vk2ppf7l+OpgxOHOUNOpEdQjzcw0Af1jXDfGZ5Dhi8f4WLw+UAY68BW2a4yI+MWPRmOahC de9D2GPzlf0m9SZHhZR5N+AM9SEQ7VUcXMBoY5jnFgqxHXDHBbSCD7ejxx/xD6Zk8U7Izj OhpvDebdxEn+bp9C7u9ibsA6sssI4z7i6GNwItItxEYvmOU3sSVv/5ciPjsGlugUA+JjIN FPH1E921d0F9BXvTF6VUkLNrc2aNbbYeEPa4OjacKALZRzyY4NulK59Bc3q4uYinLNmqNo ea7FktZqMgOV724umLnOU+C6VTGJk+REM9tRr8dWHzlgMli09J8dnzFLJCueow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=0000ac03c1bcb687228bece7881a7f38c7f0a617 commit 0000ac03c1bcb687228bece7881a7f38c7f0a617 Author: Piotr Kubaj AuthorDate: 2022-04-30 20:01:04 +0000 Commit: Piotr Kubaj 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 + +.if ${ARCH} == powerpc64le +PLIST_SUB= 32BIT="@comment " \ + 64BIT="" +.else +PLIST_SUB= 32BIT="" \ + 64BIT="" +.endif + .include 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