From nobody Tue Aug 01 18:07:31 2023 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 4RFjkk2BpBz4ph68; Tue, 1 Aug 2023 18:07:33 +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 4RFjkX5bz7z4VCB; Tue, 1 Aug 2023 18:07:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690913252; 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=fqLh3ZyMRkgBgx0JBsG4w/AWcTomfPnGxnvzV/F6FcE=; b=nOSlYAS7wm71y587Em6HHraXxCyp6LWspTALUmSuve/qomXaKR1BfycLLjgR5beDWvmY3G T4HKZhXqomjzf2VmZiCoRFMfOwjXSB0xyIWhI1EVSwgv0v/yCiwfFi7CqGgY4TpAUbCtY4 8ebFOGLr89XJTLVXkutbQpJ3/XXmQR10GprgZSJVGCffZd1Hr6d3skKU62sZc5FE+CJvUa /tyDEFl/YG8L9JhW2zeMbSP0Ty4fiUS9fx/gRtR59ROflnV9Q7gZMxuFueivybiCV83RaL gluSnIhhKd1Q5dEGPyqibInynBZUpCb2bscoNJM6rsUfxkXiBjzwdNCG4Biy+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690913252; a=rsa-sha256; cv=none; b=HSCp4blDzDBHhrjhAf1XxpZxQUOhm31uhpWmmtbTYHpFKAv7kK8fzMoetvvUNLNJVPzSnc X4TtfYRAD6n0NR7cj2F7CxioX/2BHx4KUCp5awqWN93vhNsiBhNr4rxP9WcC1r3ichClLw S5MsiS/Jk5qWHURPxRVr4VoICdInlP9Zds8cXihRt9DRpGStYoRr77eBnWtiATFdS4HGwZ jfkzyq9V0cUmWgBQNwzylUqGEgWFtCqUI8Osb1km95BwnC8FTKOlWqkiAjuFnO3bmRwDcV cBKwFdFF1v3KWwwEThwgLHf1RXkbSizEdxcsi+Vy0cI/k19UNSZOZ6okPLgUgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690913252; 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=fqLh3ZyMRkgBgx0JBsG4w/AWcTomfPnGxnvzV/F6FcE=; b=RITYJ/0pggUmxzFdxkTaw1BCKNY0vayR6W6Kn0ktgNQxp95Tyy/F/TkLcryslTlkbMdSWm gmbB9svBYjrZRhjP90+M6NzduvrPO7XOUN2kWDuNbYmL2Jx1z68Or8aStbTnZr7MABywOX SyIf39eMsdUiWLlhSxOC7BkUOW6c1/3HWXrtDlVLfs+yOeq1aNQevaCyt8UY7zWMMrVQu9 mJ3IhwOw4ob0QwhNRmVdTmtlzxj+CB0Yzy5KbO6TsWK9wSHuJQ7Lgpduy0s+dx6wE0ZisZ MaOd50Lb9NF/xZC5UmgogrkSSmdrcGZCfQMX5HqNY2uDfgaEAY70BJZe9oqRDg== 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 4RFjkX3l5ZznHV; Tue, 1 Aug 2023 18:07:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 371I7VJw013245; Tue, 1 Aug 2023 18:07:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371I7VQZ013244; Tue, 1 Aug 2023 18:07:31 GMT (envelope-from git) Date: Tue, 1 Aug 2023 18:07:31 GMT Message-Id: <202308011807.371I7VQZ013244@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: d8da18a69ca0 - main - sysutils/nut-devel: Remove GCC requirement. 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: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d8da18a69ca0bc07e6566ee7bf92eb100ba7b08f Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=d8da18a69ca0bc07e6566ee7bf92eb100ba7b08f commit d8da18a69ca0bc07e6566ee7bf92eb100ba7b08f Author: Cy Schubert AuthorDate: 2023-08-01 14:56:33 +0000 Commit: Cy Schubert CommitDate: 2023-08-01 18:06:52 +0000 sysutils/nut-devel: Remove GCC requirement. Remove the GCC requirement by adding -lpthread and removing the nullification of CFLAGS and LDFLAGS in the M4 script that verifies we have a working libltdl. --- sysutils/nut-devel/Makefile | 3 +-- .../nut-devel/files/patch-m4_nut__check_libltdl.m4 | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/sysutils/nut-devel/Makefile b/sysutils/nut-devel/Makefile index f119ef8d95e4..fea20af2d89a 100644 --- a/sysutils/nut-devel/Makefile +++ b/sysutils/nut-devel/Makefile @@ -22,7 +22,6 @@ GH_TAGNAME= 2ced48d1b NUT_COMMIT_DATE= 2023.07.30 MAKE_JOBS_UNSAFE= yes -USE_GCC= yes GNU_CONFIGURE= yes USES= autoreconf:build compiler:c11 gmake libtool pkgconfig python USE_LDCONFIG= yes @@ -84,7 +83,7 @@ CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/nut \ --with-dev \ --with-ltdl --with-nut-scanner -CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib +CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib -lpthread LIB_DEPENDS+= libltdl.so:devel/libltdl # XXX Remove this when copying this port to sysutils/nut. The GA version diff --git a/sysutils/nut-devel/files/patch-m4_nut__check_libltdl.m4 b/sysutils/nut-devel/files/patch-m4_nut__check_libltdl.m4 new file mode 100644 index 000000000000..ae4a2710adf5 --- /dev/null +++ b/sysutils/nut-devel/files/patch-m4_nut__check_libltdl.m4 @@ -0,0 +1,21 @@ +--- m4/nut_check_libltdl.m4.orig 2023-08-01 07:33:24.593954000 -0700 ++++ m4/nut_check_libltdl.m4 2023-08-01 07:35:18.506094000 -0700 +@@ -10,10 +10,7 @@ + dnl No NUT_CHECK_PKGCONFIG here: (lib)ltdl.pc was not seen on any OS + + dnl save CFLAGS and LIBS +- CFLAGS_ORIG="${CFLAGS}" +- LIBS_ORIG="${LIBS}" + LIBS="" +- CFLAGS="" + dnl For fallback below: + myCFLAGS="" + +@@ -71,7 +68,5 @@ + unset myCFLAGS + + dnl restore original CFLAGS and LIBS +- CFLAGS="${CFLAGS_ORIG}" +- LIBS="${LIBS_ORIG}" + fi + ])