From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2335C158086 for ; Sun, 14 Nov 2021 05:25:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1ABC32BC038; Sun, 14 Nov 2021 05:25:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BB17EE09ED for ; Sun, 14 Nov 2021 05:25:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D621B33C1C1 for ; Sun, 14 Nov 2021 05:25:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E68D51C1 for ; Sun, 14 Nov 2021 05:25:02 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1636867472.6d2facc6865eeebf112e7690c28504ed687dbe8f.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/liborcus/files/, dev-libs/liborcus/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/liborcus/files/liborcus-0.17.0-test-fix.patch dev-libs/liborcus/liborcus-0.16.1.ebuild X-VCS-Directories: dev-libs/liborcus/ dev-libs/liborcus/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 6d2facc6865eeebf112e7690c28504ed687dbe8f X-VCS-Branch: master Date: Sun, 14 Nov 2021 05:25:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: be04545b-6fdf-4f03-abf6-caae9265273e X-Archives-Hash: 6093d24886477ebc75041ea090bb73bc commit: 6d2facc6865eeebf112e7690c28504ed687dbe8f Author: James Beddek posteo de> AuthorDate: Sun Oct 31 02:37:13 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sun Nov 14 05:24:32 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d2facc6 dev-libs/liborcus: fix build failure with USE=-tools Closes: https://bugs.gentoo.org/713586 Signed-off-by: James Beddek posteo.de> Signed-off-by: Sam James gentoo.org> .../liborcus/files/liborcus-0.17.0-test-fix.patch | 51 ++++++++++++++++++++++ dev-libs/liborcus/liborcus-0.16.1.ebuild | 13 ++++-- 2 files changed, 60 insertions(+), 4 deletions(-) diff --git a/dev-libs/liborcus/files/liborcus-0.17.0-test-fix.patch b/dev-libs/liborcus/files/liborcus-0.17.0-test-fix.patch new file mode 100644 index 000000000000..1de33a7e3f4c --- /dev/null +++ b/dev-libs/liborcus/files/liborcus-0.17.0-test-fix.patch @@ -0,0 +1,51 @@ +# https://bugs.gentoo.org/713586 + +[PATCH] Build orcus-env-dump unconditionally + +The rule for `orcus-env-dump.o` is guarded by `if WITH_TOOLS` however, +the rule for the executable `orcus-env-dump` is not. This leads to +linking errors when running the test suite without tools. + +Move the rule for `orcus-env-dump.o` out of the if WITH_TOOLS block to +always build it. +--- + src/Makefile.am | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -25,6 +25,16 @@ orcus_test_xml_LDADD = \ + + orcus_test_xml_CPPFLAGS = -I$(top_builddir)/lib/liborcus/liborcus.la $(AM_CPPFLAGS) -DSRCDIR=\""$(top_srcdir)"\" + ++#---------------------------------------------------------------------------- ++ ++# orcus-env-dump ++ ++orcus_env_dump_SOURCES = orcus_env_dump.cpp ++orcus_env_dump_LDADD = \ ++ parser/liborcus-parser-@ORCUS_API_VERSION@.la \ ++ liborcus/liborcus-@ORCUS_API_VERSION@.la ++orcus_env_dump_CPPFLAGS = -I$(top_builddir)/lib/liborcus/liborcus.la $(AM_CPPFLAGS) ++ + + TESTS = \ + orcus-test-xml \ +@@ -136,16 +146,6 @@ orcus_detect_CPPFLAGS = -I$(top_builddir)/lib/liborcus/liborcus.la $(AM_CPPFLAGS + + #---------------------------------------------------------------------------- + +-# orcus-env-dump +- +-orcus_env_dump_SOURCES = orcus_env_dump.cpp +-orcus_env_dump_LDADD = \ +- parser/liborcus-parser-@ORCUS_API_VERSION@.la \ +- liborcus/liborcus-@ORCUS_API_VERSION@.la +-orcus_env_dump_CPPFLAGS = -I$(top_builddir)/lib/liborcus/liborcus.la $(AM_CPPFLAGS) +- +-#---------------------------------------------------------------------------- +- + if BUILD_SPREADSHEET_MODEL + + orcus_json_LDADD += \ diff --git a/dev-libs/liborcus/liborcus-0.16.1.ebuild b/dev-libs/liborcus/liborcus-0.16.1.ebuild index 11e425439697..18b38d862e5e 100644 --- a/dev-libs/liborcus/liborcus-0.16.1.ebuild +++ b/dev-libs/liborcus/liborcus-0.16.1.ebuild @@ -4,7 +4,8 @@ EAPI=7 PYTHON_COMPAT=( python3_{8..10} ) -inherit python-single-r1 + +inherit autotools python-single-r1 DESCRIPTION="Standalone file import filter library for spreadsheet documents" HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md" @@ -12,7 +13,7 @@ HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md" if [[ ${PV} == *9999* ]]; then MDDS_SLOT="1/9999" EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git" - inherit git-r3 autotools + inherit git-r3 else MDDS_SLOT="1/1.5" SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz" @@ -21,9 +22,10 @@ fi LICENSE="MIT" SLOT="0/0.16" # based on SONAME of liborcus.so -IUSE="python +spreadsheet-model tools" +IUSE="python +spreadsheet-model test tools" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +RESTRICT="!test? ( test )" RDEPEND=" dev-libs/boost:=[zlib(+)] @@ -42,8 +44,11 @@ pkg_setup() { } src_prepare() { + # bug 713586 + use test && eapply "${FILESDIR}/${PN}-0.17.0-test-fix.patch" + default - [[ ${PV} == *9999 ]] && eautoreconf + eautoreconf } src_configure() {