public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-util/clang-extract/
@ 2024-11-25 21:51 Sam James
  0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2024-11-25 21:51 UTC (permalink / raw
  To: gentoo-commits

commit:     e304debb6c61e4354e7c7855b23296157803b14b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 25 21:50:48 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 25 21:50:58 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e304debb

dev-util/clang-extract: improve deps

Oops.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/clang-extract/clang-extract-0_pre20241002.ebuild | 3 ++-
 dev-util/clang-extract/clang-extract-9999.ebuild          | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/dev-util/clang-extract/clang-extract-0_pre20241002.ebuild b/dev-util/clang-extract/clang-extract-0_pre20241002.ebuild
index d99ec316f176..6dfe117dea9e 100644
--- a/dev-util/clang-extract/clang-extract-0_pre20241002.ebuild
+++ b/dev-util/clang-extract/clang-extract-0_pre20241002.ebuild
@@ -29,7 +29,8 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
-	app-arch/zstd
+	app-arch/zstd:=
+	sys-libs/zlib
 	virtual/libelf
 	$(llvm_gen_dep '
 		sys-devel/clang:${LLVM_SLOT}

diff --git a/dev-util/clang-extract/clang-extract-9999.ebuild b/dev-util/clang-extract/clang-extract-9999.ebuild
index 892787e428de..6dfe117dea9e 100644
--- a/dev-util/clang-extract/clang-extract-9999.ebuild
+++ b/dev-util/clang-extract/clang-extract-9999.ebuild
@@ -29,14 +29,15 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
+	app-arch/zstd:=
+	sys-libs/zlib
+	virtual/libelf
 	$(llvm_gen_dep '
 		sys-devel/clang:${LLVM_SLOT}
 		sys-devel/llvm:${LLVM_SLOT}
 	')
 "
-RDEPEND="
-	${DEPEND}
-"
+RDEPEND="${DEPEND}"
 BDEPEND="
 	$(llvm_gen_dep '
 		sys-devel/clang:${LLVM_SLOT}


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/clang-extract/
@ 2025-02-25 18:49 Sam James
  0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2025-02-25 18:49 UTC (permalink / raw
  To: gentoo-commits

commit:     75054de86e8a96ec7b23cf63551d0298a1b71423
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 25 18:48:31 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 25 18:48:51 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75054de8

dev-util/clang-extract: add 0_pre20241220

Adds LLVM 19 support.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/clang-extract/Manifest                                     | 1 +
 ...clang-extract-9999.ebuild => clang-extract-0_pre20241220.ebuild} | 6 +++---
 dev-util/clang-extract/clang-extract-9999.ebuild                    | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/dev-util/clang-extract/Manifest b/dev-util/clang-extract/Manifest
index 5fdcd6bc5cee..ddd961f93312 100644
--- a/dev-util/clang-extract/Manifest
+++ b/dev-util/clang-extract/Manifest
@@ -1 +1,2 @@
 DIST clang-extract-0_pre20241002.gh.tar.gz 129679 BLAKE2B 98d55d96fddcaf97e3ba12c4f5cc64a226ca8cb01328bfbe29e0526e48ba3304fdba0f4ee0f07972e488dd9339326011116359401fed047031c49806ee175245 SHA512 c05a8c2aa9a3fd0050d23b35991b8169e185e6186b2c583b364e78fef448030d44be4d14f175148fde5389a1463d4db61d52621dc2b410764336cca12ce3e5b3
+DIST clang-extract-0_pre20241220.gh.tar.gz 129806 BLAKE2B ddf3dbc5c509a3483a1ac9229eab4229c227a5f5b41d25f853bdee0ffe846ff4c8731efcdbd1f853250681f2e718d5db85403762c7eba7afc5787a38cfbdf1aa SHA512 bf130d35c3170a8a3488f67173ed876196339b93cd4243e56eee3f01771badd4c96d80da88db6a267f3e55f874d2735b82da746e8276199f52ead53385c85ef6

diff --git a/dev-util/clang-extract/clang-extract-9999.ebuild b/dev-util/clang-extract/clang-extract-0_pre20241220.ebuild
similarity index 95%
copy from dev-util/clang-extract/clang-extract-9999.ebuild
copy to dev-util/clang-extract/clang-extract-0_pre20241220.ebuild
index 0c1d8f39cd8e..cf1c68c0a1ed 100644
--- a/dev-util/clang-extract/clang-extract-9999.ebuild
+++ b/dev-util/clang-extract/clang-extract-0_pre20241220.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-LLVM_COMPAT=( {16..18} )
+LLVM_COMPAT=( {16..19} )
 PYTHON_COMPAT=( python3_{10..13} )
 inherit flag-o-matic llvm-r1 meson python-any-r1
 
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/SUSE/clang-extract.git"
 	inherit git-r3
 else
-	CLANG_EXTRACT_COMMIT="ec46efd739f15ee49f99834ba56c019cbf69e4ed"
+	CLANG_EXTRACT_COMMIT="8344124f604e2ef9202177f5b9ed61962a37c4dc"
 	SRC_URI="
 		https://github.com/SUSE/clang-extract/archive/${CLANG_EXTRACT_COMMIT}.tar.gz -> ${P}.gh.tar.gz
 	"

diff --git a/dev-util/clang-extract/clang-extract-9999.ebuild b/dev-util/clang-extract/clang-extract-9999.ebuild
index 0c1d8f39cd8e..cf1c68c0a1ed 100644
--- a/dev-util/clang-extract/clang-extract-9999.ebuild
+++ b/dev-util/clang-extract/clang-extract-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-LLVM_COMPAT=( {16..18} )
+LLVM_COMPAT=( {16..19} )
 PYTHON_COMPAT=( python3_{10..13} )
 inherit flag-o-matic llvm-r1 meson python-any-r1
 
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/SUSE/clang-extract.git"
 	inherit git-r3
 else
-	CLANG_EXTRACT_COMMIT="ec46efd739f15ee49f99834ba56c019cbf69e4ed"
+	CLANG_EXTRACT_COMMIT="8344124f604e2ef9202177f5b9ed61962a37c4dc"
 	SRC_URI="
 		https://github.com/SUSE/clang-extract/archive/${CLANG_EXTRACT_COMMIT}.tar.gz -> ${P}.gh.tar.gz
 	"


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/clang-extract/
@ 2025-03-14  5:26 Sam James
  0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2025-03-14  5:26 UTC (permalink / raw
  To: gentoo-commits

commit:     33198c455aab07b9157963e3cdd742371111a783
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 14 05:24:26 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 14 05:24:26 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33198c45

dev-util/clang-extract: drop 0_pre20241002

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/clang-extract/Manifest                    |   1 -
 .../clang-extract-0_pre20241002.ebuild             | 115 ---------------------
 2 files changed, 116 deletions(-)

diff --git a/dev-util/clang-extract/Manifest b/dev-util/clang-extract/Manifest
index ddd961f93312..17c9ee957afd 100644
--- a/dev-util/clang-extract/Manifest
+++ b/dev-util/clang-extract/Manifest
@@ -1,2 +1 @@
-DIST clang-extract-0_pre20241002.gh.tar.gz 129679 BLAKE2B 98d55d96fddcaf97e3ba12c4f5cc64a226ca8cb01328bfbe29e0526e48ba3304fdba0f4ee0f07972e488dd9339326011116359401fed047031c49806ee175245 SHA512 c05a8c2aa9a3fd0050d23b35991b8169e185e6186b2c583b364e78fef448030d44be4d14f175148fde5389a1463d4db61d52621dc2b410764336cca12ce3e5b3
 DIST clang-extract-0_pre20241220.gh.tar.gz 129806 BLAKE2B ddf3dbc5c509a3483a1ac9229eab4229c227a5f5b41d25f853bdee0ffe846ff4c8731efcdbd1f853250681f2e718d5db85403762c7eba7afc5787a38cfbdf1aa SHA512 bf130d35c3170a8a3488f67173ed876196339b93cd4243e56eee3f01771badd4c96d80da88db6a267f3e55f874d2735b82da746e8276199f52ead53385c85ef6

diff --git a/dev-util/clang-extract/clang-extract-0_pre20241002.ebuild b/dev-util/clang-extract/clang-extract-0_pre20241002.ebuild
deleted file mode 100644
index 0c1d8f39cd8e..000000000000
--- a/dev-util/clang-extract/clang-extract-0_pre20241002.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {16..18} )
-PYTHON_COMPAT=( python3_{10..13} )
-inherit flag-o-matic llvm-r1 meson python-any-r1
-
-DESCRIPTION="Tool to extract code content from source files"
-HOMEPAGE="https://github.com/SUSE/clang-extract"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/SUSE/clang-extract.git"
-	inherit git-r3
-else
-	CLANG_EXTRACT_COMMIT="ec46efd739f15ee49f99834ba56c019cbf69e4ed"
-	SRC_URI="
-		https://github.com/SUSE/clang-extract/archive/${CLANG_EXTRACT_COMMIT}.tar.gz -> ${P}.gh.tar.gz
-	"
-	S="${WORKDIR}"/${PN}-${CLANG_EXTRACT_COMMIT}
-
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	app-arch/zstd:=
-	sys-libs/zlib
-	virtual/libelf
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}
-		llvm-core/llvm:${LLVM_SLOT}
-	')
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	$(llvm_gen_dep '
-		llvm-core/clang:${LLVM_SLOT}
-	')
-	test? ( ${PYTHON_DEPS} )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-meson.patch
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-	llvm-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# There's no need to manually add --gcc-install-dir to Clang invocations;
-	# we already have this setup properly via our Clang config files in
-	# /etc/clang.
-	sed -i -e '/add_project_argument.*gcc-install-dir/d' meson.build || die
-
-	# Testsuite makes some (bad) assumptions about layout
-	BUILD_DIR="${S}"/build
-}
-
-src_configure() {
-	# Use whatever CC/CXX llvm-r1 found for us, as meson.build
-	# asserts on GCC being used.
-	export CC=clang
-	export CXX=clang++
-	export PKG_CONFIG_PATH="$(get_llvm_prefix)/$(get_libdir)/pkgconfig:${PKG_CONFIG_PATH}"
-	# User flags may be expecting GCC
-	strip-unsupported-flags
-
-	meson_src_configure
-}
-
-src_test() {
-	# These hacks are inspired by dev-util/clazy.
-	#
-	# clang-extract wants to be installed in the directory of the clang binary,
-	# so it can find the llvm/clang via relative paths.
-	#
-	# Setup the directories and symlink the system include dir for that.
-	local -x LLVM_ROOT="$(get_llvm_prefix)"
-	local -x CLANG_ROOT="${LLVM_ROOT//llvm/clang}"
-
-	mkdir -p "${BUILD_DIR}${CLANG_ROOT}" || die
-	ln -s "${CLANG_ROOT}/include" "${BUILD_DIR}${CLANG_ROOT}/include" || die
-	mkdir -p "${BUILD_DIR}${LLVM_ROOT}/bin" || die
-	ln -s "${BUILD_DIR}"/clang-extract "${BUILD_DIR}${LLVM_ROOT}/bin" || die
-	ln -s "${BUILD_DIR}"/ce-inline "${BUILD_DIR}${LLVM_ROOT}/bin" || die
-
-	# Wrap runtest.py so we always pass -bin-path.
-	#
-	# This is gnarly but we already have to make sure it uses the
-	# right Python, so it was quicker to just do the bash wrapper.
-	mv testsuite/lib/runtest.py{,.real} || die
-	cat <<-EOF > testsuite/lib/runtest.py || die
-	#!/bin/bash
-	export CLANG_NO_DEFAULT_CONFIG=1
-	${EPYTHON} "${S}"/testsuite/lib/runtest.py.real \
-		-bin-path "${BUILD_DIR}${LLVM_ROOT}/bin/" \
-		"\$@"
-	EOF
-	chmod +x testsuite/lib/runtest.py || die
-
-	local -x PATH="${BUILD_DIR}/${LLVM_ROOT}/bin:${BUILD_DIR}/bin:${PATH}"
-	local -x LD_LIBRARY_PATH="${BUILD_DIR}/lib:${LD_LIBRARY_PATH}"
-
-	meson_src_test
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-03-14  5:27 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-14  5:26 [gentoo-commits] repo/gentoo:master commit in: dev-util/clang-extract/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2025-02-25 18:49 Sam James
2024-11-25 21:51 Sam James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox