user/argp-standalone: Promote to system/

* Needed for elfutils.
* Change upstream to more-maintained version.

5 files changed, 126 insertions, 147 deletions

diff --git a/system/argp-standalone/APKBUILD b/system/argp-standalone/APKBUILD
new file mode 100644
index 000000000..b1f2c8cc3
--- /dev/null
+++ b/system/argp-standalone/APKBUILD
@@ -0,0 +1,42 @@
+# Contributor: Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=argp-standalone
+pkgver=1.4.1
+pkgrel=0
+pkgdesc="Hierarchial argument parsing library broken out from glibc"
+url=" "
+arch="all"
+license="LGPL-2.1+ AND Public-Domain"
+depends=""
+makedepends="libtool automake autoconf"
+subpackages="$pkgname-dev"
+source="$pkgname-$pkgver.tar.gz::https://github.com/ericonr/$pkgname/archive/refs/tags/$pkgver.tar.gz
+	libtool.patch
+	"
+
+prepare() {
+	default_prepare
+	autoreconf -vif
+}
+
+build() {
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var
+	make
+}
+
+check() {
+	make check
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="c5f07e88434589a13a2e88e66d1142b581f19aa82da28507f3c31ea782e080a13a4504d8108c003b5d3c8a3aa20f52ea5e81f337c11a4b1342b16361d4877c1c  argp-standalone-1.4.1.tar.gz
+6349f99adc4400672a63a05d77a18ea50702673495276ab703ac6d2531a20c958714a5be273a4ed1b44d2e6e7d777f9f7abe4413b7064b5219c891531831242c  libtool.patch"
diff --git a/system/argp-standalone/libtool.patch b/system/argp-standalone/libtool.patch
new file mode 100644
index 000000000..53835ac87
--- /dev/null
+++ b/system/argp-standalone/libtool.patch
@@ -0,0 +1,84 @@
+From c5c25dcfcba5bdf099ed95ffc203a096d39ea6c2 Mon Sep 17 00:00:00 2001
+From: Laurent Bercot <ska-skaware@skarnet.org>
+Date: Fri, 13 Sep 2024 17:13:55 +0000
+Subject: [PATCH]  Add libtool (for shared lib support) and install targets
+
+---
+ Makefile.am           | 13 ++++++++-----
+ configure.ac          |  6 +++++-
+ testsuite/Makefile.am |  2 +-
+ 3 files changed, 14 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 5b58d46..3a59ddd 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -23,18 +23,21 @@ SUBDIRS = . testsuite
+ 
+ LIBOBJS = @LIBOBJS@
+ 
+-noinst_LIBRARIES = libargp.a
+ noinst_PROGRAMS = argp-test
+-noinst_HEADERS = argp.h argp-fmtstream.h argp-namefrob.h # argp-comp.h
++noinst_HEADERS = argp-fmtstream.h argp-namefrob.h # argp-comp.h
+ 
+ EXTRA_DIST = mempcpy.c strchrnul.c strndup.c Versions
+ 
++ACLOCAL_AMFLAGS = -I m4
++lib_LTLIBRARIES = libargp.la
+ # Leaves out argp-fs-xinl.c and argp-xinl.c 
+-libargp_a_SOURCES = argp-ba.c argp-eexst.c argp-fmtstream.c \
++libargp_la_SOURCES = argp-ba.c argp-eexst.c argp-fmtstream.c \
+ 		    argp-help.c argp-parse.c argp-pv.c \
+ 		    argp-pvh.c
++libargp_la_HEADERS = argp.h
++libargp_ladir = $(includedir)
+ 
+-libargp_a_LIBADD = $(LIBOBJS)
++libargp_la_LIBADD = $(LIBOBJS)
+ 
+-argp_test_LDADD = libargp.a
++argp_test_LDADD = libargp.la
+ 
+diff --git a/configure.ac b/configure.ac
+index 386215d..345f6fc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
+ dnl This configure.ac is only for building a standalone argp library.
+ AC_PREREQ(2.54)
+ AC_INIT(argp-ba.c)
+-AM_INIT_AUTOMAKE(argp, standalone-1.4.0)
++AM_INIT_AUTOMAKE(argp, standalone-1.4.1)
+ AM_CONFIG_HEADER(config.h)
+ 
+ # GNU libc defaults to supplying the ISO C library functions only. The
+@@ -18,6 +18,8 @@ AC_PROG_MAKE_SET
+ AC_PROG_RANLIB
+ AM_PROG_CC_STDC
+ 
++LT_INIT
++
+ if test "x$am_cv_prog_cc_stdc" = xno ; then
+   AC_ERROR([the C compiler doesn't handle ANSI-C])
+ fi
+@@ -93,4 +95,6 @@ fi
+ 
+ CPPFLAGS="$CPPFLAGS -I$srcdir"
+ 
++PKG_INSTALLDIR
++
+ AC_OUTPUT(Makefile testsuite/Makefile)
+diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
+index 9993541..0e34120 100644
+--- a/testsuite/Makefile.am
++++ b/testsuite/Makefile.am
+@@ -5,7 +5,7 @@ TS_ALL = $(TS_PROGS) $(TS_SH)
+ 
+ noinst_PROGRAMS = $(TS_PROGS) ex1 ex3 ex4
+ 
+-LDADD = ../libargp.a
++LDADD = ../libargp.la
+ 
+ EXTRA_DIST = $(TS_SH) run-tests
+ CLEANFILES = test.out
diff --git a/user/argp-standalone/001-throw-in-funcdef.patch b/user/argp-standalone/001-throw-in-funcdef.patch
deleted file mode 100644
index 4a90751e1..000000000
--- a/user/argp-standalone/001-throw-in-funcdef.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# 
-# T2 SDE: package/.../rng-tools/throw-in-funcdef.patch.argp-standalone
-# Copyright (C) 2006 The T2 SDE Project
-# 
-# More information can be found in the files COPYING and README.
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- T2-COPYRIGHT-NOTE-END ---
-
-
-No __THROW in function implementation.
-	--jsaw
-
---- argp-standalone-1.4-test2/argp.h.orig	2006-01-06 02:29:59.000000000 +0100
-+++ argp-standalone-1.4-test2/argp.h	2006-01-06 02:41:10.000000000 +0100
-@@ -560,17 +560,17 @@
- # endif
- 
- # ifndef ARGP_EI
--#  define ARGP_EI extern __inline__
-+#  define ARGP_EI extern inline
- # endif
- 
- ARGP_EI void
--__argp_usage (__const struct argp_state *__state) __THROW
-+__argp_usage (__const struct argp_state *__state)
- {
-   __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
- }
- 
- ARGP_EI int
--__option_is_short (__const struct argp_option *__opt) __THROW
-+__option_is_short (__const struct argp_option *__opt)
- {
-   if (__opt->flags & OPTION_DOC)
-     return 0;
-@@ -582,7 +582,7 @@
- }
- 
- ARGP_EI int
--__option_is_end (__const struct argp_option *__opt) __THROW
-+__option_is_end (__const struct argp_option *__opt)
- {
-   return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;
- }
---- argp-standalone-1.4-test2/argp-parse.c.orig	2006-01-06 02:47:48.000000000 +0100
-+++ argp-standalone-1.4-test2/argp-parse.c	2006-01-06 02:48:16.000000000 +0100
-@@ -1290,13 +1290,13 @@
- /* Defined here, in case a user is not inlining the definitions in
-  * argp.h */
- void
--__argp_usage (__const struct argp_state *__state) __THROW
-+__argp_usage (__const struct argp_state *__state)
- {
-   __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
- }
- 
- int
--__option_is_short (__const struct argp_option *__opt) __THROW
-+__option_is_short (__const struct argp_option *__opt) 
- {
-   if (__opt->flags & OPTION_DOC)
-     return 0;
-@@ -1310,7 +1310,7 @@
- }
- 
- int
--__option_is_end (__const struct argp_option *__opt) __THROW
-+__option_is_end (__const struct argp_option *__opt) 
- {
-   return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;
- }
diff --git a/user/argp-standalone/APKBUILD b/user/argp-standalone/APKBUILD
deleted file mode 100644
index 450af92f4..000000000
--- a/user/argp-standalone/APKBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Contributor: Francesco Colista <fcolista@alpinelinux.org>
-# Maintainer: A. Wilcox <awilfox@adelielinux.org>
-pkgname=argp-standalone
-pkgver=1.3
-pkgrel=5
-pkgdesc="Hierarchial argument parsing library broken out from glibc"
-url="http://www.lysator.liu.se/~nisse/misc/"
-arch="all"
-options="!dbg"
-license="LGPL-2.0+ AND Public-Domain"
-depends=""
-makedepends="libtool automake autoconf"
-source="http://www.lysator.liu.se/~nisse/misc/$pkgname-$pkgver.tar.gz
-	001-throw-in-funcdef.patch
-	gnu89-inline.patch
-	"
-
-prepare() {
-	default_prepare
-	autoreconf -vif
-}
-
-build() {
-	export CFLAGS="$CFLAGS -fPIC"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var
-	make
-}
-
-check() {
-	make -C "$builddir" check
-}
-
-package() {
-	install -D -m644 argp.h "$pkgdir"/usr/include/argp.h
-	install -D -m755 libargp.a "$pkgdir"/usr/lib/libargp.a
-}
-
-sha512sums="58c3feb8852b90248fff39e49b5019bd0dcf646790c3eaf70c3262eb81dda31a61dc0a45963c7b4a010e80fc14b37288dcb3b3ef48d02f2d33dd72c1c62e62d9  argp-standalone-1.3.tar.gz
-5e4cdeeb16e6a4fb46a00ab95f3da9276ee554eec00bb2a05da7467961234ba3f9a630aafa7ceb5feb429a84ece8bf03b869fa996b86468f4716935a914c79a4  001-throw-in-funcdef.patch
-69f1d8a4fcd542346f98bc1fb7151db748483fc2f331c8c35114e0891d867b41c603ddaa5f3130aaaf1c640e02c51ac71cee71b62c09301b146812e9059e9ade  gnu89-inline.patch"
diff --git a/user/argp-standalone/gnu89-inline.patch b/user/argp-standalone/gnu89-inline.patch
deleted file mode 100644
index 71978eba5..000000000
--- a/user/argp-standalone/gnu89-inline.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 4658839..09f0267 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -79,16 +79,10 @@ AC_CHECK_DECLS([program_invocation_name, program_invocation_short_name],
- 
- # Set these flags *last*, or else the test programs won't compile
- if test x$GCC = xyes ; then
--  # Using -ggdb3 makes (some versions of) Redhat's gcc-2.96 dump core
--  if "$CC" --version | grep '^2\.96$' 1>/dev/null 2>&1; then
--    true
--  else
--    CFLAGS="$CFLAGS -ggdb3"
--  fi
-   CFLAGS="$CFLAGS -Wall -W \
-  -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes \
-  -Waggregate-return \
-- -Wpointer-arith -Wbad-function-cast -Wnested-externs"
-+ -Wpointer-arith -Wbad-function-cast -Wnested-externs -fgnu89-inline"
- fi
- 
- CPPFLAGS="$CPPFLAGS -I$srcdir"