diff options
author | Karel Kočí <karel.koci@nic.cz> | 2019-04-08 11:18:36 +0200 |
---|---|---|
committer | Karel Kočí <karel.koci@nic.cz> | 2019-04-08 11:18:36 +0200 |
commit | 051e8a039d7417b65c22b0564f3e53e73288a107 (patch) | |
tree | 33225c632af59f29c870d3a4f3646dcb1ebc5c87 /argp-standalone/patches | |
parent | 0aebb75c0122549fd83ecc130fa83c21a7c680da (diff) | |
download | openwrt-personal-pkgs-051e8a039d7417b65c22b0564f3e53e73288a107.tar.gz openwrt-personal-pkgs-051e8a039d7417b65c22b0564f3e53e73288a107.tar.bz2 openwrt-personal-pkgs-051e8a039d7417b65c22b0564f3e53e73288a107.zip |
Drop argp-standalone
It was pushed to turris-os-packages.
Diffstat (limited to 'argp-standalone/patches')
-rw-r--r-- | argp-standalone/patches/001-throw-in-funcdef.patch | 79 | ||||
-rw-r--r-- | argp-standalone/patches/002-gnu89-inline.patch | 22 |
2 files changed, 0 insertions, 101 deletions
diff --git a/argp-standalone/patches/001-throw-in-funcdef.patch b/argp-standalone/patches/001-throw-in-funcdef.patch deleted file mode 100644 index 4a90751..0000000 --- a/argp-standalone/patches/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/argp-standalone/patches/002-gnu89-inline.patch b/argp-standalone/patches/002-gnu89-inline.patch deleted file mode 100644 index 71978eb..0000000 --- a/argp-standalone/patches/002-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" |