From nobody Mon Jan 23 10:02:35 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 4P0lyh1KgKz3b8fW; Mon, 23 Jan 2023 10:02:36 +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 4P0lyh0s96z4Cl2; Mon, 23 Jan 2023 10:02:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674468156; 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=09ErUCyjqdL0WUyIJuLRJP34zwvXnC0UBCnWXySA/OM=; b=LhCk8roPb++oNm5RjZBVCbgGSatmIrYWNJSDIZn3yZOXAXI7ICoVmcqGVDrZJscOFPUo2/ VMy2PBvMaE1szLrrTI13TkGDorQx4v5H03J3FOiWObQC3SGq3eDIpyY6pWYa8qnIyV8OKk 9a4vq4FekOWTa7KJBN/6GQSTvKlOR9VPc5mW6ouAvlvL1y/47+z+kbIIg3dC7lDZWrV0Kr HEd4w1B0eAzIJbF0XMiU0bmG/qDImWCbN2j9KESkvbWLm2I/IkflFpIHJ0U3+nFE7ij0pz l5c8wZKzPz0/XE6yiEMMRvY5i6eghAE70dxED1dPcSzBN+wrEiQXfxPOf03Tcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674468156; 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=09ErUCyjqdL0WUyIJuLRJP34zwvXnC0UBCnWXySA/OM=; b=VUHNX2SrfJjEKo9fSugYuNLw8nKjgY4WcIQBt2E2q4gR/Y8426H27xYz397VpWYG9tAVLk dV+0jOZKyNjgt/4YZsA5msPIIhgaCHrszigbmKuYxXDJGuLTy3f0qMbhoA2lVrKIjWNLTT O9bKC0rCFM2xBp+VntvAVHohAz/u4Lif8BRDh366wNeFqsOkxukbpI6cS7YVOATR457yJE mpww9kxRNW7sd0oxU5HvUSgNZfnuxAxOhdRlBGMf/9yZyuK3d4NyOU8vPbGWsO/YAzWIOf iMJVNxIuKkxJ1SCYwlPlbzs/pCBzFbKOqV/TH4SIWxHGV/lByyxNDP7FDqE0RA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674468156; a=rsa-sha256; cv=none; b=w/V0o17Sww8aQgnqeFNTTJVy/LwV5nkISO30y1zHaXOpnZR0ZSKg2im+oB5oWma/lnzTKD zlkExku9LZD6ZLByisJjmKkXOBorezHi+OZthn6sA6ijnHYqC8cTLf/jM5BEXAvbvAZ8Ha 9uFyDk62ttLH+wPXe7cJ+nZBeci8VH/dqAqNjFFqQUP0DKX85cEUZ5tdPaTAyXEaqUlcrd 3bls5NJUc3wGquiB8mFf2AXEeSI3xbIq+xuuV0VHuLD4LbVpiwdldyxfuPzXNeO4/MQgoj 2cOcPCxoS/4CCrwWGlS1lkHkrxS5E+RIyXCBqJeGwVb3LhSxKZ9fnmPubzXNUQ== 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 4P0lyg6jMdzQ23; Mon, 23 Jan 2023 10:02:35 +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 30NA2ZOE070426; Mon, 23 Jan 2023 10:02:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30NA2Z5b070425; Mon, 23 Jan 2023 10:02:35 GMT (envelope-from git) Date: Mon, 23 Jan 2023 10:02:35 GMT Message-Id: <202301231002.30NA2Z5b070425@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: be17d4ad221b - main - devel/creduce: Update to latest commit (20220927) and unbreak 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: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: be17d4ad221b313ecad86d0f42cea4b1c8b19d74 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=be17d4ad221b313ecad86d0f42cea4b1c8b19d74 commit be17d4ad221b313ecad86d0f42cea4b1c8b19d74 Author: Daniel Engberg AuthorDate: 2023-01-23 09:58:51 +0000 Commit: Daniel Engberg CommitDate: 2023-01-23 09:58:56 +0000 devel/creduce: Update to latest commit (20220927) and unbreak Update to latest commit to support LLVM 15 Convert to CMake and adjust dependencies PR: 268745 Reviewed by: pkubaj, tcberner Tested by: pkubaj, brooks Approved by: portmgr (maintainer timeout, 2+ weeks) --- devel/creduce/Makefile | 55 +++++++++------------- devel/creduce/distinfo | 6 +-- .../creduce/files/builtin_is_constant_evaluated.h | 1 - devel/creduce/files/patch-CMakeLists.txt | 16 +++++++ 4 files changed, 41 insertions(+), 37 deletions(-) diff --git a/devel/creduce/Makefile b/devel/creduce/Makefile index ca535e1bc707..5e798cb40b43 100644 --- a/devel/creduce/Makefile +++ b/devel/creduce/Makefile @@ -1,51 +1,40 @@ PORTNAME= creduce -DISTVERSION= 2.10.0 +DISTVERSION= 2.11.0.20220927 CATEGORIES= devel -MASTER_SITES= http://embed.cs.utah.edu/creduce/ MAINTAINER= swills@FreeBSD.org COMMENT= Produces small test cases -WWW= https://embed.cs.utah.edu/creduce/ +WWW= https://github.com/csmith-project/creduce -# See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=268745 -BROKEN= Depends on removed LLVM port devel/llvm80 +LICENSE= NCSA +LICENSE_FILE= ${WRKSRC}/COPYING -# LLVM_VER= 80 -# BUILD_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} -# RUN_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} -BUILD_DEPENDS= topformflat:devel/delta \ - astyle:devel/astyle \ +BROKEN_FreeBSD_12_powerpc64= fails to configure: cannot compile and link test program with selected LLVM + +BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex +LIB_DEPENDS= libzstd.so:archivers/zstd +RUN_DEPENDS= topformflat:devel/delta \ p5-Benchmark-Timer>=0:devel/p5-Benchmark-Timer \ p5-Exporter-Lite>=0:devel/p5-Exporter-Lite \ p5-File-Which>=0:sysutils/p5-File-Which \ p5-Regexp-Common>=0:textproc/p5-Regexp-Common \ p5-Sys-CPU>=0:devel/p5-Sys-CPU \ - p5-Getopt-Tabular>=0:devel/p5-Getopt-Tabular - -BROKEN_FreeBSD_12_powerpc64= fails to configure: cannot compile and link test program with selected LLVM - -GNU_CONFIGURE= yes -CONFIGURE_ENV= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${LLVM_VER} \ - CC=${LOCALBASE}/bin/clang${LLVM_VER} \ - CXX=${LOCALBASE}/bin/clang++${LLVM_VER} \ - CPP=${LOCALBASE}/bin/clang-cpp${LLVM_VER} - -USES= autoreconf compiler gmake libtool perl5 - -CFLAGS_powerpc64= -mabi=elfv2 + p5-Getopt-Tabular>=0:devel/p5-Getopt-Tabular \ + p5-Term-ReadKey>=0:devel/p5-Term-ReadKey -.include +USES= cmake gnome compiler:c++14-lang llvm:build,lib,run perl5 -.if ${ARCH} == powerpc -LLD_UNSAFE= yes -.endif +USE_CXXSTD= c++14 +USE_GITHUB= yes +GH_ACCOUNT= csmith-project +GH_TAGNAME= 8d56bee +USE_GNOME= libxml2 -.include +# See clang_delta/CMakeLists.txt for more details +LDFLAGS+= -lLLVM-${LLVM_VERSION} -L${LLVM_PREFIX}/lib -# Detect base system libc++ >= 14 by checking for COMPILER_VERSION. -# Not really the ideal way, but it should work. -.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 140 -CXXFLAGS+= -include ${FILESDIR}/builtin_is_constant_evaluated.h -.endif +CMAKE_OFF= ENABLE_TRANS_ASSERT +CMAKE_ARGS= -DLLVM_DIR=${LLVM_PREFIX}/lib/cmake/llvm \ + -DClang_DIR=${LLVM_PREFIX}/lib/cmake/clang .include diff --git a/devel/creduce/distinfo b/devel/creduce/distinfo index 4ca76a867b2d..09311b353ba0 100644 --- a/devel/creduce/distinfo +++ b/devel/creduce/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1557826720 -SHA256 (creduce-2.10.0.tar.gz) = db1c0f123967f24d620b040cebd53001bf3dcf03e400f78556a2ff2e11fea063 -SIZE (creduce-2.10.0.tar.gz) = 779318 +TIMESTAMP = 1672826549 +SHA256 (csmith-project-creduce-2.11.0.20220927-8d56bee_GH0.tar.gz) = ca22cb970354823de06854c274daa6f19be85cfbf63e73e25dbd5fc744bdcbb7 +SIZE (csmith-project-creduce-2.11.0.20220927-8d56bee_GH0.tar.gz) = 747676 diff --git a/devel/creduce/files/builtin_is_constant_evaluated.h b/devel/creduce/files/builtin_is_constant_evaluated.h deleted file mode 100644 index 2775e8fa1bf3..000000000000 --- a/devel/creduce/files/builtin_is_constant_evaluated.h +++ /dev/null @@ -1 +0,0 @@ -constexpr bool __builtin_is_constant_evaluated() { return false; } diff --git a/devel/creduce/files/patch-CMakeLists.txt b/devel/creduce/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..60d4c9b41353 --- /dev/null +++ b/devel/creduce/files/patch-CMakeLists.txt @@ -0,0 +1,16 @@ +--- CMakeLists.txt.orig 2022-09-27 05:17:27 UTC ++++ CMakeLists.txt +@@ -116,11 +116,11 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" + OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + # XXX figure out how to get "-std=c++11 -fno-rtti" from LLVM. That's how we + # get those options in the Automake path... +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-rtti -fno-strict-aliasing -Wall -Wextra -Wno-long-long -Wno-unused-parameter -Wno-missing-field-initializers") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti -fno-strict-aliasing -Wall -Wextra -Wno-long-long -Wno-unused-parameter -Wno-missing-field-initializers") + if(SUPPORTS_FVISIBILITY_INLINES_HIDDEN_FLAG) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") + endif() +- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3") ++# set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3") + endif() + + ###############################################################################