aboutsummaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rwxr-xr-xextra/argp/build10
-rw-r--r--extra/argp/checksums2
-rw-r--r--extra/argp/patches/fix-inline.patch32
-rw-r--r--extra/argp/sources2
-rw-r--r--extra/argp/version1
5 files changed, 47 insertions, 0 deletions
diff --git a/extra/argp/build b/extra/argp/build
new file mode 100755
index 00000000..4069380f
--- /dev/null
+++ b/extra/argp/build
@@ -0,0 +1,10 @@
+#!/bin/sh -e
+
+patch -p1 < fix-inline.patch
+
+./configure \
+ --prefix=/usr
+
+make
+install -Dm644 libargp.a "$1/usr/lib/libargp.a"
+install -Dm644 argp.h "$1/usr/include/argp.h"
diff --git a/extra/argp/checksums b/extra/argp/checksums
new file mode 100644
index 00000000..35ae1a04
--- /dev/null
+++ b/extra/argp/checksums
@@ -0,0 +1,2 @@
+dec79694da1319acd2238ce95df57f3680fea2482096e483323fddf3d818d8be argp-standalone-1.3.tar.gz
+9270da9d963be05fc47b499def4ea7dc0677c5e9987ea849c85c7848d8adc8bc fix-inline.patch
diff --git a/extra/argp/patches/fix-inline.patch b/extra/argp/patches/fix-inline.patch
new file mode 100644
index 00000000..88c44864
--- /dev/null
+++ b/extra/argp/patches/fix-inline.patch
@@ -0,0 +1,32 @@
+Effectively disable inlining of functions which are defined
+in argp-fmtstream.c because of name space conflicts when
+including argp-namefrob.h
+
+--- a/argp-fmtstream.h 2003-12-11 09:37:05.000000000 +0100
++++ b/argp-fmtstream.h 2016-09-27 09:19:48.891000000 +0200
+@@ -192,6 +192,7 @@
+ extern int _argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount);
+ extern int __argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount);
+
++#ifdef ARGP_USE_INLINE
+ #ifdef __OPTIMIZE__
+ /* Inline versions of above routines. */
+
+@@ -208,7 +209,7 @@
+ #endif
+
+ #ifndef ARGP_FS_EI
+-#define ARGP_FS_EI extern inline
++#define ARGP_FS_EI static inline
+ #endif
+
+ ARGP_FS_EI size_t
+@@ -306,6 +307,8 @@
+
+ #endif /* __OPTIMIZE__ */
+
++#endif /* ARGP_USE_INLINE */
++
+ #endif /* ARGP_FMTSTREAM_USE_LINEWRAP */
+
+ #endif /* argp-fmtstream.h */
diff --git a/extra/argp/sources b/extra/argp/sources
new file mode 100644
index 00000000..b78f22fd
--- /dev/null
+++ b/extra/argp/sources
@@ -0,0 +1,2 @@
+http://www.lysator.liu.se/~nisse/misc/argp-standalone-1.3.tar.gz
+patches/fix-inline.patch
diff --git a/extra/argp/version b/extra/argp/version
new file mode 100644
index 00000000..a37a04c3
--- /dev/null
+++ b/extra/argp/version
@@ -0,0 +1 @@
+1.3 1