Fix u-boot-2015.10-librecmc package and remove gettext-full (broken/time)
authornynex <nynex>
Thu, 21 Jul 2016 02:29:21 +0000 (02:29 +0000)
committernynex <nynex>
Thu, 21 Jul 2016 02:29:21 +0000 (02:29 +0000)
trunk/package/boot/uboot-envtools/Makefile
trunk/package/libs/gettext-full/Makefile [deleted file]
trunk/package/libs/gettext-full/patches/000-relocatable.patch [deleted file]
trunk/package/libs/gettext-full/patches/001-autotools.patch [deleted file]
trunk/package/libs/gettext-full/patches/001-no_examples_and_tests.patch [deleted file]
trunk/package/libs/gettext-full/patches/003-gettext-error_print_progname.patch [deleted file]
trunk/package/libs/gettext-full/patches/100-error_progname.patch [deleted file]
trunk/package/libs/gettext-full/patches/110-error_progname_def.patch [deleted file]
trunk/package/libs/gettext-full/patches/120-uclibc-nolocale.patch [deleted file]
trunk/package/libs/gettext-full/patches/130-format-secuirty.patch [deleted file]
trunk/package/libs/gettext-full/patches/150-disable_libxml_iconv.patch [deleted file]

index 8f7e8ec5f2b385883468dfb45c87f3272e0f16aa..88982719cc0f56178e729c2351f3a5f83e4287fd 100644 (file)
@@ -17,7 +17,7 @@ PKG_SOURCE:=$(PKG_DISTNAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=\
        http://mirror2.librecmc.org/sources \
        ftp://ftp.denx.de/pub/u-boot
-PKG_MD5SUM:=110f5e813f9126f318e18b93741c7390
+PKG_MD5SUM:=5e60d710ce19d2cd20c197ade9bbbc72
 
 PKG_BUILD_DEPENDS:=+fstools
 
diff --git a/trunk/package/libs/gettext-full/Makefile b/trunk/package/libs/gettext-full/Makefile
deleted file mode 100644 (file)
index abe311f..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-#
-# Copyright (C) 2006-2015 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:=gettext-full
-PKG_VERSION:=0.19.6
-PKG_RELEASE:=3
-
-PKG_SOURCE:=gettext-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@GNU/gettext
-PKG_MD5SUM:=69d79254ee3b41df23f41c2f4fd720d9
-PKG_BUILD_DIR:=$(BUILD_DIR)/gettext-$(PKG_VERSION)
-HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/gettext-$(PKG_VERSION)
-
-PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
-PKG_LICENSE:=GPL-3.0+
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=0
-PKG_BUILD_DEPENDS:=gettext-full/host
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/host-build.mk
-
-define Package/libintl-full
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=GNU Internationalization library
-  URL:=http://www.gnu.org/software/gettext/
-endef
-
-TARGET_CFLAGS += $(FPIC)
-ifneq ($(HOST_OS),Linux)
-  TARGET_CFLAGS += -I$(STAGING_DIR)/host/include
-endif
-ifdef CONFIG_USE_MUSL
-  TARGET_CFLAGS += -D__UCLIBC__
-endif
-
-CONFIGURE_ARGS += \
-       --enable-shared \
-       --enable-static \
-       --disable-rpath \
-       --enable-nls \
-       --disable-java \
-       --disable-native-java \
-       --disable-openmp \
-       --disable-curses \
-       --with-included-gettext \
-       --without-libintl-prefix \
-       --without-libexpat-prefix \
-       --without-emacs
-
-HOST_CONFIGURE_ARGS += \
-       --with-included-libxml --without-libxml2-prefix --with-included-libcroco
-
-HOST_CONFIGURE_VARS += \
-       EMACS="no"
-
-define Build/InstallDev
-       $(INSTALL_DIR) $(1)/usr/lib/libintl-full/include
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/libintl.h $(1)/usr/lib/libintl-full/include/
-
-       $(INSTALL_DIR) $(1)/usr/lib/libintl-full/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libintl.{a,so*} $(1)/usr/lib/libintl-full/lib/
-
-       $(INSTALL_DIR) $(1)/usr/share/aclocal
-       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/aclocal/* $(1)/usr/share/aclocal/
-endef
-
-define Package/libintl-full/install
-       $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libintl.so* $(1)/usr/lib/
-endef
-
-$(eval $(call HostBuild))
-$(eval $(call BuildPackage,libintl-full))
diff --git a/trunk/package/libs/gettext-full/patches/000-relocatable.patch b/trunk/package/libs/gettext-full/patches/000-relocatable.patch
deleted file mode 100644 (file)
index c14be72..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/gettext-tools/misc/autopoint.in
-+++ b/gettext-tools/misc/autopoint.in
-@@ -27,7 +27,11 @@ archive_version=@ARCHIVE_VERSION@
- # Set variables
- # - gettext_datadir     directory where the data files are stored.
--prefix="@prefix@"
-+if [ -n "$STAGING_DIR" ]; then
-+      prefix="$STAGING_DIR/host"
-+else
-+      prefix="@prefix@"
-+fi
- datarootdir="@datarootdir@"
- : ${gettext_datadir="@datadir@/gettext"}
- : ${AUTOM4TE=autom4te}
---- a/gettext-tools/misc/gettextize.in
-+++ b/gettext-tools/misc/gettextize.in
-@@ -27,7 +27,11 @@ archive_version=@ARCHIVE_VERSION@
- # Set variables
- # - gettext_datadir     directory where the data files are stored.
--prefix="@prefix@"
-+if [ -n "$STAGING_DIR" ]; then
-+      prefix="$STAGING_DIR/host"
-+else
-+      prefix="@prefix@"
-+fi
- datarootdir="@datarootdir@"
- : ${gettext_datadir="@datadir@/gettext"}
- : ${AUTOM4TE=autom4te}
diff --git a/trunk/package/libs/gettext-full/patches/001-autotools.patch b/trunk/package/libs/gettext-full/patches/001-autotools.patch
deleted file mode 100644 (file)
index 2f23c8e..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/gettext-runtime/man/Makefile.am
-+++ b/gettext-runtime/man/Makefile.am
-@@ -172,8 +172,7 @@ textdomain.3.html: textdomain.3.in
- bindtextdomain.3.html: bindtextdomain.3.in
- bind_textdomain_codeset.3.html: bind_textdomain_codeset.3.in
--install-html-local:
--      $(MKDIR_P) $(DESTDIR)$(htmldir)
-+install-html: installdirs-html
-       for file in $(man_HTML); do \
-         if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
-         $(INSTALL_DATA) $$dir/$$file $(DESTDIR)$(htmldir)/$$file; \
---- a/gettext-tools/man/Makefile.am
-+++ b/gettext-tools/man/Makefile.am
-@@ -154,8 +154,7 @@ recode-sr-latin.1.html: recode-sr-latin.
- gettextize.1.html: gettextize.1
- autopoint.1.html: autopoint.1
--install-html-local:
--      $(MKDIR_P) $(DESTDIR)$(htmldir)
-+install-html: installdirs-html
-       for file in $(man_HTML); do \
-         if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
-         $(INSTALL_DATA) $$dir/$$file $(DESTDIR)$(htmldir)/$$file; \
diff --git a/trunk/package/libs/gettext-full/patches/001-no_examples_and_tests.patch b/trunk/package/libs/gettext-full/patches/001-no_examples_and_tests.patch
deleted file mode 100644 (file)
index 97353b1..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/gettext-runtime/Makefile.am
-+++ b/gettext-runtime/Makefile.am
-@@ -29,7 +29,7 @@ SUBDIR_libasprintf = libasprintf
- else
- SUBDIR_libasprintf =
- endif
--SUBDIRS = doc intl intl-java intl-csharp gnulib-lib $(SUBDIR_libasprintf) src po man m4 tests
-+SUBDIRS = intl intl-java intl-csharp gnulib-lib $(SUBDIR_libasprintf) src po m4
- EXTRA_DIST = BUGS
---- a/gettext-tools/Makefile.am
-+++ b/gettext-tools/Makefile.am
-@@ -19,7 +19,7 @@
- AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
- ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
--SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples
-+SUBDIRS = intl gnulib-lib libgrep src libgettextpo po projects styles misc m4
- EXTRA_DIST = misc/DISCLAIM
- MOSTLYCLEANFILES = core *.stackdump
diff --git a/trunk/package/libs/gettext-full/patches/003-gettext-error_print_progname.patch b/trunk/package/libs/gettext-full/patches/003-gettext-error_print_progname.patch
deleted file mode 100644 (file)
index 6698e30..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/gettext-tools/libgettextpo/error.h
-+++ b/gettext-tools/libgettextpo/error.h
-@@ -68,7 +68,7 @@ extern void error_at_line (int __status,
- /* If NULL, error will flush stdout, then print on stderr the program
-    name, a colon and a space.  Otherwise, error will call this
-    function without parameters instead.  */
--extern DLL_VARIABLE void (*error_print_progname) (void);
-+void (*error_print_progname) (void);
- /* This variable is incremented each time 'error' is called.  */
- extern DLL_VARIABLE unsigned int error_message_count;
diff --git a/trunk/package/libs/gettext-full/patches/100-error_progname.patch b/trunk/package/libs/gettext-full/patches/100-error_progname.patch
deleted file mode 100644 (file)
index 38371ae..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/gettext-runtime/intl/intl-compat.c
-+++ b/gettext-runtime/intl/intl-compat.c
-@@ -130,3 +130,7 @@ bind_textdomain_codeset (const char *dom
- {
-   return libintl_bind_textdomain_codeset (domainname, codeset);
- }
-+
-+#ifdef __UCLIBC__
-+DLL_EXPORTED void (*error_print_progname)(void) = NULL;
-+#endif
diff --git a/trunk/package/libs/gettext-full/patches/110-error_progname_def.patch b/trunk/package/libs/gettext-full/patches/110-error_progname_def.patch
deleted file mode 100644 (file)
index e47c7de..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/gettext-tools/libgettextpo/error.h
-+++ b/gettext-tools/libgettextpo/error.h
-@@ -68,7 +68,7 @@ extern void error_at_line (int __status,
- /* If NULL, error will flush stdout, then print on stderr the program
-    name, a colon and a space.  Otherwise, error will call this
-    function without parameters instead.  */
--void (*error_print_progname) (void);
-+extern void (*error_print_progname) (void);
- /* This variable is incremented each time 'error' is called.  */
- extern DLL_VARIABLE unsigned int error_message_count;
diff --git a/trunk/package/libs/gettext-full/patches/120-uclibc-nolocale.patch b/trunk/package/libs/gettext-full/patches/120-uclibc-nolocale.patch
deleted file mode 100644 (file)
index 4c6a73e..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/gettext-runtime/intl/localename.c
-+++ b/gettext-runtime/intl/localename.c
-@@ -2788,7 +2788,7 @@ gl_locale_name_posix (int category, cons
- {
-   /* Use the POSIX methods of looking to 'LC_ALL', 'LC_xxx', and 'LANG'.
-      On some systems this can be done by the 'setlocale' function itself.  */
--#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL
-+#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL && (!defined __UCLIBC__ || defined __UCLIBC_HAS_LOCALE__)
-   return setlocale (category, NULL);
- #else
-   /* On other systems we ignore what setlocale reports and instead look at the
diff --git a/trunk/package/libs/gettext-full/patches/130-format-secuirty.patch b/trunk/package/libs/gettext-full/patches/130-format-secuirty.patch
deleted file mode 100644 (file)
index 89cb3fb..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-From c7197cad42d6269739f379025c2bec9e474c8027 Mon Sep 17 00:00:00 2001
-From: Tobias Mueller <tobiasmue@gnome.org>
-Date: Sat, 29 Jan 2011 16:31:30 +0100
-Subject: Fixed format string issues by giving static literals, fixes bug
- 640897
-
----
- src/cr-statement.c | 10 +++++-----
- tests/test2-main.c |  8 +++-----
- tests/test3-main.c |  8 +++-----
- 3 files changed, 11 insertions(+), 15 deletions(-)
-
---- a/gettext-tools/gnulib-lib/libcroco/cr-statement.c
-+++ b/gettext-tools/gnulib-lib/libcroco/cr-statement.c
-@@ -2607,7 +2607,7 @@ cr_statement_dump_ruleset (CRStatement *
-         g_return_if_fail (a_fp && a_this);
-         str = cr_statement_ruleset_to_string (a_this, a_indent);
-         if (str) {
--                fprintf (a_fp, str);
-+                fprintf (a_fp, "%s", str);
-                 g_free (str);
-                 str = NULL;
-         }
-@@ -2658,7 +2658,7 @@ cr_statement_dump_charset (CRStatement *
-         str = cr_statement_charset_to_string (a_this,
-                                               a_indent) ;
-         if (str) {
--                fprintf (a_fp, str) ;
-+                fprintf (a_fp, "%s", str) ;
-                 g_free (str) ;
-                 str = NULL ;
-         }
-@@ -2685,7 +2685,7 @@ cr_statement_dump_page (CRStatement * a_
-         str = cr_statement_at_page_rule_to_string (a_this, a_indent) ;
-         if (str) {
--                fprintf (a_fp, str);
-+                fprintf (a_fp, "%s", str);
-                 g_free (str) ;
-                 str = NULL ; 
-         }
-@@ -2711,7 +2711,7 @@ cr_statement_dump_media_rule (CRStatemen
-         str = cr_statement_media_rule_to_string (a_this, a_indent) ;
-         if (str) {
--                fprintf (a_fp, str) ;
-+                fprintf (a_fp, "%s", str) ;
-                 g_free (str) ;
-                 str = NULL ;
-         }
-@@ -2737,7 +2737,7 @@ cr_statement_dump_import_rule (CRStateme
-         str = cr_statement_import_rule_to_string (a_this, a_indent) ;
-         if (str) {
--                fprintf (a_fp, str) ;
-+                fprintf (a_fp, "%s", str) ;
-                 g_free (str) ;
-                 str = NULL ;
-         }
diff --git a/trunk/package/libs/gettext-full/patches/150-disable_libxml_iconv.patch b/trunk/package/libs/gettext-full/patches/150-disable_libxml_iconv.patch
deleted file mode 100644 (file)
index a8f5a5c..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/gettext-tools/gnulib-lib/libxml/xmlversion.in.h
-+++ b/gettext-tools/gnulib-lib/libxml/xmlversion.in.h
-@@ -263,7 +263,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(i
-  *
-  * Whether iconv support is available
-  */
--#if 1
-+#if 0
- #define LIBXML_ICONV_ENABLED
- #endif
---- a/gnulib-local/lib/libxml/xmlversion.in.h
-+++ b/gnulib-local/lib/libxml/xmlversion.in.h
-@@ -263,7 +263,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(i
-  *
-  * Whether iconv support is available
-  */
--#if 1
-+#if 0
- #define LIBXML_ICONV_ENABLED
- #endif