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 A34B5158011 for ; Fri, 15 Jul 2022 01:26:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 87113E113E; Fri, 15 Jul 2022 01:26:32 +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 68B59E113E for ; Fri, 15 Jul 2022 01:26:32 +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 78264340AB2 for ; Fri, 15 Jul 2022 01:26:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 95A4153E for ; Fri, 15 Jul 2022 01:26:28 +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: <1657848133.62e58857f57d69293d98d6c8cb852acbd6414f98.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/uulib/files/, dev-libs/uulib/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/uulib/files/uulib-0.5.20-libtool.patch dev-libs/uulib/uulib-0.5.20-r2.ebuild X-VCS-Directories: dev-libs/uulib/ dev-libs/uulib/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 62e58857f57d69293d98d6c8cb852acbd6414f98 X-VCS-Branch: master Date: Fri, 15 Jul 2022 01:26:28 +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: acab838a-a3a6-40b3-b784-89f939c861e8 X-Archives-Hash: 6964a895348b08c1c44819b6b059d696 commit: 62e58857f57d69293d98d6c8cb852acbd6414f98 Author: orbea riseup net> AuthorDate: Thu Jul 14 06:21:27 2022 +0000 Commit: Sam James gentoo org> CommitDate: Fri Jul 15 01:22:13 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62e58857 dev-libs/uulib: Fix the build with rlibtool This reimplements the shared patch to correctly use libtool and allow the build to succeed with rlibtool which requires LT_INIT to generate libtool in the build directory. This is then used to determine is the build should be shared, static or both. Bug: https://bugs.gentoo.org/780018 Signed-off-by: orbea riseup.net> Closes: https://github.com/gentoo/gentoo/pull/26396 Signed-off-by: Sam James gentoo.org> dev-libs/uulib/files/uulib-0.5.20-libtool.patch | 122 ++++++++++++++++++++++++ dev-libs/uulib/uulib-0.5.20-r2.ebuild | 31 ++++++ 2 files changed, 153 insertions(+) diff --git a/dev-libs/uulib/files/uulib-0.5.20-libtool.patch b/dev-libs/uulib/files/uulib-0.5.20-libtool.patch new file mode 100644 index 000000000000..55df73c03ac8 --- /dev/null +++ b/dev-libs/uulib/files/uulib-0.5.20-libtool.patch @@ -0,0 +1,122 @@ +Modified from: PDL Linux +https://raw.githubusercontent.com/pld-linux/uudeview/master/uudeview-shared.patch +https://github.com/pld-linux/uudeview + +Bug: https://bugs.gentoo.org/780018 + +From: orbea +Date: Wed, 13 Jul 2022 22:17:55 -0700 +Subject: [PATCH] Use libtool + +diff --git a/Makefile.in b/Makefile.in +index 951c731..342bf56 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -25,6 +25,10 @@ CC = @CC@ + # + CFLAGS = @CFLAGS@ -I. @CPPFLAGS@ @DEFS@ + # ++# the libtool program ++# ++LIBTOOL = @LIBTOOL@ ++# + # the ranlib program + # + RANLIB = @RANLIB@ +@@ -40,9 +44,15 @@ PATCH = @PATCH@ + VDEF = -DVERSION=\"$(VERSION)\" -DPATCH=\"$(PATCH)\" + # + ++top_builddir = @top_builddir@ ++ ++prefix = @prefix@ ++libdir = @libdir@ ++includedir = @includedir@ ++ + UULIB_SOURCE = uulib.c uucheck.c uunconc.c uuutil.c uuencode.c \ + uuscan.c uustring.c fptools.c crc32.c +-UULIB_OBJ = ${UULIB_SOURCE:.c=.o} ++UULIB_OBJ = ${UULIB_SOURCE:.c=.lo} + + # + # make stuff +@@ -51,11 +61,11 @@ UULIB_OBJ = ${UULIB_SOURCE:.c=.o} + .SUFFIXES: + .SUFFIXES: .c .o + +-all: libuu.a ++all: libuu.la + + clean: + rm -f [Xx]deview gif2gfp +- rm -f *.o *.a *.so core *~ TAGS ++ rm -f *.o *.a *.so core *~ TAGS *.lo *.la + + distclean: clean + rm -f config.status config.cache config.log Makefile config.h +@@ -67,22 +77,25 @@ new: clean + rm -f libuu.a + $(MAKE) all + +-libuu.a: $(UULIB_OBJ) +- rm -f $@ +- ar r $@ $(UULIB_OBJ) +- -$(RANLIB) $@ ++libuu.la: $(UULIB_OBJ) ++ $(LIBTOOL) --mode=link $(CC) -o libuu.la $(LDFLAGS) $(UULIB_OBJ) -rpath $(libdir) ++ ++%.lo : %.c ++ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(VDEF) $< + +-.c.o: +- $(CC) -c $(CFLAGS) $(VDEF) $< ++install: libuu.la ++ mkdir -p $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) ++ $(LIBTOOL) --mode=install install libuu.la $(DESTDIR)$(libdir) ++ cp uudeview.h fptools.h $(DESTDIR)$(includedir) + +-uuencode.o: uuencode.c uudeview.h uuint.h uustring.h fptools.h config.h +-uulib.o: uulib.c uudeview.h uuint.h uustring.h fptools.h config.h +-uunconc.o: uunconc.c uudeview.h uuint.h uustring.h fptools.h config.h +-uucheck.o: uucheck.c uudeview.h uuint.h uustring.h fptools.h config.h +-uuutil.o: uuutil.c uudeview.h uuint.h uustring.h fptools.h config.h +-uuscan.o: uuutil.c uudeview.h uuint.h uustring.h fptools.h config.h +-uustring.o: uustring.c uudeview.h uuint.h uustring.h config.h +-fptools.o: fptools.c fptools.h config.h ++uuencode.lo: uuencode.c uudeview.h uuint.h uustring.h fptools.h config.h ++uulib.lo: uulib.c uudeview.h uuint.h uustring.h fptools.h config.h ++uunconc.lo: uunconc.c uudeview.h uuint.h uustring.h fptools.h config.h ++uucheck.lo: uucheck.c uudeview.h uuint.h uustring.h fptools.h config.h ++uuutil.lo: uuutil.c uudeview.h uuint.h uustring.h fptools.h config.h ++uuscan.lo: uuutil.c uudeview.h uuint.h uustring.h fptools.h config.h ++uustring.lo: uustring.c uudeview.h uuint.h uustring.h config.h ++fptools.lo: fptools.c fptools.h config.h + + uustring.h: uustring.c + awk -f uustring.awk < uustring.c > uustring.h +diff --git a/configure.in b/configure.in +index ef00d18..563c77d 100644 +--- a/configure.in ++++ b/configure.in +@@ -8,6 +8,8 @@ dnl + + AC_INIT(uulib.c) + AC_PREREQ(2.9) ++AC_CONFIG_AUX_DIR([.]) ++AC_CONFIG_MACRO_DIR([m4]) + AC_CONFIG_HEADER(config.h) + + # +@@ -20,7 +22,7 @@ AC_PROG_CC + AC_PROG_CPP + wi_PROTOTYPES + AC_PROG_MAKE_SET +-AC_PROG_RANLIB ++LT_INIT + + if test "$wi_cv_prototypes" = no ; then + AC_WARN([Your compiler does not support function prototyping and]) +diff --git a/aclocal.m4 b/m4/uulib.m4 +similarity index 100% +rename from aclocal.m4 +rename to m4/uulib.m4 diff --git a/dev-libs/uulib/uulib-0.5.20-r2.ebuild b/dev-libs/uulib/uulib-0.5.20-r2.ebuild new file mode 100644 index 000000000000..7fb2f06b6273 --- /dev/null +++ b/dev-libs/uulib/uulib-0.5.20-r2.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +MY_P=uudeview-${PV} + +DESCRIPTION="Library that supports Base64 (MIME), uuencode, xxencode and binhex coding" +HOMEPAGE="http://www.fpx.de/fp/Software/UUDeview/" +SRC_URI="http://www.fpx.de/fp/Software/UUDeview/download/${MY_P}.tar.gz" +S="${WORKDIR}"/${MY_P}/${PN} + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +PATCHES=( + "${FILESDIR}"/${P}-libtool.patch # 780018 +) + +src_prepare() { + default + eautoreconf +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die +}