From c6e4370b19c1cc542538e01d46df1bfce8ff05c3 Mon Sep 17 00:00:00 2001 From: Ted Hess Date: Sun, 14 Jun 2015 20:30:56 -0400 Subject: [PATCH] argp-standalone: Moved to git.openwrt.org/openwrt.git Signed-off-by: Ted Hess --- libs/argp-standalone/Makefile | 48 ----------- .../patches/001-throw-in-funcdef.patch | 79 ------------------- 2 files changed, 127 deletions(-) delete mode 100644 libs/argp-standalone/Makefile delete mode 100644 libs/argp-standalone/patches/001-throw-in-funcdef.patch diff --git a/libs/argp-standalone/Makefile b/libs/argp-standalone/Makefile deleted file mode 100644 index 8cf23fec5e..0000000000 --- a/libs/argp-standalone/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -# -# Copyright (C) 2007-2014 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=argp-standalone -PKG_VERSION:=1.3 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://www.lysator.liu.se/~nisse/misc/ -PKG_MD5SUM:=720704bac078d067111b32444e24ba69 -PKG_MAINTAINER:=Ted Hess - -PKG_LICENSE:=LGPL-2.1 -PKG_LICENSE:=Makefile.am - -include $(INCLUDE_DIR)/package.mk - -define Package/argp-standalone - SECTION:=libs - CATEGORY:=Libraries - TITLE:=Hierarchial argument parsing broken out from glibc - URL:=http://www.lysator.liu.se/~nisse/misc/ -endef - -define Package/argp-standalone/description - GNU libc hierarchial argument parsing library broken out from glibc. -endef - -MAKE_FLAGS += \ - CFLAGS="$(TARGET_CFLAGS) $(FPIC)" - - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_BUILD_DIR)/argp.h \ - $(1)/usr/include/ - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/libargp.a \ - $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,argp-standalone)) diff --git a/libs/argp-standalone/patches/001-throw-in-funcdef.patch b/libs/argp-standalone/patches/001-throw-in-funcdef.patch deleted file mode 100644 index 4a90751e1e..0000000000 --- a/libs/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; - } -- 2.30.2