Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/argp-standalone/, sys-libs/argp-standalone/files/
Date: Mon, 30 May 2022 16:38:47
Message-Id: 1653928719.6b2955f24cb027e3aa10e6dfde91d792a4b08a5c.blueness@gentoo
1 commit: 6b2955f24cb027e3aa10e6dfde91d792a4b08a5c
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 30 16:38:22 2022 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Mon May 30 16:38:39 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b2955f2
7
8 sys-libs/argp-standalone: bump to version 1.5.0
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
12
13 sys-libs/argp-standalone/Manifest | 1 +
14 .../argp-standalone/argp-standalone-1.5.0.ebuild | 42 +++++++++++++++++
15 .../files/argp-standalone-1.5.0-shared.patch | 53 ++++++++++++++++++++++
16 3 files changed, 96 insertions(+)
17
18 diff --git a/sys-libs/argp-standalone/Manifest b/sys-libs/argp-standalone/Manifest
19 index 1579c67dee13..7dd4ff4a8e5d 100644
20 --- a/sys-libs/argp-standalone/Manifest
21 +++ b/sys-libs/argp-standalone/Manifest
22 @@ -1,2 +1,3 @@
23 DIST argp-standalone-1.3.tar.gz 130255 BLAKE2B 0848a0e7a98cfa09de52fa152eb9a793a9bf25c1edfc7401851ef134b62c051ad6ef2134d6f528e167046be582be23f311e74614c5511d659060addc14de6b2f SHA512 58c3feb8852b90248fff39e49b5019bd0dcf646790c3eaf70c3262eb81dda31a61dc0a45963c7b4a010e80fc14b37288dcb3b3ef48d02f2d33dd72c1c62e62d9
24 DIST argp-standalone-1.4.1.tar.gz 58158 BLAKE2B aa55965d6c4a9d61e82a5f3af7a62bf1a35b82ad91c87b4b31a6fa314ba0bcf30667137b420ccae5fbe24301c994971ef48c8dfa4db48620e56edc4300fbd961 SHA512 c5f07e88434589a13a2e88e66d1142b581f19aa82da28507f3c31ea782e080a13a4504d8108c003b5d3c8a3aa20f52ea5e81f337c11a4b1342b16361d4877c1c
25 +DIST argp-standalone-1.5.0.tar.gz 65889 BLAKE2B 01f4ceb3ad18be534605db09db708f17ab5df6bfd8fc0259451a70163c8e9bda92c4f9445e98d6b6cc0bc19bc61b8b122eddacf96bd026fc2ed0db00dda318f3 SHA512 fa2eb61ea00f7a13385e5c1e579dd88471d6ba3a13b6353e924fe71914b90b40688b42a9f1789bc246e03417fee1788b1990753cda8c8d4a544e85f26b63f9e2
26
27 diff --git a/sys-libs/argp-standalone/argp-standalone-1.5.0.ebuild b/sys-libs/argp-standalone/argp-standalone-1.5.0.ebuild
28 new file mode 100644
29 index 000000000000..29f3f326a366
30 --- /dev/null
31 +++ b/sys-libs/argp-standalone/argp-standalone-1.5.0.ebuild
32 @@ -0,0 +1,42 @@
33 +# Copyright 1999-2022 Gentoo Authors
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI=8
37 +
38 +inherit autotools flag-o-matic
39 +
40 +DESCRIPTION="Standalone argp library for use with musl"
41 +HOMEPAGE="https://github.com/argp-standalone/argp-standalone"
42 +SRC_URI="https://github.com/argp-standalone/argp-standalone/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
43 +
44 +LICENSE="public-domain GPL-2 GPL-3 XC"
45 +SLOT="0"
46 +KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~x86"
47 +IUSE="static-libs"
48 +
49 +DEPEND="!sys-libs/glibc"
50 +
51 +PATCHES=(
52 + "${FILESDIR}"/${P}-shared.patch
53 +)
54 +
55 +src_prepare() {
56 + default
57 +
58 + eautoreconf
59 +}
60 +
61 +src_configure() {
62 + append-cflags "-fgnu89-inline"
63 +
64 + econf $(use_enable static-libs static)
65 +}
66 +
67 +src_install() {
68 + default
69 +
70 + find "${ED}" -name '*.la' -delete || die
71 +
72 + insinto /usr/include
73 + doins argp.h
74 +}
75
76 diff --git a/sys-libs/argp-standalone/files/argp-standalone-1.5.0-shared.patch b/sys-libs/argp-standalone/files/argp-standalone-1.5.0-shared.patch
77 new file mode 100644
78 index 000000000000..1c6c599942c8
79 --- /dev/null
80 +++ b/sys-libs/argp-standalone/files/argp-standalone-1.5.0-shared.patch
81 @@ -0,0 +1,53 @@
82 +Initially added in https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb196546c62e9894a46900e8078f753388d4cc1a.
83 +Commit mentions it being from Debian but not found any other references yet.
84 +
85 +We use -largp fairly extensively across the tree which this patch
86 +accommodates (easier than forcing includes?).
87 +--- a/Makefile.am 2022-05-03 03:41:05.000000000 -0400
88 ++++ b/Makefile.am 2022-05-30 12:28:33.850249380 -0400
89 +@@ -21,19 +21,19 @@
90 + AUTOMAKE_OPTIONS = foreign
91 + SUBDIRS = . testsuite
92 +
93 +-LIBOBJS = @LIBOBJS@
94 ++LTLIBOBJS = @LTLIBOBJS@
95 +
96 +-noinst_LIBRARIES = libargp.a
97 ++lib_LTLIBRARIES = libargp.la
98 + noinst_PROGRAMS = argp-test
99 + noinst_HEADERS = argp.h argp-fmtstream.h argp-namefrob.h # argp-comp.h
100 +
101 + EXTRA_DIST = mempcpy.c strchrnul.c strndup.c Versions
102 +
103 + # Leaves out argp-fs-xinl.c and argp-xinl.c
104 +-libargp_a_SOURCES = argp-ba.c argp-eexst.c argp-fmtstream.c \
105 ++libargp_la_SOURCES = argp-ba.c argp-eexst.c argp-fmtstream.c \
106 + argp-help.c argp-parse.c argp-pv.c \
107 + argp-pvh.c
108 +
109 +-libargp_a_LIBADD = $(LIBOBJS)
110 ++libargp_la_LIBADD = $(LTLIBOBJS)
111 +
112 +-argp_test_LDADD = libargp.a
113 ++argp_test_LDADD = libargp.la
114 +--- a/configure.ac 2022-05-03 03:41:05.000000000 -0400
115 ++++ b/configure.ac 2022-05-30 12:27:08.688735341 -0400
116 +@@ -17,6 +17,7 @@
117 + AC_PROG_MAKE_SET
118 + AC_PROG_RANLIB
119 + AM_PROG_CC_STDC
120 ++AC_PROG_LIBTOOL
121 +
122 + if test "x$am_cv_prog_cc_stdc" = xno ; then
123 + AC_ERROR([the C compiler doesn't handle ANSI-C])
124 +--- a/testsuite/Makefile.am 2022-05-03 03:41:05.000000000 -0400
125 ++++ b/testsuite/Makefile.am 2022-05-30 12:27:08.688735341 -0400
126 +@@ -5,7 +5,7 @@
127 +
128 + noinst_PROGRAMS = $(TS_PROGS) ex1 ex3 ex4
129 +
130 +-LDADD = ../libargp.a
131 ++LDADD = -L../.libs -largp
132 +
133 + EXTRA_DIST = $(TS_SH) run-tests
134 + CLEANFILES = test.out