commit: a87d437e3c34b8a0fe2bd0a4d61b73085152148b Author: Quincy Fleming <quincyf467 <AT> protonmail <DOT> com> AuthorDate: Thu May 16 16:42:59 2024 +0000 Commit: Julien Roy <julien <AT> jroy <DOT> ca> CommitDate: Thu May 16 16:44:13 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a87d437e
dev-libs/xqilla: respect user LDFLAGS Closes: https://bugs.gentoo.org/780945 Signed-off-by: Quincy Fleming <quincyf467 <AT> protonmail.com> ...illa-2.3.4-r1.ebuild => xqilla-2.3.4-r2.ebuild} | 15 +++++++++- dev-libs/xqilla/xqilla-2.3.4.ebuild | 33 ---------------------- 2 files changed, 14 insertions(+), 34 deletions(-) diff --git a/dev-libs/xqilla/xqilla-2.3.4-r1.ebuild b/dev-libs/xqilla/xqilla-2.3.4-r2.ebuild similarity index 71% rename from dev-libs/xqilla/xqilla-2.3.4-r1.ebuild rename to dev-libs/xqilla/xqilla-2.3.4-r2.ebuild index da57ec1919..d603cb8767 100644 --- a/dev-libs/xqilla/xqilla-2.3.4-r1.ebuild +++ b/dev-libs/xqilla/xqilla-2.3.4-r2.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="An XQuery and XPath 2 library and command line utility written in C HOMEPAGE="https://sourceforge.net/projects/xqilla/"; SRC_URI="https://downloads.sourceforge.net/${PN}/XQilla-${PV}.tar.gz"; -S="${WORKDIR}"/XQilla-${PV} +S="${WORKDIR}/XQilla-${PV}" LICENSE="Apache-2.0" SLOT="0" @@ -31,3 +31,16 @@ src_configure() { --with-tidy=$(usex tidy /usr no) \ --with-xerces=/usr } + +src_compile() { + emake "LDFLAGS=${LDFLAGS} -lxerces-c -lnsl -lpthread $(usex tidy -ltidy '')" +} + +src_install() { + emake prefix="${EPREFIX}/usr" DESTDIR="${D}" install + if ! use static-libs; then + find "${ED}" -type f -iname '*.la' -delete || die + fi + einstalldocs + dodoc LICENSE +} diff --git a/dev-libs/xqilla/xqilla-2.3.4.ebuild b/dev-libs/xqilla/xqilla-2.3.4.ebuild deleted file mode 100644 index b3e9f6e218..0000000000 --- a/dev-libs/xqilla/xqilla-2.3.4.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="An XQuery and XPath 2 library and command line utility written in C++" -HOMEPAGE="https://sourceforge.net/projects/xqilla/"; -SRC_URI="https://downloads.sourceforge.net/${PN}/XQilla-${PV}.tar.gz"; - -S="${WORKDIR}"/XQilla-${PV} - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="static-libs tidy" - -DEPEND=">=dev-libs/xerces-c-3.2.1 tidy? ( app-text/htmltidy )" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/lib_to_lib64.patch -) - -src_prepare() { - eapply -p1 "${FILESDIR}/lib_to_lib64.patch" - eapply_user - sed -i 's/buffio.h/tidybuffio.h/g' src/functions/FunctionParseHTML.cpp || die "sed failed" -} -src_configure() { - econf $(use_enable static-libs static) \ - --with-tidy=$(usex tidy /usr no) \ - --with-xerces=/usr -}
