diff options
author | orbea <orbea@riseup.net> | 2024-02-22 18:38:00 -0800 |
---|---|---|
committer | Joonas Niilola <juippis@gentoo.org> | 2024-03-16 10:49:42 +0200 |
commit | 8eeaef45031ca39c281da6fab5cb8e006e125ab5 (patch) | |
tree | 3cbdf0d6808dc8c5f85ae886db0e6acc707561a8 /dev-libs/kpathsea | |
parent | */*: Take over waebbl's packages (diff) | |
download | gentoo-8eeaef45031ca39c281da6fab5cb8e006e125ab5.tar.gz gentoo-8eeaef45031ca39c281da6fab5cb8e006e125ab5.tar.bz2 gentoo-8eeaef45031ca39c281da6fab5cb8e006e125ab5.zip |
dev-libs/kpathsea: fix test with slibtool
Closes: https://bugs.gentoo.org/924405
Upstream-PR: https://github.com/TeX-Live/texlive-source/pull/65
Upstream-Commit: https://github.com/TeX-Live/texlive-source/commit/9c4aec9b1b85f3f0e336914d65d55ca6263c5526
Signed-off-by: orbea <orbea@riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/35494
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'dev-libs/kpathsea')
-rw-r--r-- | dev-libs/kpathsea/files/kpathsea-6.3.3_p20210325-Fix-slibtool-test.patch | 47 | ||||
-rw-r--r-- | dev-libs/kpathsea/kpathsea-6.3.3_p20210325-r1.ebuild | 3 |
2 files changed, 49 insertions, 1 deletions
diff --git a/dev-libs/kpathsea/files/kpathsea-6.3.3_p20210325-Fix-slibtool-test.patch b/dev-libs/kpathsea/files/kpathsea-6.3.3_p20210325-Fix-slibtool-test.patch new file mode 100644 index 000000000000..39a7fafb6fda --- /dev/null +++ b/dev-libs/kpathsea/files/kpathsea-6.3.3_p20210325-Fix-slibtool-test.patch @@ -0,0 +1,47 @@ +https://bugs.gentoo.org/924405 +https://github.com/TeX-Live/texlive-source/pull/65 +https://github.com/TeX-Live/texlive-source/commit/9c4aec9b1b85f3f0e336914d65d55ca6263c5526 + +From 9c4aec9b1b85f3f0e336914d65d55ca6263c5526 Mon Sep 17 00:00:00 2001 +From: Karl Berry <karl@freefriends.org> +Date: Thu, 22 Feb 2024 23:41:54 +0000 +Subject: [PATCH] make kpsereadlink.test generic, instead of depending on + libtool + +git-svn-id: svn://tug.org/texlive/trunk/Build/source@70081 c570f23f-e606-0410-a88d-b1316a301751 +--- + texk/kpathsea/tests/kpsereadlink.test | 17 +++++++++++++---- + 1 files changed, 13 insertions(+), 4 deletions(-) + +diff --git a/tests/kpsereadlink.test b/tests/kpsereadlink.test +index 3b3570aa8d..2e1a852494 100755 +--- a/tests/kpsereadlink.test ++++ b/tests/kpsereadlink.test +@@ -1,14 +1,23 @@ + #! /bin/sh -vx + # $Id$ +-# Copyright 2017 Karl Berry <tex-live@tug.org> ++# Copyright 2017-2024 Karl Berry <tex-live@tug.org> + # Copyright 2010 Peter Breitenlohner <tex-live@tug.org> + # You may freely use, modify and/or distribute this file. + ++test -n "$LN_S" || LN_S="ln -s" # standalone testing ++ + test "x$LN_S" = 'xln -s' || exit 77 + +-./kpsereadlink $LT_OBJDIR/libkpathsea.lai && exit 1 ++rm -f readlink_test_file readlink_test_symlink ++ ++touch readlink_test_file ++ ++$LN_S readlink_test_file readlink_test_symlink || exit 1 ++ ++./kpsereadlink readlink_test_file && exit 1 + +-link=`./kpsereadlink $LT_OBJDIR/libkpathsea.la` || exit 1 ++link=`./kpsereadlink readlink_test_symlink` || exit 1 + +-test "x$link" = x../libkpathsea.la || exit 1 ++test "x$link" = xreadlink_test_file || exit 1 + ++rm -f readlink_test_file readlink_test_symlink diff --git a/dev-libs/kpathsea/kpathsea-6.3.3_p20210325-r1.ebuild b/dev-libs/kpathsea/kpathsea-6.3.3_p20210325-r1.ebuild index e848216c3fca..5109ca86e025 100644 --- a/dev-libs/kpathsea/kpathsea-6.3.3_p20210325-r1.ebuild +++ b/dev-libs/kpathsea/kpathsea-6.3.3_p20210325-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -37,6 +37,7 @@ TEXMF_PATH=/usr/share/texmf-dist PATCHES=( "${FILESDIR}"/${PN}-6.3.3_p20210325-Fix-Wimplicit-function-declaration.patch + "${FILESDIR}"/${PN}-6.3.3_p20210325-Fix-slibtool-test.patch #924405 ) src_prepare() { |