diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-28 08:20:55 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-28 08:27:34 +0200 |
| commit | 0fa08adb16040d7eca6c7344994f34ac5b722a18 (patch) | |
| tree | b829c60d144b410808fcd67691ba5c90d81b7f8e /package | |
| parent | 03146ec3eee8fd952552c8c6298284dbf794c4e5 (diff) | |
fix build when autopoint missing, report by joern
Diffstat (limited to 'package')
| -rw-r--r-- | package/coreutils/Makefile | 2 | ||||
| -rw-r--r-- | package/coreutils/patches/patch-Makefile_am | 23 | ||||
| -rw-r--r-- | package/coreutils/patches/patch-configure_ac | 14 |
3 files changed, 36 insertions, 3 deletions
diff --git a/package/coreutils/Makefile b/package/coreutils/Makefile index 031f45e81..5be1c57b2 100644 --- a/package/coreutils/Makefile +++ b/package/coreutils/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= coreutils PKG_VERSION:= 8.22 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 8fb0ae2267aa6e728958adc38f8163a2 PKG_DESCR:= basic file, shell and text manipulation utilities PKG_SECTION:= base diff --git a/package/coreutils/patches/patch-Makefile_am b/package/coreutils/patches/patch-Makefile_am index 7a8549921..a55df18bd 100644 --- a/package/coreutils/patches/patch-Makefile_am +++ b/package/coreutils/patches/patch-Makefile_am @@ -1,6 +1,25 @@ --- coreutils-8.22.orig/Makefile.am 2013-12-04 15:48:30.000000000 +0100 -+++ coreutils-8.22/Makefile.am 2014-02-21 16:15:49.000000000 +0100 -@@ -187,5 +187,4 @@ AM_CPPFLAGS = -Ilib -I$(top_srcdir)/lib ++++ coreutils-8.22/Makefile.am 2014-04-28 07:54:33.112599463 +0200 +@@ -17,7 +17,7 @@ + + ALL_RECURSIVE_TARGETS = + +-SUBDIRS = po . gnulib-tests ++SUBDIRS = . gnulib-tests + + changelog_etc = \ + ChangeLog-2005 \ +@@ -35,8 +35,7 @@ changelog_etc = \ + old/sh-utils/ChangeLog.0 \ + old/sh-utils/NEWS \ + old/textutils/ChangeLog \ +- old/textutils/NEWS \ +- po/ChangeLog-2007 ++ old/textutils/NEWS + + EXTRA_DIST = \ + $(changelog_etc) \ +@@ -187,5 +186,4 @@ AM_CPPFLAGS = -Ilib -I$(top_srcdir)/lib include $(top_srcdir)/lib/local.mk include $(top_srcdir)/src/local.mk include $(top_srcdir)/doc/local.mk diff --git a/package/coreutils/patches/patch-configure_ac b/package/coreutils/patches/patch-configure_ac new file mode 100644 index 000000000..817ed600d --- /dev/null +++ b/package/coreutils/patches/patch-configure_ac @@ -0,0 +1,14 @@ +--- coreutils-8.22.orig/configure.ac 2013-12-13 03:43:10.000000000 +0100 ++++ coreutils-8.22/configure.ac 2014-04-28 07:54:09.336549262 +0200 +@@ -490,11 +490,6 @@ AM_CONDITIONAL([CROSS_COMPILING], [test + + ############################################################################ + +-# As long as "grep 'PRI[diouxX]' po/*.pot" reports matches in +-# translatable strings, we must use need-formatstring-macros here. +-AM_GNU_GETTEXT([external], [need-formatstring-macros]) +-AM_GNU_GETTEXT_VERSION([0.18.1]) +- + # For a test of uniq: it uses the $LOCALE_FR envvar. + gt_LOCALE_FR + |