summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authororbea <orbea@riseup.net>2023-09-07 10:46:42 -0700
committerSam James <sam@gentoo.org>2024-01-05 05:24:04 +0000
commit48e26c6f0926f88ab5dffd605a2d27bcbe0dbcee (patch)
tree74f356699ba7a7d251edc68363194e18fea98e97
parentapp-admin/awscli: Bump to 1.32.13 (diff)
downloadgentoo-48e26c6f0926f88ab5dffd605a2d27bcbe0dbcee.tar.gz
gentoo-48e26c6f0926f88ab5dffd605a2d27bcbe0dbcee.tar.bz2
gentoo-48e26c6f0926f88ab5dffd605a2d27bcbe0dbcee.zip
dev-libs/libtermkey: fix the build with rlibtool
Closes: https://bugs.gentoo.org/913482 Upstream-PR: https://github.com/neovim/libtermkey/pull/9 Signed-off-by: orbea <orbea@riseup.net> Closes: https://github.com/gentoo/gentoo/pull/32675 Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r--dev-libs/libtermkey/files/libtermkey-0.22-libtool.patch99
-rw-r--r--dev-libs/libtermkey/libtermkey-0.22-r2.ebuild48
2 files changed, 147 insertions, 0 deletions
diff --git a/dev-libs/libtermkey/files/libtermkey-0.22-libtool.patch b/dev-libs/libtermkey/files/libtermkey-0.22-libtool.patch
new file mode 100644
index 000000000000..d3d79ccc0c95
--- /dev/null
+++ b/dev-libs/libtermkey/files/libtermkey-0.22-libtool.patch
@@ -0,0 +1,99 @@
+Upstream is archived: https://github.com/neovim/libtermkey
+
+From f3316ec933d618352ee9c6b1f1ef354c8896372e Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Thu, 7 Sep 2023 09:52:10 -0700
+Subject: [PATCH] build: Add a minimal configure.ac
+
+When building with slibtool using the rlibtool symlink the build will
+fail when it fails to find the generated libtool. This is required so
+rlibtool can determine if it should build shared or static libraries.
+
+This can be fixed by adding a minimal configure.ac that can generate the
+required files with autoreconf.
+
+Gentoo Bug: https://bugs.gentoo.org/913482
+---
+ Makefile => Makefile.in | 29 +++++++++++++++--------------
+ configure.ac | 14 ++++++++++++++
+ 2 files changed, 29 insertions(+), 14 deletions(-)
+ rename Makefile => Makefile.in (91%)
+ create mode 100644 configure.ac
+
+diff --git a/Makefile b/Makefile.in
+similarity index 91%
+rename from Makefile
+rename to Makefile.in
+index 199f143..8f12b07 100644
+--- a/Makefile
++++ b/Makefile.in
+@@ -1,14 +1,10 @@
+ pkgconfig = $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config $(1))
+
+-ifeq ($(shell uname),Darwin)
+- LIBTOOL ?= glibtool
+-else
+- LIBTOOL ?= libtool
+-endif
++CC = @CC@
++LIBTOOL = @LIBTOOL@
+
+-ifneq ($(VERBOSE),1)
+- LIBTOOL +=--quiet
+-endif
++override CFLAGS = @CFLAGS@
++override LDFLAGS = @LDFLAGS@
+
+ override CFLAGS +=-Wall -std=c99
+
+@@ -48,8 +44,8 @@ DEMO_OBJECTS=$(DEMOS:=.lo)
+ TESTSOURCES=$(wildcard t/[0-9]*.c)
+ TESTFILES=$(TESTSOURCES:.c=.t)
+
+-VERSION_MAJOR=0
+-VERSION_MINOR=22
++VERSION_MAJOR=@MAJOR@
++VERSION_MINOR=@MINOR@
+
+ VERSION=$(VERSION_MAJOR).$(VERSION_MINOR)
+
+@@ -57,10 +53,15 @@ VERSION_CURRENT=15
+ VERSION_REVISION=2
+ VERSION_AGE=14
+
+-PREFIX=/usr/local
+-LIBDIR=$(PREFIX)/lib
+-INCDIR=$(PREFIX)/include
+-MANDIR=$(PREFIX)/share/man
++top_builddir=@top_builddir@
++
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++datarootdir=@datarootdir@
++datadir=@datadir@
++LIBDIR=@libdir@
++INCDIR=@includedir@
++MANDIR=@mandir@
+ MAN3DIR=$(MANDIR)/man3
+ MAN7DIR=$(MANDIR)/man7
+
+diff --git a/configure.ac b/configure.ac
+new file mode 100644
+index 0000000..46fe30e
+--- /dev/null
++++ b/configure.ac
+@@ -0,0 +1,14 @@
++m4_define([MAJOR], [0])
++m4_define([MINOR], [22])
++
++AC_INIT([libtermkey], [MAJOR.MINOR])
++AC_CONFIG_FILES([Makefile])
++
++LT_INIT
++
++AC_SUBST([top_builddir], [$abs_builddir])
++
++AC_SUBST([MAJOR], [MAJOR])
++AC_SUBST([MINOR], [MINOR])
++
++AC_OUTPUT
diff --git a/dev-libs/libtermkey/libtermkey-0.22-r2.ebuild b/dev-libs/libtermkey/libtermkey-0.22-r2.ebuild
new file mode 100644
index 000000000000..07357a00fd15
--- /dev/null
+++ b/dev-libs/libtermkey/libtermkey-0.22-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Library for easy processing of keyboard entry from terminal-based programs"
+HOMEPAGE="http://www.leonerd.org.uk/code/libtermkey/"
+SRC_URI="http://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+IUSE="demos"
+
+RDEPEND="dev-libs/unibilium:="
+DEPEND="
+ ${RDEPEND}
+"
+BDEPEND="
+ virtual/pkgconfig
+ demos? ( dev-libs/glib:2 )
+"
+
+PATCHES=(
+ "${FILESDIR}"/no-automagic-manpages-compress.patch
+ "${FILESDIR}"/${PN}-0.22-libtool.patch # 913482
+)
+
+src_prepare() {
+ default
+
+ if ! use demos; then
+ sed -e '/^all:/s:$(DEMOS)::' -i Makefile.in || die
+ fi
+
+ append-flags -fPIC
+
+ eautoreconf
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ find "${D}" -name '*.la' -delete || die
+ doman "${S}"/man/*.3
+ doman "${S}"/man/*.7
+}