CVS commit: pkgsrc/devel/argp

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Sep  4 11:52:38 UTC 2024

Modified Files:
        pkgsrc/devel/argp: distinfo
        pkgsrc/devel/argp/patches: patch-argp-help.c patch-argp-parse.c

Log Message:
argp: Fix build on SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/argp/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/argp/patches/patch-argp-help.c \
    pkgsrc/devel/argp/patches/patch-argp-parse.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/argp/distinfo
diff -u pkgsrc/devel/argp/distinfo:1.13 pkgsrc/devel/argp/distinfo:1.14
--- pkgsrc/devel/argp/distinfo:1.13     Tue Aug  6 18:55:26 2024
+++ pkgsrc/devel/argp/distinfo  Wed Sep  4 11:52:38 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2024/08/06 18:55:26 riastradh Exp $
+$NetBSD: distinfo,v 1.14 2024/09/04 11:52:38 jperkin Exp $
 
 BLAKE2s (argp-standalone-1.3.tar.gz) = aadc55df51b443d36f081b06a48d864aba802b8239e132f5d88b18cc1fedcca2
 SHA512 (argp-standalone-1.3.tar.gz) = 58c3feb8852b90248fff39e49b5019bd0dcf646790c3eaf70c3262eb81dda31a61dc0a45963c7b4a010e80fc14b37288dcb3b3ef48d02f2d33dd72c1c62e62d9
@@ -7,8 +7,8 @@ SHA1 (patch-aa) = f6053a22f3267392d6dbd3
 SHA1 (patch-ab) = dfec66b81dfb21e019652fcbffeefa3ee88c4109
 SHA1 (patch-argp-fmtstream.c) = c89a906b168aec0145b3a7e5a4a9282a92b95a7e
 SHA1 (patch-argp-fmtstream.h) = 40eccbdd0ffefff97627c3fdae8a2350dc7e0b7a
-SHA1 (patch-argp-help.c) = ff149f870c7ff228609f0efbea52fa5f1c708227
-SHA1 (patch-argp-parse.c) = 0e6e61ec639dc9afb6863709038ec27bd6cda527
+SHA1 (patch-argp-help.c) = 685ced4c7d8d241e2188ed5d25b9447a51a84adb
+SHA1 (patch-argp-parse.c) = da5dee860fa5170dccf708ed433dabab31bf6e98
 SHA1 (patch-argp.h) = 82e8035a12779c392f291838fd956101433f2ff9
 SHA1 (patch-config.h.in) = ef232aaa336af237e233ef31df6742ee8ad4e2dd
 SHA1 (patch-configure) = d4ecf3825b661c94681f66e3b6a4bb268d157bee

Index: pkgsrc/devel/argp/patches/patch-argp-help.c
diff -u pkgsrc/devel/argp/patches/patch-argp-help.c:1.1 pkgsrc/devel/argp/patches/patch-argp-help.c:1.2
--- pkgsrc/devel/argp/patches/patch-argp-help.c:1.1     Tue Aug  6 18:50:08 2024
+++ pkgsrc/devel/argp/patches/patch-argp-help.c Wed Sep  4 11:52:38 2024
@@ -1,10 +1,22 @@
-$NetBSD: patch-argp-help.c,v 1.1 2024/08/06 18:50:08 riastradh Exp $
+$NetBSD: patch-argp-help.c,v 1.2 2024/09/04 11:52:38 jperkin Exp $
 
 Use getprogname() as short program name if available.
+SunOS needs alloca.h.
 
 --- argp-help.c.orig   2003-12-11 08:37:05.000000000 +0000
 +++ argp-help.c
-@@ -1725,6 +1725,8 @@ __argp_short_program_name(const struct a
+@@ -26,6 +26,10 @@
+ #include <config.h>
+ #endif
+ 
++#ifdef __sun
++#include <alloca.h>
++#endif
++
+ /* AIX requires this to be the first thing in the file.  */
+ #ifndef __GNUC__
+ # if HAVE_ALLOCA_H
+@@ -1725,6 +1729,8 @@ __argp_short_program_name(const struct a
    return program_invocation_short_name;
  #elif HAVE_DECL_PROGRAM_INVOCATION_NAME
    return __argp_basename(program_invocation_name);
Index: pkgsrc/devel/argp/patches/patch-argp-parse.c
diff -u pkgsrc/devel/argp/patches/patch-argp-parse.c:1.1 pkgsrc/devel/argp/patches/patch-argp-parse.c:1.2
--- pkgsrc/devel/argp/patches/patch-argp-parse.c:1.1    Sun Mar 12 12:38:56 2023
+++ pkgsrc/devel/argp/patches/patch-argp-parse.c        Wed Sep  4 11:52:38 2024
@@ -1,11 +1,23 @@
-$NetBSD: patch-argp-parse.c,v 1.1 2023/03/12 12:38:56 js Exp $
+$NetBSD: patch-argp-parse.c,v 1.2 2024/09/04 11:52:38 jperkin Exp $
 
 Remove __THROW that might be defined to __attribute__((nothrow)) and would thus
 cause the compilation to fail.
+SunOS needs alloca.h.
 
 --- argp-parse.c.orig  2003-12-11 08:37:05.000000000 +0000
 +++ argp-parse.c
-@@ -1277,13 +1277,13 @@ weak_alias (__argp_input, _argp_input)
+@@ -26,6 +26,10 @@
+ #include <config.h>
+ #endif
+ 
++#ifdef __sun
++#include <alloca.h>
++#endif
++
+ /* AIX requires this to be the first thing in the file.  */
+ #ifndef __GNUC__
+ # if HAVE_ALLOCA_H
+@@ -1277,13 +1281,13 @@ weak_alias (__argp_input, _argp_input)
  /* Defined here, in case a user is not inlining the definitions in
   * argp.h */
  void
@@ -21,7 +33,7 @@ cause the compilation to fail.
  {
    if (__opt->flags & OPTION_DOC)
      return 0;
-@@ -1297,7 +1297,7 @@ __option_is_short (__const struct argp_o
+@@ -1297,7 +1301,7 @@ __option_is_short (__const struct argp_o
  }
  
  int