From nobody Fri Jul 01 08:54:11 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 B4FC48779F2; Fri, 1 Jul 2022 08:54:11 +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 4LZ8Bq4PSHz57NT; Fri, 1 Jul 2022 08:54:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656665651; 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=X2bW0d7REIQUKYDeLbs7S2ie8Yuwj/MQ65hkc1E3fXo=; b=XE2yn2IxvJ6OMPKfpqK2zzfbwpczGkbE+jhQAtu7bdrpsG0BTl7aS5vAZHwUSYHJougLLz dceXevPVUewh6f6X/jVSJrLXwLHGMhZkMQ5nk+h7uD+Crgh62wjplSwE/AGmd0+j+BXH12 J2R+aNT7AomQfpDLvYZEt60uidySuVWe+/EtH7vYVd2CIsCi2Z1mqUWR3gM4LyTaoUi8u7 Xp/uN0p8IA1s+G18CIVd+xPMj2n1L2+lPV5ZWTKdESCVb0bl7/N9qD/LH710FrfhV7yYdO FMc93VH8k/4C2Nw48AI3dycZEg2MbF4vxpMUh/GyOI060dGx2kGsI3y0kZlsUQ== 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 76EDC17FE0; Fri, 1 Jul 2022 08:54:11 +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 2618sBMc068551; Fri, 1 Jul 2022 08:54:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2618sB5c068550; Fri, 1 Jul 2022 08:54:11 GMT (envelope-from git) Date: Fri, 1 Jul 2022 08:54:11 GMT Message-Id: <202207010854.2618sB5c068550@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: 81f87a9e41f1 - main - net-im/libsignal-node: Fix packaging on i386 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: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 81f87a9e41f1702418d84e854c52d13aac527c94 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656665651; 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=X2bW0d7REIQUKYDeLbs7S2ie8Yuwj/MQ65hkc1E3fXo=; b=MCqOpD/PS/3ZApEQ2I7tJX+113T6m1boJc6riBl2Nkz3vffC62jaBbqWhPb0u+A3L5UNJP n4KCerWcnJDBbSSfdIql+xDzBq8EiHwi4KFd0AtyezIgf5T2qPd1i1gPwjU5C3O/sS7U+m hU/zkaQAUMdqmZxZwD0vZ7otTv3oOBeQKCvXnJuI4+qrzVX1ntOfyBpFj7ALkvNU5gMMq/ 09ym8/N5LUYzyV4T0drL+vuN4v7Wll5+DzztyuNTuQPlLvQcrcgSVKoZWe6iFrXRyfbqUb dI4qEeOFdB+vQQUyQwCXraT+NXEhLiEflahgP8K8um2G0VlROWNdhK6cISQdPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656665651; a=rsa-sha256; cv=none; b=Rg2AB1NPo0njSxf0iFCIR+bLnwbpBO/VPwrC1KFzL5eW7T9wT6HPy2x4u78I5yhT221mEX +qXQHnoLgWOElI54cMw3D99JQf17k4WYTExon5uH7sL7mrSizrchOp2Ho3uDgWFufGC//B UqcMgWyZ32q/DG2E9adkWfZ2hn1HqoWWEr60Ir9Ps8blj2zq149hDys+RXFz0mvkso8gRI u8aI67IqlMWfl/3hoLR1MWYvX9XzZNwDNu7gI5KL0VC9TFYA8e7AcESBMpkgSs2DwJkyjC XideqYoP/OrfDbDW82LCRwsJm0EqKX4tbNTrBWS3XzQOnNZwOLXR2kxep9injQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=81f87a9e41f1702418d84e854c52d13aac527c94 commit 81f87a9e41f1702418d84e854c52d13aac527c94 Author: Mikael Urankar AuthorDate: 2022-07-01 08:09:25 +0000 Commit: Mikael Urankar CommitDate: 2022-07-01 08:54:05 +0000 net-im/libsignal-node: Fix packaging on i386 --- net-im/libsignal-node/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/net-im/libsignal-node/Makefile b/net-im/libsignal-node/Makefile index 7b6b23727b70..8d8d33fd7f5d 100644 --- a/net-im/libsignal-node/Makefile +++ b/net-im/libsignal-node/Makefile @@ -255,10 +255,13 @@ MAKE_ENV= ELECTRON_OVERRIDE_DIST_PATH=${LOCALBASE}/share/electron18 \ PYTHON=${PYTHON_CMD} \ XDG_CACHE_HOME=${WRKDIR}/.cache -USE_LDCONFIG= yes +USE_LDCONFIG= yes PLIST_FILES= lib/libsignal_node.so +NODE_ARCH= ${ARCH:S/amd64/x64/:S/i386/ia32/:C/powerpc64.*/ppc64/} +RUST_ARCH= ${ARCH:S/amd64/x86_64/:S/i386/i686/} + .include .if ${ARCH:Mpowerpc64*} @@ -277,7 +280,7 @@ do-build: ${SETENV} ${MAKE_ENV} yarn tsc do-install: - ${INSTALL_DATA} ${WRKSRC}/node/build/Release/obj.target/libsignal_client_freebsd_${ARCH:S/amd64/x64/:C/powerpc64.*/ppc64/}.node/geni/rust/${ARCH:S/amd64/x86_64/}-unknown-freebsd/release/libsignal_node.so \ + ${INSTALL_DATA} ${WRKSRC}/node/build/Release/obj.target/libsignal_client_freebsd_${NODE_ARCH}.node/geni/rust/${RUST_ARCH}-unknown-freebsd/release/libsignal_node.so \ ${STAGEDIR}${PREFIX}/lib/ create-caches-tarball: