diff options
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/Manifest.gz | bin | 94992 -> 94996 bytes | |||
-rw-r--r-- | dev-libs/libtpms/Manifest | 3 | ||||
-rw-r--r-- | dev-libs/libtpms/files/libtpms-0.9.5-slibtool.patch | 52 | ||||
-rw-r--r-- | dev-libs/libtpms/libtpms-0.9.5.ebuild | 1 | ||||
-rw-r--r-- | dev-libs/libvterm/Manifest | 4 | ||||
-rw-r--r-- | dev-libs/libvterm/files/libvterm-0.1.4-slibtool.patch | 98 | ||||
-rw-r--r-- | dev-libs/libvterm/files/libvterm-0.2-slibtool.patch | 103 | ||||
-rw-r--r-- | dev-libs/libvterm/libvterm-0.1.4-r1.ebuild | 37 | ||||
-rw-r--r-- | dev-libs/libvterm/libvterm-0.2-r1.ebuild | 40 |
9 files changed, 337 insertions, 1 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz Binary files differindex 25681113676a..2c60c9550a69 100644 --- a/dev-libs/Manifest.gz +++ b/dev-libs/Manifest.gz diff --git a/dev-libs/libtpms/Manifest b/dev-libs/libtpms/Manifest index f8f60df4a867..872e69e292fa 100644 --- a/dev-libs/libtpms/Manifest +++ b/dev-libs/libtpms/Manifest @@ -1,6 +1,7 @@ AUX libtpms-0.9.0-Remove-WError.patch 508 BLAKE2B 33178598a1fef1189039c30814996f00ec37215b3f10a0ff9df521a866147b2a6844d86c3b372e450f701e6e2ae3e587443765c39848076536861342e5b42d63 SHA512 e0d55045bcb667278dc1ae1c509b7be466f23421683f8b0b7c830d724f83b1923b09a61f2a8e649e08150d1d313f0456cfc5f5a1b5fe3bf168565e443595dd12 +AUX libtpms-0.9.5-slibtool.patch 1981 BLAKE2B fa4adf1c063d24a2550f964dcaae1ea2e2d93f7d2704bc00e29ef22ceecaaf214860e82e668e1358854482fcf3ba1af89745422657763b7683a232f7e286ac7e SHA512 4b8eebc895ce6941a3ad5995ee0d5f1b1537861700878fa1ce0a95ec37ee1d51354782da4bb2feeedc1c5871aa62ec248484b409c6109bed95cf73962ff8b206 DIST libtpms-0.9.4.tar.gz 1264030 BLAKE2B 56731b913145afcd49fae13f0fcbe4fc147edf206a44849cef45ed34a7644f0894bb6ab5dcb72d620eb1ab121bf4e821fe7893557508af394585171133d659e2 SHA512 ae3e2613bc31d98c10def546c70d0c25bd1246af5090268afa0411502bfd0e454967046ebcd9025350976817441e595fa4e21562f800285db98331e4c2743505 DIST libtpms-0.9.5.tar.gz 1264086 BLAKE2B 3e6da08dd31414bdf19260f47fce6ba7ace0ae72b152b681f1c1fbc9d75b7708238e5c2a161827c7a6e2b9a6ae4786dfbf921ec37b9f0b7c044835c974a111a3 SHA512 96b8d6dd66a6c4bc7b72d172d0b75444c7725a7fb5b0f792cd1cff9d8f7ec894c51e94493816f033198cc8adf2f95cf473629431dadb70b423068d834de09e21 EBUILD libtpms-0.9.4.ebuild 1299 BLAKE2B 6c78609afdc5385a842da2f415ef918475baab3da737cb2e43c72cf5d2aaa382dd84b4157e4b52aa7fa5f44de6db48b37f680897baabb006d923589d4ca39552 SHA512 f54857978f2f4d021055406f2f2f480f3df97ca57cf29b1967389107079cbe37551ac8717c03fdbf38cb4aa64b5567a87f27bd2ed46edd0243d076c06689f3b1 -EBUILD libtpms-0.9.5.ebuild 1304 BLAKE2B a59602976b1c6564c1a75dd97418dc35c9537e4adc997e8a6ac63ec833a9d8d4e154425d9ea82311cbadade514a26a60e8c5b7ae2008f434c1b9ee0568c239b8 SHA512 59fe0fa80df39422df62858552384ae88613a7d037ec1ac9de3687d80959903a3d422c11fd6f6ac196eab9d75573003ca9f2adca59d28f1034e8d7a619b43d31 +EBUILD libtpms-0.9.5.ebuild 1355 BLAKE2B 5ebf0b1933ea18d93eaf81f76dc6edfecbdc1860db0487df425e30a2464eaf7f691f6e99c15fcc460dd16a2670587dbc86084de55db961a0d6eede12474e826d SHA512 652400488933cc1c96cc610f2da96e5846fa1fd8b74b573d778277f68abb5a0991fd9d56f574404b3a8a2653dcffa6f4b87813abe7ee62abdb6950fdd69853d7 MISC metadata.xml 536 BLAKE2B 75236814e21cb3e98feaa2646ccf680973a71e168d5ccd95cdd12f06214a1b18454cb40b1825df9335e3c4881b7d8d3cffdf03c48dcedd99da4a0dd50d81fe1b SHA512 3abebe84fc62f5082d22e0a3d146a22e7e799d0b1d0f3cfa282aac408ca8c0b8f396f7b081c92aec290037bb7405e672ce7f6f4f8da5b1966a0b4eda8005d721 diff --git a/dev-libs/libtpms/files/libtpms-0.9.5-slibtool.patch b/dev-libs/libtpms/files/libtpms-0.9.5-slibtool.patch new file mode 100644 index 000000000000..7e83434db151 --- /dev/null +++ b/dev-libs/libtpms/files/libtpms-0.9.5-slibtool.patch @@ -0,0 +1,52 @@ +Bug: https://bugs.gentoo.org/858671 +Upstream-PR: https://github.com/stefanberger/libtpms/pull/344 +Upstream-Commit: https://github.com/stefanberger/libtpms/commit/0c2bc32a21e2c7218faa8cd6d5cf31b13835e6d5 + +From 343f1b21b36fe98daf31c355ebc12902ba7e162a Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Fri, 15 Jul 2022 17:02:43 -0700 +Subject: [PATCH] tests: Fix the build with slibtool + +When building the tests with `make check` and slibtool the tests will +then all fail to load libtpms.so.0. + + $ ./base64decode + /tmp/libtpms/tests/.libs/base64decode: error while loading shared libraries: libtpms.so.0: cannot open shared object file: No such file or directory + +This happens because they are linked with -ltpms rather than the +libtpms.la file which has unexpected results with slibtool. GNU libtool +does some magic to make this work while slibtool fails to link the +dependency. + +The correct way to link internal dependencies is directly with the +libtool archive (.la) files where the -lfoo linker flags should be only +used with external dependencies. Additionally -no-undefined is added to +the LDFLAGS to ensure there aren't undefined references in the future. + +Note: + +* This doesn't happen if libtpms is installed to the system and the tests + find the already installs libtpms rather than the newly built library. + +* GNU libtool silently ignores -no-undefined, but slibtool will respect + it. + +Signed-off-by: orbea <orbea@riseup.net> +--- + tests/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index eb23c59a4..d3d831938 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -10,7 +10,8 @@ TESTS_ENVIRONMENT = \ + abs_top_srcdir=`cd '$(top_srcdir)'; pwd` + + AM_CFLAGS = -I$(top_srcdir)/include $(SANITIZERS) +-AM_LDFLAGS = -ltpms -L$(top_builddir)/src/.libs $(SANITIZERS) ++AM_LDFLAGS = -no-undefined $(SANITIZERS) ++LDADD = $(top_builddir)/src/libtpms.la + + check_PROGRAMS = \ + base64decode diff --git a/dev-libs/libtpms/libtpms-0.9.5.ebuild b/dev-libs/libtpms/libtpms-0.9.5.ebuild index fc15af9bf0f4..4db20b1b4c77 100644 --- a/dev-libs/libtpms/libtpms-0.9.5.ebuild +++ b/dev-libs/libtpms/libtpms-0.9.5.ebuild @@ -18,6 +18,7 @@ BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}/${PN}-0.9.0-Remove-WError.patch" + "${FILESDIR}/${PN}-0.9.5-slibtool.patch" # 858671 ) src_prepare() { diff --git a/dev-libs/libvterm/Manifest b/dev-libs/libvterm/Manifest index 10895f291f07..0ed856989919 100644 --- a/dev-libs/libvterm/Manifest +++ b/dev-libs/libvterm/Manifest @@ -1,5 +1,9 @@ +AUX libvterm-0.1.4-slibtool.patch 2251 BLAKE2B d8484447c8a7e352514b298634d3e39bf606a5669cda67ef906f29b4a411737d81277e060fdd01cb14d1d04d329af1207dbeee475baff5cabc7afe9b5573ac78 SHA512 dd8d3b8c192bd6f6b357f7c5849a0b2a94661410e7f3cf5f6301a3cd34884362a54dc3ac593895f186ce3ce3628c2a8804f555107fb57d9a82a91ddd8cdca39e +AUX libvterm-0.2-slibtool.patch 2328 BLAKE2B 9a03c8fae1228e07eb7245c06f46fe489760a6c2e4b183fa27444169254369f8ce71e27b011b9b6370eed6422d04993f0bdf3662266ac5f88e16d567aec55230 SHA512 fc714e88f3dcbaf48667e49377639ed2d58bdc9000b1f909108ee6d98dbdadd390f6b66f311524a57ce2ca83488d3d745e431816b572cdd73f9d63714eb85d16 DIST libvterm-0.1.4.tar.gz 69122 BLAKE2B 4f0acc9ec6755c4a840e5df6c32c44e12c5316b5c5918d0e8eada19d819736c3e5b9090b468e32b3141a7fbb5ba226e365be27d6d1d9ca22f9f5e365fc3971c2 SHA512 90b5d47417e3f469df5c6574a27d12bd6bd1571d17cab7c4ac0ee61b1dbcb6361987f6fdfd11e314ea32f8958ec165c319a34d0f77288947c7cbc11de697d524 DIST libvterm-0.2.tar.gz 79712 BLAKE2B db17d15550a595652368edd7ee0ccab2a69effa79677a23d6ee94731fc05d685df0de843d2e953cd59d2077922e72834d7ab09eaf5260aed869d9511cfd224a7 SHA512 bc99ae4fbdc165ced92c10fb0168ae6da2ed702208064616fefcd42aba71c57b7d42a08bc5b0e7e1ebda8cc4b5682d16059bdd2edfb12fbd8ac97527e854b14c +EBUILD libvterm-0.1.4-r1.ebuild 728 BLAKE2B 463cd2bf20ef1c8eba98789969bb2dab24599a2923c13e204d73ddbe407cd957ed37938f388603b4a542b71b369eed2aab249f3061c0c7b417f1e365b4fd5085 SHA512 45bdbde642172c252b94375f44207a1a011cdc5fd36a2330ced3434c9059dcb27277f076ba5d82542b7851f4699f3f673da3c85295c0e4c2ef1cfd77050f3f05 EBUILD libvterm-0.1.4.ebuild 882 BLAKE2B e4f2e22e191ce35883e9fa2700222e55b8c5d482251aa5dd9f35d982fa18d20371ff3781a5962a07aeade487ee0c0e4df474023894c035154aa79425e477dc81 SHA512 70201223cdcad83064d87b949525040294d925002e4b12faf318353a211171a596d3992413731c8d71b377bc866095d9811a4bb110d03b414022b1bcf64b33e3 +EBUILD libvterm-0.2-r1.ebuild 941 BLAKE2B af9950eb2c5ecad18c968814394ffac2cebb41199df8b06f208ca58594a884f6b95f3f62c9ca2d42313998b4181aa2852cfd0aee43da9eedfed4d18e62d4a19b SHA512 d9d6fd02caf0e0541ccd74f2690237216664c5d6a6eea928b2c6b4c4a88ab89ae80f7ca7737cb82295213f1dfcbb9d8b743cb96b6afb9d24e4137806166073e5 EBUILD libvterm-0.2.ebuild 1098 BLAKE2B afaf31a7a3da3eb8817b796f70d8388a26f8006bbbed97d4906ff365e5f81864be7009e91c94aebfa0c76b56f396e7f3d58920733ad0108578b4acf9834be6c0 SHA512 ad3e3b00c078bf7d59682e8072058223cae92251e7fdbf9095efd37c4b4555a0c1da2f21f8712a4f712c17e8f3a0ba47001d9e5e9f8220e930f6496e1e455613 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a diff --git a/dev-libs/libvterm/files/libvterm-0.1.4-slibtool.patch b/dev-libs/libvterm/files/libvterm-0.1.4-slibtool.patch new file mode 100644 index 000000000000..75d6a8e763ac --- /dev/null +++ b/dev-libs/libvterm/files/libvterm-0.1.4-slibtool.patch @@ -0,0 +1,98 @@ +From: orbea <orbea@riseup.net> +Date: Wed, 20 Jul 2022 07:45:38 -0700 +Subject: [PATCH] build: Add a minimal configures script + +When building libvterm with slibtool using the rlibtool symlink the +build will fail when the generated libtool is not found. This file is +required with rlibtool so that the build can determine if the build +should be shared, static or both. + +This can be solved by adding a minimal configure script. + +The build steps are now: + +autoreconf -fi +./configure +make +make install + +Gentoo Bug: https://bugs.gentoo.org/779034 + +diff --git a/Makefile b/Makefile.in +similarity index 89% +rename from Makefile +rename to Makefile.in +index 3330703..8a170c7 100644 +--- a/Makefile ++++ b/Makefile.in +@@ -1,13 +1,13 @@ +-ifeq ($(shell uname),Darwin) +- LIBTOOL ?= glibtool +-else +- LIBTOOL ?= libtool +-endif ++top_builddir = @top_builddir@ ++ ++LIBTOOL = @LIBTOOL@ + + ifneq ($(VERBOSE),1) + LIBTOOL +=--quiet + endif + ++CC = @CC@ ++ + override CFLAGS +=-Wall -Iinclude -std=c99 -Wpedantic + + ifeq ($(shell uname),SunOS) +@@ -40,13 +40,14 @@ VERSION_CURRENT=0 + VERSION_REVISION=4 + VERSION_AGE=0 + +-VERSION=0.1.4 ++VERSION=@PACKAGE_VERSION@ + +-PREFIX=/usr/local +-BINDIR=$(PREFIX)/bin +-LIBDIR=$(PREFIX)/lib +-INCDIR=$(PREFIX)/include +-MANDIR=$(PREFIX)/share/man ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++BINDIR=@bindir@ ++LIBDIR=@libdir@ ++INCDIR=@includedir@ ++MANDIR=@mandir@ + MAN3DIR=$(MANDIR)/man3 + + all: $(LIBRARY) $(BINFILES) +@@ -70,7 +71,7 @@ src/encoding.lo: $(INCFILES) + + bin/%: bin/%.c $(LIBRARY) + @echo CC $< +- @$(LIBTOOL) --mode=link --tag=CC $(CC) $(CFLAGS) -o $@ $< -lvterm $(LDFLAGS) ++ @$(LIBTOOL) --mode=link --tag=CC $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) + + t/harness.lo: t/harness.c $(HFILES) + @echo CC $< +diff --git a/configure.ac b/configure.ac +new file mode 100644 +index 0000000..c3d758e +--- /dev/null ++++ b/configure.ac +@@ -0,0 +1,16 @@ ++m4_define([version_major], [0]) ++m4_define([version_minor], [1]) ++m4_define([version_patch], [4]) ++ ++AC_INIT([libvterm], [version_major.version_minor.version_patch]) ++AC_CONFIG_FILES([Makefile]) ++ ++LT_INIT ++ ++AC_SUBST([top_builddir], [$abs_builddir]) ++ ++AC_SUBST([VERSION_MAJOR], [version_major]) ++AC_SUBST([VERSION_MINOR], [version_minor]) ++AC_SUBST([VERSION_PATCH], [version_patch]) ++ ++AC_OUTPUT diff --git a/dev-libs/libvterm/files/libvterm-0.2-slibtool.patch b/dev-libs/libvterm/files/libvterm-0.2-slibtool.patch new file mode 100644 index 000000000000..5f6356da2761 --- /dev/null +++ b/dev-libs/libvterm/files/libvterm-0.2-slibtool.patch @@ -0,0 +1,103 @@ +From: orbea <orbea@riseup.net> +Date: Thu, 14 Jul 2022 13:18:26 -0700 +Subject: [PATCH] build: Add a minimal configures script + +When building libvterm with slibtool using the rlibtool symlink the +build will fail when the generated libtool is not found. This file is +required with rlibtool so that the build can determine if the build +should be shared, static or both. + +This can be solved by adding a minimal configure script. + +The build steps are now: + +autoreconf -fi +./configure +make +make install + +diff --git a/Makefile b/Makefile.in +similarity index 90% +rename from Makefile +rename to Makefile.in +index e3c1c39..70e7ca2 100644 +--- a/Makefile ++++ b/Makefile.in +@@ -1,13 +1,13 @@ +-ifeq ($(shell uname),Darwin) +- LIBTOOL ?= glibtool +-else +- LIBTOOL ?= libtool +-endif ++top_builddir = @top_builddir@ ++ ++LIBTOOL = @LIBTOOL@ + + ifneq ($(VERBOSE),1) + LIBTOOL +=--quiet + endif + ++CC = @CC@ ++ + override CFLAGS +=-Wall -Iinclude -std=c99 -Wpedantic + + ifeq ($(shell uname),SunOS) +@@ -36,20 +36,21 @@ INCFILES=$(TBLFILES:.tbl=.inc) + + HFILES_INT=$(sort $(wildcard src/*.h)) $(HFILES) + +-VERSION_MAJOR=0 +-VERSION_MINOR=2 ++VERSION_MAJOR=@VERSION_MAJOR@ ++VERSION_MINOR=@VERSION_MINOR@ + + VERSION_CURRENT=0 + VERSION_REVISION=0 + VERSION_AGE=0 + +-VERSION=$(VERSION_MAJOR).$(VERSION_MINOR) ++VERSION=@PACKAGE_VERSION@ + +-PREFIX=/usr/local +-BINDIR=$(PREFIX)/bin +-LIBDIR=$(PREFIX)/lib +-INCDIR=$(PREFIX)/include +-MANDIR=$(PREFIX)/share/man ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++BINDIR=@bindir@ ++LIBDIR=@libdir@ ++INCDIR=@includedir@ ++MANDIR=@mandir@ + MAN3DIR=$(MANDIR)/man3 + + all: $(LIBRARY) $(BINFILES) +@@ -73,7 +74,7 @@ src/encoding.lo: $(INCFILES) + + bin/%: bin/%.c $(LIBRARY) + @echo CC $< +- @$(LIBTOOL) --mode=link --tag=CC $(CC) $(CFLAGS) -o $@ $< -lvterm $(LDFLAGS) ++ @$(LIBTOOL) --mode=link --tag=CC $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) + + t/harness.lo: t/harness.c $(HFILES) + @echo CC $< +diff --git a/configure.ac b/configure.ac +new file mode 100644 +index 0000000..39f7767 +--- /dev/null ++++ b/configure.ac +@@ -0,0 +1,14 @@ ++m4_define([version_major], [0]) ++m4_define([version_minor], [2]) ++ ++AC_INIT([libvterm], [version_major.version_minor]) ++AC_CONFIG_FILES([Makefile]) ++ ++LT_INIT ++ ++AC_SUBST([top_builddir], [$abs_builddir]) ++ ++AC_SUBST([VERSION_MAJOR], [version_major]) ++AC_SUBST([VERSION_MINOR], [version_minor]) ++ ++AC_OUTPUT diff --git a/dev-libs/libvterm/libvterm-0.1.4-r1.ebuild b/dev-libs/libvterm/libvterm-0.1.4-r1.ebuild new file mode 100644 index 000000000000..10402580dbb5 --- /dev/null +++ b/dev-libs/libvterm/libvterm-0.1.4-r1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator" +HOMEPAGE="https://www.leonerd.org.uk/code/libvterm/" +SRC_URI="https://www.leonerd.org.uk/code/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos" + +BDEPEND=" + dev-lang/perl + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${P}-slibtool.patch # 779034 +) + +src_prepare() { + default + eautoreconf +} + +src_compile() { + emake VERBOSE=1 +} + +src_install() { + emake VERBOSE=1 DESTDIR="${D}" install + find "${ED}" -name '*.la' -delete || die "Failed to prune libtool files" +} diff --git a/dev-libs/libvterm/libvterm-0.2-r1.ebuild b/dev-libs/libvterm/libvterm-0.2-r1.ebuild new file mode 100644 index 000000000000..3e8037c9ec7b --- /dev/null +++ b/dev-libs/libvterm/libvterm-0.2-r1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator" +HOMEPAGE="https://www.leonerd.org.uk/code/libvterm/" +SRC_URI="https://www.leonerd.org.uk/code/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +# Fedora have a revert patch for now: +# https://src.fedoraproject.org/rpms/libvterm/blob/rawhide/f/libvterm-0.2-fix-resize-buffer.patch +# so let's see if 0.2.1 is any better or if this is actually needed for us? +#KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos" + +BDEPEND=" + dev-lang/perl + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${P}-slibtool.patch # 779034 +) + +src_prepare() { + default + eautoreconf +} + +src_compile() { + emake VERBOSE=1 +} + +src_install() { + emake VERBOSE=1 DESTDIR="${D}" install + find "${ED}" -name '*.la' -delete || die "Failed to prune libtool files" +} |