From nobody Thu Jan 30 12:48:02 2025 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 4YkJhy3fzcz5mHpm; Thu, 30 Jan 2025 12:48:02 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YkJhy38Mgz43w9; Thu, 30 Jan 2025 12:48:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738241282; 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=TTJAPMCJqGMrAmcpc3e4XRbfwxI+J784sxpeo5Oe2aU=; b=KVaicpzPH5z1MH+qEmecEjhXalAoF4B8IQicCBOtAwFC1YshoyCwtVDVB8WGb2eKxNOtHJ gm92ymqAbx+ktJ0HtlRq0Ff/wrTSEwHN0heTtQ6rcn+KGHfP6LCoko+5DiRW404Ng2djXV xNWGw+BCSoWWByhRJ7ZHfiFrpXEkgWqwoptblvo6WDx3T8nhJhbxzAosMWeriOtq3UJwk0 I8Mo917yygTnuN7KqGZJ1cp1j7w5YpRBaQxwGU0OI6EXH2uOOTq+5e4hJay6bi5VzNkucd YPzsJYlXWqXPbElpmAUyCxj49k56inZ3XTGJFmMpCqfOCwJfye42o58Nq5yoyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738241282; 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=TTJAPMCJqGMrAmcpc3e4XRbfwxI+J784sxpeo5Oe2aU=; b=NeeTk1T0PIyQYzUQXpqgjHORM0RW82L1mf01bNBagSDKN2bzJlsur9Ck1SWhvCDSvYFEAn Bsh+XggOJ3c51lG8lggAk1I3wkpP9LHMaSwHgy8lZaqQoPAWntilbAQaDuIjWaDodXHW+o 88lVzjz1zA7PQ1ad9bHKOYMjXMYHxRq6lRGsdVyt3yBjY98GlU1pMRTbIiKNbvCn8aCPAL 6/l3HFqsIduAWus90CMTiC3zkjt0GiDpPKIgZRavpqW58Ko0M8ADt1gJ6Z/WbCKsa+OWUp 1n843C3q4QOezKyyMG+Xmj2C4RhlxrPNBaCp0w5FmL2J6Eq27snO2a0Lc/Jt/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738241282; a=rsa-sha256; cv=none; b=kSbrhO+0AjgM25gdKKCkHB0sGsh/wnDeKdgtqC9MLG52JP4M7ZNyUeSRqzvxiQYvaC7tUi lkrIg5rvizOozqCHM0/nT0EJXItpFNLjg5aGqm5HFmF/Sk4pAVISDVlAhlCwKKLMECDM5i Ch084w7M1SsQaH2MCL84tRg1trqGoNmkDNZlQWIApFIBWux1XVb0FjTKBg3Vcwzo6rXk+o E3pxYdH4aD3wowTW7c5xQGECs41AtMcMbJ6KrDFyKhPaGNj2mo8mvPEsnpfP4oUmJN5j7t R5ER2Sw2ZFuWXsP/uqU6dmfCs+Jg/oPq6WzL343M6M8kVw9ArCxWuydEQ8ITWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YkJhy2jFNzp7N; Thu, 30 Jan 2025 12:48:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50UCm2Ws067763; Thu, 30 Jan 2025 12:48:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50UCm2PG067760; Thu, 30 Jan 2025 12:48:02 GMT (envelope-from git) Date: Thu, 30 Jan 2025 12:48:02 GMT Message-Id: <202501301248.50UCm2PG067760@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: d5dd5e79d2ad - main - devel/libepoll-shim: Add i386 flavor, which only installs 32-bit libraries 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d5dd5e79d2ad105f20949e9d749f15a207db3683 Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=d5dd5e79d2ad105f20949e9d749f15a207db3683 commit d5dd5e79d2ad105f20949e9d749f15a207db3683 Author: Gleb Popov AuthorDate: 2025-01-26 16:13:23 +0000 Commit: Gleb Popov CommitDate: 2025-01-30 12:47:45 +0000 devel/libepoll-shim: Add i386 flavor, which only installs 32-bit libraries It is going to be used by 32-bit pieces of emulators/libc6-shim Approved by: manu (via IRC) Differential Revision: https://reviews.freebsd.org/D48692 --- devel/libepoll-shim/Makefile | 21 ++++++++++++++++++++- devel/libepoll-shim/pkg-plist.i386 | 7 +++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/devel/libepoll-shim/Makefile b/devel/libepoll-shim/Makefile index 3d1def668d12..fd2f263550d8 100644 --- a/devel/libepoll-shim/Makefile +++ b/devel/libepoll-shim/Makefile @@ -10,6 +10,11 @@ WWW= https://github.com/jiixyj/epoll-shim LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE +FLAVORS= default i386 +FLAVOR?= ${FLAVORS:[1]} +i386_PKGNAMESUFFIX= -i386 +i386_PLIST= ${.CURDIR}/pkg-plist.i386 + USES= cmake compiler:c11 USE_LDCONFIG= yes USE_GITHUB= yes @@ -18,6 +23,20 @@ GH_PROJECT= epoll-shim PLIST_SUB= SHIM_EVENTFD="${exists(/usr/include/sys/eventfd.h):?@comment :}" \ SHIM_TIMERFD="${exists(/usr/include/sys/timerfd.h):?@comment :}" +.include + +.if ${ARCH} != amd64 && ${FLAVOR:U} == i386 +IGNORE= i386 flavor only makes sense for amd64 arch +.endif + +.if ${FLAVOR:U} == i386 +CFLAGS+= -m32 +CMAKE_ARGS+= -DCMAKE_INSTALL_LIBDIR=lib32 + +post-stage: + ${RM} -r ${STAGEDIR}${PREFIX}/include ${STAGEDIR}${PREFIX}/libdata +.endif + do-test: # Exclude certain tests in resource restricted environments @(if [ `ulimit -n` -lt 20100 ]; then \ @@ -32,4 +51,4 @@ do-test: cd ${TEST_WRKSRC} && \ ${SETENV} ${TEST_ENV} ctest -C ${CMAKE_BUILD_TYPE} $$SKIP_TESTS) -.include +.include diff --git a/devel/libepoll-shim/pkg-plist.i386 b/devel/libepoll-shim/pkg-plist.i386 new file mode 100644 index 000000000000..3814619a2833 --- /dev/null +++ b/devel/libepoll-shim/pkg-plist.i386 @@ -0,0 +1,7 @@ +lib32/cmake/epoll-shim/epoll-shim-config.cmake +lib32/cmake/epoll-shim/epoll-shim-targets-%%CMAKE_BUILD_TYPE%%.cmake +lib32/cmake/epoll-shim/epoll-shim-targets.cmake +lib32/libepoll-shim-interpose.so +lib32/libepoll-shim-interpose.so.0 +lib32/libepoll-shim.so +lib32/libepoll-shim.so.0