hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tools/gengetopt: Update to 2.23 

Update gengetopt to 2.23
Remove 100-dependency_fix.patch, fixed upstream
Rework no tests and docs patch
Fix typo in copyright section

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
master
Daniel Engberg 2019-06-15 09:07:53 +00:00 committed by Hauke Mehrtens
parent 301a78d1d5
commit 6fac9077c6
4 changed files with 38 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/gengetopt/Makefile
View File

@ -1,19 +1,19 @@
#
# Copyright (C) 2014 OpenWrt.org
#
# This is free software, licengengetopt under the GNU General Public License v2.
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=gengetopt
PKG_VERSION:=2.22.6
PKG_VERSION:=2.23
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
PKG_HASH:=30b05a88604d71ef2a42a2ef26cd26df242b41f5b011ad03083143a31d9b01f7
PKG_HASH:=b941aec9011864978dd7fdeb052b1943535824169d2aa2b0e7eae9ab807584ac
HOST_FIXUP := autoreconf
HOST_FIXUP:=autoreconf
HOST_BUILD_PARALLEL:=1

11
tools/gengetopt/patches/100-dependency_fix.patch
View File

@ -1,11 +0,0 @@
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -51,7 +51,7 @@ libgengetopt_la_LIBADD = $(top_builddir)
@LTLIBOBJS@ \
skels/libgen.la
-LDADD = $(top_builddir)/src/libgengetopt.la
+LDADD = libgengetopt.la
EXTRA_DIST = parser.h argsdef.h gengetopt.h ggos.h gm.h gnugetopt.h \
cmdline.c cmdline.h \

33
tools/gengetopt/patches/100-no-tests-docs.patch Normal file
View File

@ -0,0 +1,33 @@
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,7 @@
ACLOCAL_AMFLAGS = -I m4 -I gl/m4
EXTRA_DIST = configure TODO LICENSE gl/m4/gnulib-cache.m4
-SUBDIRS = gl src doc tests
+SUBDIRS = gl src
gengetoptdoc_DATA = ChangeLog COPYING NEWS THANKS INSTALL README LICENSE
--- a/Makefile.in
+++ b/Makefile.in
@@ -593,7 +593,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4 -I gl/m4
EXTRA_DIST = configure TODO LICENSE gl/m4/gnulib-cache.m4
-SUBDIRS = gl src doc tests
+SUBDIRS = gl src
gengetoptdoc_DATA = ChangeLog COPYING NEWS THANKS INSTALL README LICENSE
TARBALL = $(top_builddir)/gengetopt-$(PACKAGE_VERSION).tar.xz
all: config.h
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,7 +16,7 @@
# with gengetopt; see the file COPYING. If not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-SUBDIRS = skels tests
+SUBDIRS = skels
bin_PROGRAMS = gengetopt

13
tools/gengetopt/patches/200-no_docs_tests.patch
View File

@ -1,13 +0,0 @@
diff -urN gengetopt-2.22.6/Makefile.am gengetopt-2.22.6.new/Makefile.am
--- gengetopt-2.22.6/Makefile.am 2012-11-02 06:26:54.000000000 -0700
+++ gengetopt-2.22.6.new/Makefile.am 2015-05-21 17:43:15.183083542 -0700
@@ -18,6 +18,6 @@
ACLOCAL_AMFLAGS = -I m4 -I gl/m4
EXTRA_DIST = configure TODO LICENSE gl/m4/gnulib-cache.m4
-SUBDIRS = gl src doc tests
+SUBDIRS = gl src
-gengetoptdoc_DATA = ChangeLog COPYING NEWS THANKS INSTALL README LICENSE
\ No newline at end of file
+gengetoptdoc_DATA = ChangeLog COPYING NEWS THANKS INSTALL README LICENSE