public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:dev commit in: net-libs/td/
@ 2022-02-09  0:24 Anna Vyalkova
  0 siblings, 0 replies; 6+ messages in thread
From: Anna Vyalkova @ 2022-02-09  0:24 UTC (permalink / raw
  To: gentoo-commits

commit:     de8c2499e60687d09b9a18e7e15bd32a4f2a1a6b
Author:     Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Tue Feb  8 11:56:13 2022 +0000
Commit:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Tue Feb  8 23:40:13 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=de8c2499

net-libs/td: initial import

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>

 net-libs/td/Manifest        |   1 +
 net-libs/td/metadata.xml    |  17 +++++
 net-libs/td/td-1.8.0.ebuild | 147 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 165 insertions(+)

diff --git a/net-libs/td/Manifest b/net-libs/td/Manifest
new file mode 100644
index 000000000..4906891d1
--- /dev/null
+++ b/net-libs/td/Manifest
@@ -0,0 +1 @@
+DIST td-1.8.0.tar.gz 4527846 BLAKE2B c75dd8513e1d0c248cd910f277bedc2f5c7f565b3450dcf8112df8d3b14f343c9fb144b9f45e4768b70ec89203d9b8b66396dfb45b76f7bd62c0d42b0294dbc2 SHA512 7992bc295900b4a770ec3316cc5d32eac5ced45d9019d65d56d753875fb07ccaca80db6ed8217472cef9a40ac0bf54b438214728f110f3b1ea62078252740640

diff --git a/net-libs/td/metadata.xml b/net-libs/td/metadata.xml
new file mode 100644
index 000000000..cbe66e366
--- /dev/null
+++ b/net-libs/td/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>cyber+gentoo@sysrq.in</email>
+		<name>Anna</name>
+	</maintainer>
+	<upstream>
+		<doc>https://core.telegram.org/tdlib/docs/</doc>
+		<remote-id type="github">tdlib/td</remote-id>
+	</upstream>
+	<use>
+		<flag name="benchmark">Enable benchmarking</flag>
+		<flag name="dotnet">Add support for .NET</flag>
+		<flag name="jumbo-build">Combine source files to speed up build process</flag>
+	</use>
+</pkgmetadata>

diff --git a/net-libs/td/td-1.8.0.ebuild b/net-libs/td/td-1.8.0.ebuild
new file mode 100644
index 000000000..d719fbdaa
--- /dev/null
+++ b/net-libs/td/td-1.8.0.ebuild
@@ -0,0 +1,147 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOCS_BUILDER="doxygen"
+inherit cmake docs
+
+DESCRIPTION="Cross-platform library for building Telegram clients"
+HOMEPAGE="https://core.telegram.org/tdlib https://github.com/tdlib/td"
+SRC_URI="https://github.com/tdlib/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="benchmark dotnet java +jumbo-build static-libs test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/openssl:=
+	sys-libs/zlib:=
+	dotnet? ( virtual/dotnet-sdk:* )
+	java? ( virtual/jdk:*[-headless-awt] )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-lang/php[cli]
+	dev-util/gperf
+"
+
+DOCS=( CHANGELOG.md README.md )
+
+TEST_TARGETS=(
+	test-crypto
+	#test-online -- requires network
+	#test-tdutils -- hangs
+	#run_all_tests -- segfaults
+)
+BENCH_TARGETS=(
+	bench_{actor,empty,handshake,misc}
+	bench_http
+	check_tls
+	#bench_{db,tddb} -- fail
+	#bench_http_server{,_cheat,_fast} - hang
+	#bench_http_reader -- fails
+	#check_proxy -- requires proxy
+	#rmdir -- fails
+	#wget -- requires network
+)
+
+src_prepare() {
+	sed "/find_program(CCACHE_FOUND ccache)/d" -i CMakeLists.txt || die
+	echo "" > gen_git_commit_h.sh || die
+
+	use test || cmake_comment_add_subdirectory test
+	use benchmark || cmake_comment_add_subdirectory benchmark
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DTD_ENABLE_DOTNET=$(usex dotnet)
+	)
+
+	if use java; then
+		local JAVA_HOME=$(java-config -O)
+		local JAVA_AWT_LIBRARY=$(echo "${JAVA_HOME}"/jre/lib/*/libjawt.so)
+		local JAVA_JVM_LIBRARY=$(echo "${JAVA_HOME}"/jre/lib/*/libjava.so)
+
+		mycmakeargs+=(
+			-DTD_ENABLE_JNI=ON
+			-DJAVA_AWT_LIBRARY="${JAVA_AWT_LIBRARY}"
+			-DJAVA_JVM_LIBRARY="${JAVA_JVM_LIBRARY}"
+			-DJAVA_INCLUDE_PATH="${JAVA_HOME}/include"
+			-DJAVA_INCLUDE_PATH2="${JAVA_HOME}/include/linux"
+			-DJAVA_AWT_INCLUDE_PATH="${JAVA_HOME}/include"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	einfo "Generating TL source file"
+	cmake_build tl_generate_common tl_generate_json
+
+	einfo "Generating git_info.h"
+	cat <<- EOF > auto/git_info.h || die
+	#pragma once
+	#define GIT_COMMIT "v${PV}"
+	#define GIT_DIRTY 0
+	EOF
+
+	if ! use jumbo-build; then
+		einfo "Splitting source files"
+		php SplitSource.php || die
+	fi
+
+	# Let's build the library
+	einfo "Building TDLib"
+	cmake_src_compile
+
+	if use test; then
+		einfo "Building tests"
+		cmake_build "${TEST_TARGETS[@]}"
+	fi
+
+	if use doc; then
+		einfo "Generating docs"
+		docs_compile
+	fi
+}
+
+src_test() {
+	# segfault
+	#cmake_src_test
+
+	pushd "${BUILD_DIR}"/test > /dev/null || die
+	for exe in "${TEST_TARGETS[@]}"; do
+		einfo "Running ${exe}"
+		./"${exe}" || die "${exe} failed"
+	done
+	popd > /dev/null || die
+
+	if use benchmark; then
+		pushd "${BUILD_DIR}"/benchmark > /dev/null || die
+		for exe in "${BENCH_TARGETS[@]}"; do
+			einfo "Running ${exe}"
+			./"${exe}" || die "${exe} failed"
+		done
+		popd > /dev/null || die
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	docompress -x /usr/share/doc/${PF}/example
+	dodoc -r example
+
+	if ! use static-libs; then
+		einfo "Removing static libraries"
+		find "${D}" -type f -name '*.a' -delete || die
+	fi
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: net-libs/td/
@ 2022-02-09 13:12 Anna Vyalkova
  0 siblings, 0 replies; 6+ messages in thread
From: Anna Vyalkova @ 2022-02-09 13:12 UTC (permalink / raw
  To: gentoo-commits

commit:     15206b5b2a30fe78ecce08bc248a1d6528bdf501
Author:     Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Wed Feb  9 06:03:03 2022 +0000
Commit:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Wed Feb  9 13:12:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=15206b5b

net-libs/td: fix java.eclassesnotused

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>

 net-libs/td/td-1.8.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/td/td-1.8.0.ebuild b/net-libs/td/td-1.8.0.ebuild
index d719fbdaa..ac6baa4f0 100644
--- a/net-libs/td/td-1.8.0.ebuild
+++ b/net-libs/td/td-1.8.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DOCS_BUILDER="doxygen"
-inherit cmake docs
+inherit cmake java-utils-2 docs
 
 DESCRIPTION="Cross-platform library for building Telegram clients"
 HOMEPAGE="https://core.telegram.org/tdlib https://github.com/tdlib/td"


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: net-libs/td/
@ 2022-02-17 21:11 Anna Vyalkova
  0 siblings, 0 replies; 6+ messages in thread
From: Anna Vyalkova @ 2022-02-17 21:11 UTC (permalink / raw
  To: gentoo-commits

commit:     d200b1f777553965c39341d6546608296e93b576
Author:     Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Wed Feb  9 17:01:32 2022 +0000
Commit:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Thu Feb 17 21:11:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d200b1f7

net-libs/td: use java-pkg-opt-2 eclass

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>

 net-libs/td/td-1.8.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-libs/td/td-1.8.0.ebuild b/net-libs/td/td-1.8.0.ebuild
index ac6baa4f0..3d6ce62e2 100644
--- a/net-libs/td/td-1.8.0.ebuild
+++ b/net-libs/td/td-1.8.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DOCS_BUILDER="doxygen"
-inherit cmake java-utils-2 docs
+inherit cmake docs java-pkg-opt-2
 
 DESCRIPTION="Cross-platform library for building Telegram clients"
 HOMEPAGE="https://core.telegram.org/tdlib https://github.com/tdlib/td"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/tdlib/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.
 LICENSE="Boost-1.0"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="benchmark dotnet java +jumbo-build static-libs test"
+IUSE="benchmark dotnet +jumbo-build static-libs test"
 
 RESTRICT="!test? ( test )"
 


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: net-libs/td/
@ 2022-11-10 18:17 Anna Vyalkova
  0 siblings, 0 replies; 6+ messages in thread
From: Anna Vyalkova @ 2022-11-10 18:17 UTC (permalink / raw
  To: gentoo-commits

commit:     6b6e5f4bb0c7a31aed89adad2e5bb818a13d10e7
Author:     Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Thu Nov 10 15:46:08 2022 +0000
Commit:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Thu Nov 10 15:47:29 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6b6e5f4b

net-libs/td: java fixup

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>

 net-libs/td/td-1.8.0.ebuild | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/net-libs/td/td-1.8.0.ebuild b/net-libs/td/td-1.8.0.ebuild
index 3d6ce62e2..898dbeaa8 100644
--- a/net-libs/td/td-1.8.0.ebuild
+++ b/net-libs/td/td-1.8.0.ebuild
@@ -21,7 +21,7 @@ DEPEND="
 	dev-libs/openssl:=
 	sys-libs/zlib:=
 	dotnet? ( virtual/dotnet-sdk:* )
-	java? ( virtual/jdk:*[-headless-awt] )
+	java? ( >=virtual/jdk-11:*[-headless-awt] )
 "
 RDEPEND="${DEPEND}"
 BDEPEND="
@@ -65,9 +65,8 @@ src_configure() {
 	)
 
 	if use java; then
-		local JAVA_HOME=$(java-config -O)
-		local JAVA_AWT_LIBRARY=$(echo "${JAVA_HOME}"/jre/lib/*/libjawt.so)
-		local JAVA_JVM_LIBRARY=$(echo "${JAVA_HOME}"/jre/lib/*/libjava.so)
+		local JAVA_AWT_LIBRARY="${JAVA_HOME}/lib/libjawt.so"
+		local JAVA_JVM_LIBRARY="${JAVA_HOME}/lib/libjava.so"
 
 		mycmakeargs+=(
 			-DTD_ENABLE_JNI=ON


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: net-libs/td/
@ 2022-11-10 18:17 Anna Vyalkova
  0 siblings, 0 replies; 6+ messages in thread
From: Anna Vyalkova @ 2022-11-10 18:17 UTC (permalink / raw
  To: gentoo-commits

commit:     93261750a79ce8ec6bd7e6c89fd58b4d7ff074ce
Author:     Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Thu Nov 10 16:31:40 2022 +0000
Commit:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Thu Nov 10 18:02:23 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=93261750

net-libs/td: add 9999

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>

 net-libs/td/metadata.xml   |   1 +
 net-libs/td/td-9999.ebuild | 112 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 113 insertions(+)

diff --git a/net-libs/td/metadata.xml b/net-libs/td/metadata.xml
index cbe66e366..49213d427 100644
--- a/net-libs/td/metadata.xml
+++ b/net-libs/td/metadata.xml
@@ -10,6 +10,7 @@
 		<remote-id type="github">tdlib/td</remote-id>
 	</upstream>
 	<use>
+		<flag name="abseil">Build with <pkg>dev-cpp/abseil-cpp</pkg></flag>
 		<flag name="benchmark">Enable benchmarking</flag>
 		<flag name="dotnet">Add support for .NET</flag>
 		<flag name="jumbo-build">Combine source files to speed up build process</flag>

diff --git a/net-libs/td/td-9999.ebuild b/net-libs/td/td-9999.ebuild
new file mode 100644
index 000000000..88d1aef53
--- /dev/null
+++ b/net-libs/td/td-9999.ebuild
@@ -0,0 +1,112 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOCS_BUILDER="doxygen"
+inherit check-reqs cmake docs edo git-r3 java-pkg-opt-2
+
+DESCRIPTION="Cross-platform library for building Telegram clients"
+HOMEPAGE="
+	https://core.telegram.org/tdlib
+	https://github.com/tdlib/td
+"
+EGIT_REPO_URI="https://github.com/tdlib/${PN}.git"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS=""
+IUSE="abseil dotnet +jumbo-build static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/openssl:=
+	sys-libs/zlib:=
+	abseil? ( dev-cpp/abseil-cpp:= )
+	dotnet? ( virtual/dotnet-sdk:* )
+	java? ( >=virtual/jdk-11:*[-headless-awt] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/php[cli]
+	dev-util/gperf
+"
+
+DOCS=( CHANGELOG.md README.md )
+
+CHECKREQS_MEMORY="2G"
+
+pkg_pretend() {
+	use test && check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+
+	use test && check-reqs_pkg_setup
+}
+
+src_prepare() {
+	sed "/find_program(CCACHE_FOUND ccache)/d" -i CMakeLists.txt || die
+
+	cmake_comment_add_subdirectory benchmark
+	use test || \
+		cmake_comment_add_subdirectory test
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DTD_ENABLE_DOTNET=$(usex dotnet)
+		-DTD_ENABLE_JNI=$(usex java)
+		-DTD_WITH_ABSEIL=$(usex abseil)
+		-DTD_TEST_FOLLY=OFF
+	)
+
+	if use java; then
+		local JAVA_AWT_LIBRARY="${JAVA_HOME}/lib/libjawt.so"
+		local JAVA_JVM_LIBRARY="${JAVA_HOME}/lib/libjava.so"
+
+		mycmakeargs+=(
+			-DJAVA_AWT_LIBRARY="${JAVA_AWT_LIBRARY}"
+			-DJAVA_JVM_LIBRARY="${JAVA_JVM_LIBRARY}"
+			-DJAVA_INCLUDE_PATH="${JAVA_HOME}/include"
+			-DJAVA_INCLUDE_PATH2="${JAVA_HOME}/include/linux"
+			-DJAVA_AWT_INCLUDE_PATH="${JAVA_HOME}/include"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	einfo "Generating TL source files"
+	cmake_build tl_generate_common tl_generate_json
+
+	if ! use jumbo-build; then
+		einfo "Splitting source files"
+		edo php SplitSource.php
+	fi
+
+	# Let's build the library
+	einfo "Building TDLib"
+	cmake_src_compile
+
+	if use doc; then
+		einfo "Generating docs"
+		docs_compile
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	docompress -x /usr/share/doc/${PF}/example
+	dodoc -r example
+
+	if ! use static-libs; then
+		einfo "Removing static libraries"
+		find "${D}" -type f -name '*.a' -delete || die
+	fi
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: net-libs/td/
@ 2023-07-26  2:34 Anna Vyalkova
  0 siblings, 0 replies; 6+ messages in thread
From: Anna Vyalkova @ 2023-07-26  2:34 UTC (permalink / raw
  To: gentoo-commits

commit:     08dcb280742df21b83f0b554becbe2eb8b2b1dda
Author:     Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Wed Jul 26 02:08:52 2023 +0000
Commit:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Wed Jul 26 02:15:32 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=08dcb280

net-libs/td: disable benchmarks

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>

 net-libs/td/metadata.xml    |  1 -
 net-libs/td/td-1.8.0.ebuild | 41 +++++++++++------------------------------
 net-libs/td/td-9999.ebuild  |  9 +++------
 3 files changed, 14 insertions(+), 37 deletions(-)

diff --git a/net-libs/td/metadata.xml b/net-libs/td/metadata.xml
index 49213d427..e23b1bc02 100644
--- a/net-libs/td/metadata.xml
+++ b/net-libs/td/metadata.xml
@@ -11,7 +11,6 @@
 	</upstream>
 	<use>
 		<flag name="abseil">Build with <pkg>dev-cpp/abseil-cpp</pkg></flag>
-		<flag name="benchmark">Enable benchmarking</flag>
 		<flag name="dotnet">Add support for .NET</flag>
 		<flag name="jumbo-build">Combine source files to speed up build process</flag>
 	</use>

diff --git a/net-libs/td/td-1.8.0.ebuild b/net-libs/td/td-1.8.0.ebuild
index 898dbeaa8..4224d288a 100644
--- a/net-libs/td/td-1.8.0.ebuild
+++ b/net-libs/td/td-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,13 +7,16 @@ DOCS_BUILDER="doxygen"
 inherit cmake docs java-pkg-opt-2
 
 DESCRIPTION="Cross-platform library for building Telegram clients"
-HOMEPAGE="https://core.telegram.org/tdlib https://github.com/tdlib/td"
+HOMEPAGE="
+	https://core.telegram.org/tdlib
+	https://github.com/tdlib/td
+"
 SRC_URI="https://github.com/tdlib/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Boost-1.0"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="benchmark dotnet +jumbo-build static-libs test"
+IUSE="dotnet +jumbo-build static-libs test"
 
 RESTRICT="!test? ( test )"
 
@@ -37,24 +40,14 @@ TEST_TARGETS=(
 	#test-tdutils -- hangs
 	#run_all_tests -- segfaults
 )
-BENCH_TARGETS=(
-	bench_{actor,empty,handshake,misc}
-	bench_http
-	check_tls
-	#bench_{db,tddb} -- fail
-	#bench_http_server{,_cheat,_fast} - hang
-	#bench_http_reader -- fails
-	#check_proxy -- requires proxy
-	#rmdir -- fails
-	#wget -- requires network
-)
 
 src_prepare() {
 	sed "/find_program(CCACHE_FOUND ccache)/d" -i CMakeLists.txt || die
 	echo "" > gen_git_commit_h.sh || die
 
-	use test || cmake_comment_add_subdirectory test
-	use benchmark || cmake_comment_add_subdirectory benchmark
+	cmake_comment_add_subdirectory benchmark
+	use test || \
+		cmake_comment_add_subdirectory test
 
 	cmake_src_prepare
 }
@@ -65,13 +58,10 @@ src_configure() {
 	)
 
 	if use java; then
-		local JAVA_AWT_LIBRARY="${JAVA_HOME}/lib/libjawt.so"
-		local JAVA_JVM_LIBRARY="${JAVA_HOME}/lib/libjava.so"
-
 		mycmakeargs+=(
 			-DTD_ENABLE_JNI=ON
-			-DJAVA_AWT_LIBRARY="${JAVA_AWT_LIBRARY}"
-			-DJAVA_JVM_LIBRARY="${JAVA_JVM_LIBRARY}"
+			-DJAVA_AWT_LIBRARY="${JAVA_HOME}/lib/libjawt.so"
+			-DJAVA_JVM_LIBRARY="${JAVA_HOME}/lib/libjava.so"
 			-DJAVA_INCLUDE_PATH="${JAVA_HOME}/include"
 			-DJAVA_INCLUDE_PATH2="${JAVA_HOME}/include/linux"
 			-DJAVA_AWT_INCLUDE_PATH="${JAVA_HOME}/include"
@@ -122,15 +112,6 @@ src_test() {
 		./"${exe}" || die "${exe} failed"
 	done
 	popd > /dev/null || die
-
-	if use benchmark; then
-		pushd "${BUILD_DIR}"/benchmark > /dev/null || die
-		for exe in "${BENCH_TARGETS[@]}"; do
-			einfo "Running ${exe}"
-			./"${exe}" || die "${exe} failed"
-		done
-		popd > /dev/null || die
-	fi
 }
 
 src_install() {

diff --git a/net-libs/td/td-9999.ebuild b/net-libs/td/td-9999.ebuild
index 88d1aef53..a651c4412 100644
--- a/net-libs/td/td-9999.ebuild
+++ b/net-libs/td/td-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -65,12 +65,9 @@ src_configure() {
 	)
 
 	if use java; then
-		local JAVA_AWT_LIBRARY="${JAVA_HOME}/lib/libjawt.so"
-		local JAVA_JVM_LIBRARY="${JAVA_HOME}/lib/libjava.so"
-
 		mycmakeargs+=(
-			-DJAVA_AWT_LIBRARY="${JAVA_AWT_LIBRARY}"
-			-DJAVA_JVM_LIBRARY="${JAVA_JVM_LIBRARY}"
+			-DJAVA_AWT_LIBRARY="${JAVA_HOME}/lib/libjawt.so"
+			-DJAVA_JVM_LIBRARY="${JAVA_HOME}/lib/libjava.so"
 			-DJAVA_INCLUDE_PATH="${JAVA_HOME}/include"
 			-DJAVA_INCLUDE_PATH2="${JAVA_HOME}/include/linux"
 			-DJAVA_AWT_INCLUDE_PATH="${JAVA_HOME}/include"


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2023-07-26  2:34 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-26  2:34 [gentoo-commits] repo/proj/guru:dev commit in: net-libs/td/ Anna Vyalkova
  -- strict thread matches above, loose matches on Subject: below --
2022-11-10 18:17 Anna Vyalkova
2022-11-10 18:17 Anna Vyalkova
2022-02-17 21:11 Anna Vyalkova
2022-02-09 13:12 Anna Vyalkova
2022-02-09  0:24 Anna Vyalkova

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