From nobody Thu Oct 27 11:32:24 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 4Myk6x4YHDz4h1JW; Thu, 27 Oct 2022 11:32:25 +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 4Myk6x4313z43fr; Thu, 27 Oct 2022 11:32:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666870345; 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=9qKtAPGBfoKbpvYLxjkHbUdeXEpi5ynO1NpIKX9SJsY=; b=BNAeDIg5kJYUZunmAwEpIQPPngTf+3cIyG6rIJSqAbDpQWpuOfhijfN5Ko9Ay8KYk93OQM TFlrduzAj0YGnVgP4kv3NxUxwu8ZBVxC7HA5NWE93mskUTxhb7kDOkbRSD/7LRQxad4tRM GMOFoenLFFZ3SGllsNJJfudFP0YE1t8CC3xvuW8Fi7nTBJEqLODc9/v3lffY02GG0W5/iz NTVTjTeHPRhhAk76JFowzI+YnSeIQWufrkph8pnGnDTFp3+CYV/ZAy+fGrgGuU9ZvGiJmI A5j5z+YYVgf0dVyDm2O+UsI6cFu70tJMfWCYVuPa24PvmomCbuuoxlsOIWvZwg== 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 4Myk6x2PWyzvl9; Thu, 27 Oct 2022 11:32:25 +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 29RBWOVl078878; Thu, 27 Oct 2022 11:32:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29RBWOmg078877; Thu, 27 Oct 2022 11:32:24 GMT (envelope-from git) Date: Thu, 27 Oct 2022 11:32:24 GMT Message-Id: <202210271132.29RBWOmg078877@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 85d135cf7a17 - main - cad/libredwg: revert commit a534aad1cee and fix the problem differently 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 85d135cf7a17863ccc89dca7c7ac1b6c8f26ca24 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666870345; 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=9qKtAPGBfoKbpvYLxjkHbUdeXEpi5ynO1NpIKX9SJsY=; b=PrnXKvuxMA4jPI7cUZldT6hVWj0nYmo0LBUeyTc67Fl0mIgZpyaaNjgy6jmCquK/Gie7kW PtMW2vD27VRdgeU1nVCUFRzqcD2KXyiASrs7F3vUw0g3gfqJQ5i3GrBtx0jPvBzrG13BU1 fJDafcKeLP7kApqDKyOXoV9twFcp1MpZDZcull2vqX66Hy7Qo8d3SMZmfs/Lf+tN+Ko8O4 lQngzzYCCHHQihoQGg/5zJgenT2bu84QtweoTs/6AgMRJuOcC85J55Xm0oGmLsp06RCKVl YLnjEnXEQIZc8B7AHoUsYOXhB3Rr7fMEEjlhlNL2ugFIhL06YpaOfbow7Jkniw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666870345; a=rsa-sha256; cv=none; b=gMoZ0hlxGcEkHWnZ9H+iKCRPLRQErmO7VE9ar8w2+G67sxY995A+gJACAcuKbbNhdNjlp8 v7FY9oePWGCx5Q1XswAm08nr5A4BY3d6lvfrh2XD/tLwqryOZXkr9lFVzovNe2Y+WdlTVk xvOtym6f+/bXStdpugnC+80YafW2OKDqhtktfSHtrfXWOzYMr/WtqLehgfEWviWti3DMdj qV2T/v5IfWvXDPB/WwtHpYILMIdflBk0Adz/af6QjpbK/U5nN3aqT/4TXp44HjJqlfb0fH wDISzWDLkniN/U++0n0tL+/bWRni3WvpUjf3TuBulvCX0JC1c/+qhCUBcChbOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=85d135cf7a17863ccc89dca7c7ac1b6c8f26ca24 commit 85d135cf7a17863ccc89dca7c7ac1b6c8f26ca24 Author: Alexey Dokuchaev AuthorDate: 2022-10-27 11:31:56 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-10-27 11:31:56 +0000 cad/libredwg: revert commit a534aad1cee and fix the problem differently Do not build LLVM-based fuzzers: they are hardly interesting to regular LibreDWG consumers and not even being installed. Reported by: pkg-fallout --- cad/libredwg/Makefile | 13 ++----------- cad/libredwg/files/patch-examples_Makefile.in | 12 ++++++++++++ 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/cad/libredwg/Makefile b/cad/libredwg/Makefile index 73f5f74f84c4..9fc82518d7b6 100644 --- a/cad/libredwg/Makefile +++ b/cad/libredwg/Makefile @@ -9,7 +9,7 @@ WWW= https://www.gnu.org/software/libredwg/ LICENSE= GPLv3+ -USES= compiler cpe libtool tar:xz +USES= cpe libtool tar:xz GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-trace --with-perl-install=no USE_LDCONFIG= yes @@ -41,15 +41,6 @@ PYTHON_CONFIGURE_OFF= --disable-python PYTHON_PORTEXAMPLES= load_dwg.py PYTHON_VARS= SHEBANG_FILES+=examples/load_dwg.py -.include - -.if ${COMPILER_VERSION} < 150 && ${ARCH:Mpowerpc64*} -LLVM_VER= 15 -BUILD_DEPENDS+= clang${LLVM_VER}:devel/llvm${LLVM_VER} -CC= ${LOCALBASE}/bin/clang${LLVM_VER} -CXX= ${LOCALBASE}/bin/clang++${LLVM_VER} -.endif - post-patch: # XXX: switch the order of #include's to unbreak on powerpc/sparc64 # which are still based on gcc-4.2.1 (should be no-op elsewhere) @@ -73,4 +64,4 @@ post-stage: ${MV} ${PORTEXAMPLES:S|^|${STAGEDIR}${PREFIX}/share/|} \ ${STAGEDIR}${EXAMPLESDIR} -.include +.include diff --git a/cad/libredwg/files/patch-examples_Makefile.in b/cad/libredwg/files/patch-examples_Makefile.in new file mode 100644 index 000000000000..9dc1b31febd7 --- /dev/null +++ b/cad/libredwg/files/patch-examples_Makefile.in @@ -0,0 +1,12 @@ +--- examples/Makefile.in.orig 2021-03-18 08:57:40 UTC ++++ examples/Makefile.in +@@ -90,8 +90,7 @@ host_triplet = @host@ + build_triplet = @build@ + host_triplet = @host@ + @USE_WRITE_TRUE@bin_PROGRAMS = dwgadd$(EXEEXT) +-check_PROGRAMS = load_dwg$(EXEEXT) dwg2svg2$(EXEEXT) dwgfuzz$(EXEEXT) \ +- llvmfuzz_standalone$(EXEEXT) ++check_PROGRAMS = load_dwg$(EXEEXT) dwg2svg2$(EXEEXT) + EXTRA_PROGRAMS = unknown$(EXEEXT) bd$(EXEEXT) bits$(EXEEXT) \ + llvmfuzz$(EXEEXT) + @ENABLE_GCOV_TRUE@am__append_1 = @GCOV_CFLAGS@