From fd5f849353e045d60965079a1571160fdd980b0c Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 21 Feb 2017 18:05:50 +0200 Subject: libiconv: remove recipe It was in use by oe-core only when uclibc was used, and so serves no purpose anymore. Both glibc and musl provide their own implementation. However, meta-mingw still depends on it, and so the recipe has been moved there. Signed-off-by: Alexander Kanavin --- .../libiconv-1.14/add-relocatable-module.patch | 5008 -------------------- .../libiconv/libiconv-1.14/autoconf.patch | 50 - meta/recipes-support/libiconv/libiconv_1.14.bb | 52 - 3 files changed, 5110 deletions(-) delete mode 100644 meta/recipes-support/libiconv/libiconv-1.14/add-relocatable-module.patch delete mode 100644 meta/recipes-support/libiconv/libiconv-1.14/autoconf.patch delete mode 100644 meta/recipes-support/libiconv/libiconv_1.14.bb diff --git a/meta/recipes-support/libiconv/libiconv-1.14/add-relocatable-module.patch b/meta/recipes-support/libiconv/libiconv-1.14/add-relocatable-module.patch deleted file mode 100644 index 6af377b4cc..0000000000 --- a/meta/recipes-support/libiconv/libiconv-1.14/add-relocatable-module.patch +++ /dev/null @@ -1,5008 +0,0 @@ -This patch is needed to solve issues like -| iconv.o: In function `main': -| /home/james/stuff/beagle/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/libiconv-1.14-r0/libiconv-1.14/src/./iconv.c:861: undefined reference to `relocate' -| ../srclib/libicrt.a(progreloc.o): In function `prepare_relocate': -| /home/james/stuff/beagle/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/libiconv-1.14-r0/libiconv-1.14/srclib/progreloc.c:297: undefined reference to `compute_curr_prefix' -| /home/james/stuff/beagle/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/libiconv-1.14-r0/libiconv-1.14/srclib/progreloc.c:302: undefined reference to `set_relocation_prefix' -| collect2: ld returned 1 exit status -| make[1]: *** [install] Error 1 - -Upstream-Status: Inappropriate [OE config specific] - -Signed-off-by: Khem Raj - -diff -Naurp libiconv-1.14.org//build-aux/arg-nonnull.h libiconv-1.14/build-aux/arg-nonnull.h ---- libiconv-1.14.org//build-aux/arg-nonnull.h 1969-12-31 16:00:00.000000000 -0800 -+++ libiconv-1.14/build-aux/arg-nonnull.h 2012-01-08 02:07:39.930484438 -0800 -@@ -0,0 +1,26 @@ -+/* A C macro for declaring that specific arguments must not be NULL. -+ Copyright (C) 2009-2011 Free Software Foundation, Inc. -+ -+ This program is free software: you can redistribute it and/or modify it -+ under the terms of the GNU General Public License as published -+ by the Free Software Foundation; either version 3 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program. If not, see . */ -+ -+/* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools -+ that the values passed as arguments n, ..., m must be non-NULL pointers. -+ n = 1 stands for the first argument, n = 2 for the second argument etc. */ -+#ifndef _GL_ARG_NONNULL -+# if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || __GNUC__ > 3 -+# define _GL_ARG_NONNULL(params) __attribute__ ((__nonnull__ params)) -+# else -+# define _GL_ARG_NONNULL(params) -+# endif -+#endif -diff -Naurp libiconv-1.14.org//build-aux/c++defs.h libiconv-1.14/build-aux/c++defs.h ---- libiconv-1.14.org//build-aux/c++defs.h 1969-12-31 16:00:00.000000000 -0800 -+++ libiconv-1.14/build-aux/c++defs.h 2012-01-08 02:07:39.942484438 -0800 -@@ -0,0 +1,271 @@ -+/* C++ compatible function declaration macros. -+ Copyright (C) 2010-2011 Free Software Foundation, Inc. -+ -+ This program is free software: you can redistribute it and/or modify it -+ under the terms of the GNU General Public License as published -+ by the Free Software Foundation; either version 3 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program. If not, see . */ -+ -+#ifndef _GL_CXXDEFS_H -+#define _GL_CXXDEFS_H -+ -+/* The three most frequent use cases of these macros are: -+ -+ * For providing a substitute for a function that is missing on some -+ platforms, but is declared and works fine on the platforms on which -+ it exists: -+ -+ #if @GNULIB_FOO@ -+ # if !@HAVE_FOO@ -+ _GL_FUNCDECL_SYS (foo, ...); -+ # endif -+ _GL_CXXALIAS_SYS (foo, ...); -+ _GL_CXXALIASWARN (foo); -+ #elif defined GNULIB_POSIXCHECK -+ ... -+ #endif -+ -+ * For providing a replacement for a function that exists on all platforms, -+ but is broken/insufficient and needs to be replaced on some platforms: -+ -+ #if @GNULIB_FOO@ -+ # if @REPLACE_FOO@ -+ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) -+ # undef foo -+ # define foo rpl_foo -+ # endif -+ _GL_FUNCDECL_RPL (foo, ...); -+ _GL_CXXALIAS_RPL (foo, ...); -+ # else -+ _GL_CXXALIAS_SYS (foo, ...); -+ # endif -+ _GL_CXXALIASWARN (foo); -+ #elif defined GNULIB_POSIXCHECK -+ ... -+ #endif -+ -+ * For providing a replacement for a function that exists on some platforms -+ but is broken/insufficient and needs to be replaced on some of them and -+ is additionally either missing or undeclared on some other platforms: -+ -+ #if @GNULIB_FOO@ -+ # if @REPLACE_FOO@ -+ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) -+ # undef foo -+ # define foo rpl_foo -+ # endif -+ _GL_FUNCDECL_RPL (foo, ...); -+ _GL_CXXALIAS_RPL (foo, ...); -+ # else -+ # if !@HAVE_FOO@ or if !@HAVE_DECL_FOO@ -+ _GL_FUNCDECL_SYS (foo, ...); -+ # endif -+ _GL_CXXALIAS_SYS (foo, ...); -+ # endif -+ _GL_CXXALIASWARN (foo); -+ #elif defined GNULIB_POSIXCHECK -+ ... -+ #endif -+*/ -+ -+/* _GL_EXTERN_C declaration; -+ performs the declaration with C linkage. */ -+#if defined __cplusplus -+# define _GL_EXTERN_C extern "C" -+#else -+# define _GL_EXTERN_C extern -+#endif -+ -+/* _GL_FUNCDECL_RPL (func, rettype, parameters_and_attributes); -+ declares a replacement function, named rpl_func, with the given prototype, -+ consisting of return type, parameters, and attributes. -+ Example: -+ _GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...) -+ _GL_ARG_NONNULL ((1))); -+ */ -+#define _GL_FUNCDECL_RPL(func,rettype,parameters_and_attributes) \ -+ _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters_and_attributes) -+#define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters_and_attributes) \ -+ _GL_EXTERN_C rettype rpl_func parameters_and_attributes -+ -+/* _GL_FUNCDECL_SYS (func, rettype, parameters_and_attributes); -+ declares the system function, named func, with the given prototype, -+ consisting of return type, parameters, and attributes. -+ Example: -+ _GL_FUNCDECL_SYS (open, int, (const char *filename, int flags, ...) -+ _GL_ARG_NONNULL ((1))); -+ */ -+#define _GL_FUNCDECL_SYS(func,rettype,parameters_and_attributes) \ -+ _GL_EXTERN_C rettype func parameters_and_attributes -+ -+/* _GL_CXXALIAS_RPL (func, rettype, parameters); -+ declares a C++ alias called GNULIB_NAMESPACE::func -+ that redirects to rpl_func, if GNULIB_NAMESPACE is defined. -+ Example: -+ _GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...)); -+ */ -+#define _GL_CXXALIAS_RPL(func,rettype,parameters) \ -+ _GL_CXXALIAS_RPL_1 (func, rpl_##func, rettype, parameters) -+#if defined __cplusplus && defined GNULIB_NAMESPACE -+# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \ -+ namespace GNULIB_NAMESPACE \ -+ { \ -+ rettype (*const func) parameters = ::rpl_func; \ -+ } \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+#else -+# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+#endif -+ -+/* _GL_CXXALIAS_RPL_CAST_1 (func, rpl_func, rettype, parameters); -+ is like _GL_CXXALIAS_RPL_1 (func, rpl_func, rettype, parameters); -+ except that the C function rpl_func may have a slightly different -+ declaration. A cast is used to silence the "invalid conversion" error -+ that would otherwise occur. */ -+#if defined __cplusplus && defined GNULIB_NAMESPACE -+# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \ -+ namespace GNULIB_NAMESPACE \ -+ { \ -+ rettype (*const func) parameters = \ -+ reinterpret_cast(::rpl_func); \ -+ } \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+#else -+# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+#endif -+ -+/* _GL_CXXALIAS_SYS (func, rettype, parameters); -+ declares a C++ alias called GNULIB_NAMESPACE::func -+ that redirects to the system provided function func, if GNULIB_NAMESPACE -+ is defined. -+ Example: -+ _GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...)); -+ */ -+#if defined __cplusplus && defined GNULIB_NAMESPACE -+ /* If we were to write -+ rettype (*const func) parameters = ::func; -+ like above in _GL_CXXALIAS_RPL_1, the compiler could optimize calls -+ better (remove an indirection through a 'static' pointer variable), -+ but then the _GL_CXXALIASWARN macro below would cause a warning not only -+ for uses of ::func but also for uses of GNULIB_NAMESPACE::func. */ -+# define _GL_CXXALIAS_SYS(func,rettype,parameters) \ -+ namespace GNULIB_NAMESPACE \ -+ { \ -+ static rettype (*func) parameters = ::func; \ -+ } \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+#else -+# define _GL_CXXALIAS_SYS(func,rettype,parameters) \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+#endif -+ -+/* _GL_CXXALIAS_SYS_CAST (func, rettype, parameters); -+ is like _GL_CXXALIAS_SYS (func, rettype, parameters); -+ except that the C function func may have a slightly different declaration. -+ A cast is used to silence the "invalid conversion" error that would -+ otherwise occur. */ -+#if defined __cplusplus && defined GNULIB_NAMESPACE -+# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \ -+ namespace GNULIB_NAMESPACE \ -+ { \ -+ static rettype (*func) parameters = \ -+ reinterpret_cast(::func); \ -+ } \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+#else -+# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+#endif -+ -+/* _GL_CXXALIAS_SYS_CAST2 (func, rettype, parameters, rettype2, parameters2); -+ is like _GL_CXXALIAS_SYS (func, rettype, parameters); -+ except that the C function is picked among a set of overloaded functions, -+ namely the one with rettype2 and parameters2. Two consecutive casts -+ are used to silence the "cannot find a match" and "invalid conversion" -+ errors that would otherwise occur. */ -+#if defined __cplusplus && defined GNULIB_NAMESPACE -+ /* The outer cast must be a reinterpret_cast. -+ The inner cast: When the function is defined as a set of overloaded -+ functions, it works as a static_cast<>, choosing the designated variant. -+ When the function is defined as a single variant, it works as a -+ reinterpret_cast<>. The parenthesized cast syntax works both ways. */ -+# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \ -+ namespace GNULIB_NAMESPACE \ -+ { \ -+ static rettype (*func) parameters = \ -+ reinterpret_cast( \ -+ (rettype2(*)parameters2)(::func)); \ -+ } \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+#else -+# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+#endif -+ -+/* _GL_CXXALIASWARN (func); -+ causes a warning to be emitted when ::func is used but not when -+ GNULIB_NAMESPACE::func is used. func must be defined without overloaded -+ variants. */ -+#if defined __cplusplus && defined GNULIB_NAMESPACE -+# define _GL_CXXALIASWARN(func) \ -+ _GL_CXXALIASWARN_1 (func, GNULIB_NAMESPACE) -+# define _GL_CXXALIASWARN_1(func,namespace) \ -+ _GL_CXXALIASWARN_2 (func, namespace) -+/* To work around GCC bug , -+ we enable the warning only when not optimizing. */ -+# if !__OPTIMIZE__ -+# define _GL_CXXALIASWARN_2(func,namespace) \ -+ _GL_WARN_ON_USE (func, \ -+ "The symbol ::" #func " refers to the system function. " \ -+ "Use " #namespace "::" #func " instead.") -+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING -+# define _GL_CXXALIASWARN_2(func,namespace) \ -+ extern __typeof__ (func) func -+# else -+# define _GL_CXXALIASWARN_2(func,namespace) \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+# endif -+#else -+# define _GL_CXXALIASWARN(func) \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+#endif -+ -+/* _GL_CXXALIASWARN1 (func, rettype, parameters_and_attributes); -+ causes a warning to be emitted when the given overloaded variant of ::func -+ is used but not when GNULIB_NAMESPACE::func is used. */ -+#if defined __cplusplus && defined GNULIB_NAMESPACE -+# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \ -+ _GL_CXXALIASWARN1_1 (func, rettype, parameters_and_attributes, \ -+ GNULIB_NAMESPACE) -+# define _GL_CXXALIASWARN1_1(func,rettype,parameters_and_attributes,namespace) \ -+ _GL_CXXALIASWARN1_2 (func, rettype, parameters_and_attributes, namespace) -+/* To work around GCC bug , -+ we enable the warning only when not optimizing. */ -+# if !__OPTIMIZE__ -+# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ -+ _GL_WARN_ON_USE_CXX (func, rettype, parameters_and_attributes, \ -+ "The symbol ::" #func " refers to the system function. " \ -+ "Use " #namespace "::" #func " instead.") -+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING -+# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ -+ extern __typeof__ (func) func -+# else -+# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+# endif -+#else -+# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \ -+ _GL_EXTERN_C int _gl_cxxalias_dummy -+#endif -+ -+#endif /* _GL_CXXDEFS_H */ -diff -Naurp libiconv-1.14.org//build-aux/snippet/arg-nonnull.h libiconv-1.14/build-aux/snippet/arg-nonnull.h ---- libiconv-1.14.org//build-aux/snippet/arg-nonnull.h 2011-08-07 06:22:07.000000000 -0700 -+++ libiconv-1.14/build-aux/snippet/arg-nonnull.h 1969-12-31 16:00:00.000000000 -0800 -@@ -1,26 +0,0 @@ --/* A C macro for declaring that specific arguments must not be NULL. -- Copyright (C) 2009-2011 Free Software Foundation, Inc. -- -- This program is free software: you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published -- by the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . */ -- --/* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools -- that the values passed as arguments n, ..., m must be non-NULL pointers. -- n = 1 stands for the first argument, n = 2 for the second argument etc. */ --#ifndef _GL_ARG_NONNULL --# if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || __GNUC__ > 3 --# define _GL_ARG_NONNULL(params) __attribute__ ((__nonnull__ params)) --# else --# define _GL_ARG_NONNULL(params) --# endif --#endif -diff -Naurp libiconv-1.14.org//build-aux/snippet/c++defs.h libiconv-1.14/build-aux/snippet/c++defs.h ---- libiconv-1.14.org//build-aux/snippet/c++defs.h 2011-08-07 06:22:07.000000000 -0700 -+++ libiconv-1.14/build-aux/snippet/c++defs.h 1969-12-31 16:00:00.000000000 -0800 -@@ -1,271 +0,0 @@ --/* C++ compatible function declaration macros. -- Copyright (C) 2010-2011 Free Software Foundation, Inc. -- -- This program is free software: you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published -- by the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . */ -- --#ifndef _GL_CXXDEFS_H --#define _GL_CXXDEFS_H -- --/* The three most frequent use cases of these macros are: -- -- * For providing a substitute for a function that is missing on some -- platforms, but is declared and works fine on the platforms on which -- it exists: -- -- #if @GNULIB_FOO@ -- # if !@HAVE_FOO@ -- _GL_FUNCDECL_SYS (foo, ...); -- # endif -- _GL_CXXALIAS_SYS (foo, ...); -- _GL_CXXALIASWARN (foo); -- #elif defined GNULIB_POSIXCHECK -- ... -- #endif -- -- * For providing a replacement for a function that exists on all platforms, -- but is broken/insufficient and needs to be replaced on some platforms: -- -- #if @GNULIB_FOO@ -- # if @REPLACE_FOO@ -- # if !(defined __cplusplus && defined GNULIB_NAMESPACE) -- # undef foo -- # define foo rpl_foo -- # endif -- _GL_FUNCDECL_RPL (foo, ...); -- _GL_CXXALIAS_RPL (foo, ...); -- # else -- _GL_CXXALIAS_SYS (foo, ...); -- # endif -- _GL_CXXALIASWARN (foo); -- #elif defined GNULIB_POSIXCHECK -- ... -- #endif -- -- * For providing a replacement for a function that exists on some platforms -- but is broken/insufficient and needs to be replaced on some of them and -- is additionally either missing or undeclared on some other platforms: -- -- #if @GNULIB_FOO@ -- # if @REPLACE_FOO@ -- # if !(defined __cplusplus && defined GNULIB_NAMESPACE) -- # undef foo -- # define foo rpl_foo -- # endif -- _GL_FUNCDECL_RPL (foo, ...); -- _GL_CXXALIAS_RPL (foo, ...); -- # else -- # if !@HAVE_FOO@ or if !@HAVE_DECL_FOO@ -- _GL_FUNCDECL_SYS (foo, ...); -- # endif -- _GL_CXXALIAS_SYS (foo, ...); -- # endif -- _GL_CXXALIASWARN (foo); -- #elif defined GNULIB_POSIXCHECK -- ... -- #endif --*/ -- --/* _GL_EXTERN_C declaration; -- performs the declaration with C linkage. */ --#if defined __cplusplus --# define _GL_EXTERN_C extern "C" --#else --# define _GL_EXTERN_C extern --#endif -- --/* _GL_FUNCDECL_RPL (func, rettype, parameters_and_attributes); -- declares a replacement function, named rpl_func, with the given prototype, -- consisting of return type, parameters, and attributes. -- Example: -- _GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...) -- _GL_ARG_NONNULL ((1))); -- */ --#define _GL_FUNCDECL_RPL(func,rettype,parameters_and_attributes) \ -- _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters_and_attributes) --#define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters_and_attributes) \ -- _GL_EXTERN_C rettype rpl_func parameters_and_attributes -- --/* _GL_FUNCDECL_SYS (func, rettype, parameters_and_attributes); -- declares the system function, named func, with the given prototype, -- consisting of return type, parameters, and attributes. -- Example: -- _GL_FUNCDECL_SYS (open, int, (const char *filename, int flags, ...) -- _GL_ARG_NONNULL ((1))); -- */ --#define _GL_FUNCDECL_SYS(func,rettype,parameters_and_attributes) \ -- _GL_EXTERN_C rettype func parameters_and_attributes -- --/* _GL_CXXALIAS_RPL (func, rettype, parameters); -- declares a C++ alias called GNULIB_NAMESPACE::func -- that redirects to rpl_func, if GNULIB_NAMESPACE is defined. -- Example: -- _GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...)); -- */ --#define _GL_CXXALIAS_RPL(func,rettype,parameters) \ -- _GL_CXXALIAS_RPL_1 (func, rpl_##func, rettype, parameters) --#if defined __cplusplus && defined GNULIB_NAMESPACE --# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \ -- namespace GNULIB_NAMESPACE \ -- { \ -- rettype (*const func) parameters = ::rpl_func; \ -- } \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --#else --# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --#endif -- --/* _GL_CXXALIAS_RPL_CAST_1 (func, rpl_func, rettype, parameters); -- is like _GL_CXXALIAS_RPL_1 (func, rpl_func, rettype, parameters); -- except that the C function rpl_func may have a slightly different -- declaration. A cast is used to silence the "invalid conversion" error -- that would otherwise occur. */ --#if defined __cplusplus && defined GNULIB_NAMESPACE --# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \ -- namespace GNULIB_NAMESPACE \ -- { \ -- rettype (*const func) parameters = \ -- reinterpret_cast(::rpl_func); \ -- } \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --#else --# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --#endif -- --/* _GL_CXXALIAS_SYS (func, rettype, parameters); -- declares a C++ alias called GNULIB_NAMESPACE::func -- that redirects to the system provided function func, if GNULIB_NAMESPACE -- is defined. -- Example: -- _GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...)); -- */ --#if defined __cplusplus && defined GNULIB_NAMESPACE -- /* If we were to write -- rettype (*const func) parameters = ::func; -- like above in _GL_CXXALIAS_RPL_1, the compiler could optimize calls -- better (remove an indirection through a 'static' pointer variable), -- but then the _GL_CXXALIASWARN macro below would cause a warning not only -- for uses of ::func but also for uses of GNULIB_NAMESPACE::func. */ --# define _GL_CXXALIAS_SYS(func,rettype,parameters) \ -- namespace GNULIB_NAMESPACE \ -- { \ -- static rettype (*func) parameters = ::func; \ -- } \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --#else --# define _GL_CXXALIAS_SYS(func,rettype,parameters) \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --#endif -- --/* _GL_CXXALIAS_SYS_CAST (func, rettype, parameters); -- is like _GL_CXXALIAS_SYS (func, rettype, parameters); -- except that the C function func may have a slightly different declaration. -- A cast is used to silence the "invalid conversion" error that would -- otherwise occur. */ --#if defined __cplusplus && defined GNULIB_NAMESPACE --# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \ -- namespace GNULIB_NAMESPACE \ -- { \ -- static rettype (*func) parameters = \ -- reinterpret_cast(::func); \ -- } \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --#else --# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --#endif -- --/* _GL_CXXALIAS_SYS_CAST2 (func, rettype, parameters, rettype2, parameters2); -- is like _GL_CXXALIAS_SYS (func, rettype, parameters); -- except that the C function is picked among a set of overloaded functions, -- namely the one with rettype2 and parameters2. Two consecutive casts -- are used to silence the "cannot find a match" and "invalid conversion" -- errors that would otherwise occur. */ --#if defined __cplusplus && defined GNULIB_NAMESPACE -- /* The outer cast must be a reinterpret_cast. -- The inner cast: When the function is defined as a set of overloaded -- functions, it works as a static_cast<>, choosing the designated variant. -- When the function is defined as a single variant, it works as a -- reinterpret_cast<>. The parenthesized cast syntax works both ways. */ --# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \ -- namespace GNULIB_NAMESPACE \ -- { \ -- static rettype (*func) parameters = \ -- reinterpret_cast( \ -- (rettype2(*)parameters2)(::func)); \ -- } \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --#else --# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --#endif -- --/* _GL_CXXALIASWARN (func); -- causes a warning to be emitted when ::func is used but not when -- GNULIB_NAMESPACE::func is used. func must be defined without overloaded -- variants. */ --#if defined __cplusplus && defined GNULIB_NAMESPACE --# define _GL_CXXALIASWARN(func) \ -- _GL_CXXALIASWARN_1 (func, GNULIB_NAMESPACE) --# define _GL_CXXALIASWARN_1(func,namespace) \ -- _GL_CXXALIASWARN_2 (func, namespace) --/* To work around GCC bug , -- we enable the warning only when not optimizing. */ --# if !__OPTIMIZE__ --# define _GL_CXXALIASWARN_2(func,namespace) \ -- _GL_WARN_ON_USE (func, \ -- "The symbol ::" #func " refers to the system function. " \ -- "Use " #namespace "::" #func " instead.") --# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING --# define _GL_CXXALIASWARN_2(func,namespace) \ -- extern __typeof__ (func) func --# else --# define _GL_CXXALIASWARN_2(func,namespace) \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --# endif --#else --# define _GL_CXXALIASWARN(func) \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --#endif -- --/* _GL_CXXALIASWARN1 (func, rettype, parameters_and_attributes); -- causes a warning to be emitted when the given overloaded variant of ::func -- is used but not when GNULIB_NAMESPACE::func is used. */ --#if defined __cplusplus && defined GNULIB_NAMESPACE --# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \ -- _GL_CXXALIASWARN1_1 (func, rettype, parameters_and_attributes, \ -- GNULIB_NAMESPACE) --# define _GL_CXXALIASWARN1_1(func,rettype,parameters_and_attributes,namespace) \ -- _GL_CXXALIASWARN1_2 (func, rettype, parameters_and_attributes, namespace) --/* To work around GCC bug , -- we enable the warning only when not optimizing. */ --# if !__OPTIMIZE__ --# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ -- _GL_WARN_ON_USE_CXX (func, rettype, parameters_and_attributes, \ -- "The symbol ::" #func " refers to the system function. " \ -- "Use " #namespace "::" #func " instead.") --# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING --# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ -- extern __typeof__ (func) func --# else --# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --# endif --#else --# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \ -- _GL_EXTERN_C int _gl_cxxalias_dummy --#endif -- --#endif /* _GL_CXXDEFS_H */ -diff -Naurp libiconv-1.14.org//build-aux/snippet/_Noreturn.h libiconv-1.14/build-aux/snippet/_Noreturn.h ---- libiconv-1.14.org//build-aux/snippet/_Noreturn.h 2011-08-07 06:22:07.000000000 -0700 -+++ libiconv-1.14/build-aux/snippet/_Noreturn.h 1969-12-31 16:00:00.000000000 -0800 -@@ -1,10 +0,0 @@ --#ifndef _Noreturn --# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \ -- || 0x5110 <= __SUNPRO_C) --# define _Noreturn __attribute__ ((__noreturn__)) --# elif 1200 <= _MSC_VER --# define _Noreturn __declspec (noreturn) --# else --# define _Noreturn --# endif --#endif -diff -Naurp libiconv-1.14.org//build-aux/snippet/warn-on-use.h libiconv-1.14/build-aux/snippet/warn-on-use.h ---- libiconv-1.14.org//build-aux/snippet/warn-on-use.h 2011-08-07 06:22:07.000000000 -0700 -+++ libiconv-1.14/build-aux/snippet/warn-on-use.h 1969-12-31 16:00:00.000000000 -0800 -@@ -1,109 +0,0 @@ --/* A C macro for emitting warnings if a function is used. -- Copyright (C) 2010-2011 Free Software Foundation, Inc. -- -- This program is free software: you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published -- by the Free Software Foundation; either version 3 of the License, or -- (at your option) any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . */ -- --/* _GL_WARN_ON_USE (function, "literal string") issues a declaration -- for FUNCTION which will then trigger a compiler warning containing -- the text of "literal string" anywhere that function is called, if -- supported by the compiler. If the compiler does not support this -- feature, the macro expands to an unused extern declaration. -- -- This macro is useful for marking a function as a potential -- portability trap, with the intent that "literal string" include -- instructions on the replacement function that should be used -- instead. However, one of the reasons that a function is a -- portability trap is if it has the wrong signature. Declaring -- FUNCTION with a different signature in C is a compilation error, so -- this macro must use the same type as any existing declaration so -- that programs that avoid the problematic FUNCTION do not fail to -- compile merely because they included a header that poisoned the -- function. But this implies that _GL_WARN_ON_USE is only safe to -- use if FUNCTION is known to already have a declaration. Use of -- this macro implies that there must not be any other macro hiding -- the declaration of FUNCTION; but undefining FUNCTION first is part -- of the poisoning process anyway (although for symbols that are -- provided only via a macro, the result is a compilation error rather -- than a warning containing "literal string"). Also note that in -- C++, it is only safe to use if FUNCTION has no overloads. -- -- For an example, it is possible to poison 'getline' by: -- - adding a call to gl_WARN_ON_USE_PREPARE([[#include ]], -- [getline]) in configure.ac, which potentially defines -- HAVE_RAW_DECL_GETLINE -- - adding this code to a header that wraps the system : -- #undef getline -- #if HAVE_RAW_DECL_GETLINE -- _GL_WARN_ON_USE (getline, "getline is required by POSIX 2008, but" -- "not universally present; use the gnulib module getline"); -- #endif -- -- It is not possible to directly poison global variables. But it is -- possible to write a wrapper accessor function, and poison that -- (less common usage, like &environ, will cause a compilation error -- rather than issue the nice warning, but the end result of informing -- the developer about their portability problem is still achieved): -- #if HAVE_RAW_DECL_ENVIRON -- static inline char ***rpl_environ (void) { return &environ; } -- _GL_WARN_ON_USE (rpl_environ, "environ is not always properly declared"); -- # undef environ -- # define environ (*rpl_environ ()) -- #endif -- */ --#ifndef _GL_WARN_ON_USE -- --# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) --/* A compiler attribute is available in gcc versions 4.3.0 and later. */ --# define _GL_WARN_ON_USE(function, message) \ --extern __typeof__ (function) function __attribute__ ((__warning__ (message))) --# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING --/* Verify the existence of the function. */ --# define _GL_WARN_ON_USE(function, message) \ --extern __typeof__ (function) function --# else /* Unsupported. */ --# define _GL_WARN_ON_USE(function, message) \ --_GL_WARN_EXTERN_C int _gl_warn_on_use --# endif --#endif -- --/* _GL_WARN_ON_USE_CXX (function, rettype, parameters_and_attributes, "string") -- is like _GL_WARN_ON_USE (function, "string"), except that the function is -- declared with the given prototype, consisting of return type, parameters, -- and attributes. -- This variant is useful for overloaded functions in C++. _GL_WARN_ON_USE does -- not work in this case. */ --#ifndef _GL_WARN_ON_USE_CXX --# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) --# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \ --extern rettype function parameters_and_attributes \ -- __attribute__ ((__warning__ (msg))) --# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING --/* Verify the existence of the function. */ --# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \ --extern rettype function parameters_and_attributes --# else /* Unsupported. */ --# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \ --_GL_WARN_EXTERN_C int _gl_warn_on_use --# endif --#endif -- --/* _GL_WARN_EXTERN_C declaration; -- performs the declaration with C linkage. */ --#ifndef _GL_WARN_EXTERN_C --# if defined __cplusplus --# define _GL_WARN_EXTERN_C extern "C" --# else --# define _GL_WARN_EXTERN_C extern --# endif --#endif -diff -Naurp libiconv-1.14.org//build-aux/warn-on-use.h libiconv-1.14/build-aux/warn-on-use.h ---- libiconv-1.14.org//build-aux/warn-on-use.h 1969-12-31 16:00:00.000000000 -0800 -+++ libiconv-1.14/build-aux/warn-on-use.h 2012-01-08 02:07:39.950484439 -0800 -@@ -0,0 +1,109 @@ -+/* A C macro for emitting warnings if a function is used. -+ Copyright (C) 2010-2011 Free Software Foundation, Inc. -+ -+ This program is free software: you can redistribute it and/or modify it -+ under the terms of the GNU General Public License as published -+ by the Free Software Foundation; either version 3 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program. If not, see . */ -+ -+/* _GL_WARN_ON_USE (function, "literal string") issues a declaration -+ for FUNCTION which will then trigger a compiler warning containing -+ the text of "literal string" anywhere that function is called, if -+ supported by the compiler. If the compiler does not support this -+ feature, the macro expands to an unused extern declaration. -+ -+ This macro is useful for marking a function as a potential -+ portability trap, with the intent that "literal string" include -+ instructions on the replacement function that should be used -+ instead. However, one of the reasons that a function is a -+ portability trap is if it has the wrong signature. Declaring -+ FUNCTION with a different signature in C is a compilation error, so -+ this macro must use the same type as any existing declaration so -+ that programs that avoid the problematic FUNCTION do not fail to -+ compile merely because they included a header that poisoned the -+ function. But this implies that _GL_WARN_ON_USE is only safe to -+ use if FUNCTION is known to already have a declaration. Use of -+ this macro implies that there must not be any other macro hiding -+ the declaration of FUNCTION; but undefining FUNCTION first is part -+ of the poisoning process anyway (although for symbols that are -+ provided only via a macro, the result is a compilation error rather -+ than a warning containing "literal string"). Also note that in -+ C++, it is only safe to use if FUNCTION has no overloads. -+ -+ For an example, it is possible to poison 'getline' by: -+ - adding a call to gl_WARN_ON_USE_PREPARE([[#include ]], -+ [getline]) in configure.ac, which potentially defines -+ HAVE_RAW_DECL_GETLINE -+ - adding this code to a header that wraps the system : -+ #undef getline -+ #if HAVE_RAW_DECL_GETLINE -+ _GL_WARN_ON_USE (getline, "getline is required by POSIX 2008, but" -+ "not universally present; use the gnulib module getline"); -+ #endif -+ -+ It is not possible to directly poison global variables. But it is -+ possible to write a wrapper accessor function, and poison that -+ (less common usage, like &environ, will cause a compilation error -+ rather than issue the nice warning, but the end result of informing -+ the developer about their portability problem is still achieved): -+ #if HAVE_RAW_DECL_ENVIRON -+ static inline char ***rpl_environ (void) { return &environ; } -+ _GL_WARN_ON_USE (rpl_environ, "environ is not always properly declared"); -+ # undef environ -+ # define environ (*rpl_environ ()) -+ #endif -+ */ -+#ifndef _GL_WARN_ON_USE -+ -+# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) -+/* A compiler attribute is available in gcc versions 4.3.0 and later. */ -+# define _GL_WARN_ON_USE(function, message) \ -+extern __typeof__ (function) function __attribute__ ((__warning__ (message))) -+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING -+/* Verify the existence of the function. */ -+# define _GL_WARN_ON_USE(function, message) \ -+extern __typeof__ (function) function -+# else /* Unsupported. */ -+# define _GL_WARN_ON_USE(function, message) \ -+_GL_WARN_EXTERN_C int _gl_warn_on_use -+# endif -+#endif -+ -+/* _GL_WARN_ON_USE_CXX (function, rettype, parameters_and_attributes, "string") -+ is like _GL_WARN_ON_USE (function, "string"), except that the function is -+ declared with the given prototype, consisting of return type, parameters, -+ and attributes. -+ This variant is useful for overloaded functions in C++. _GL_WARN_ON_USE does -+ not work in this case. */ -+#ifndef _GL_WARN_ON_USE_CXX -+# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) -+# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \ -+extern rettype function parameters_and_attributes \ -+ __attribute__ ((__warning__ (msg))) -+# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING -+/* Verify the existence of the function. */ -+# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \ -+extern rettype function parameters_and_attributes -+# else /* Unsupported. */ -+# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \ -+_GL_WARN_EXTERN_C int _gl_warn_on_use -+# endif -+#endif -+ -+/* _GL_WARN_EXTERN_C declaration; -+ performs the declaration with C linkage. */ -+#ifndef _GL_WARN_EXTERN_C -+# if defined __cplusplus -+# define _GL_WARN_EXTERN_C extern "C" -+# else -+# define _GL_WARN_EXTERN_C extern -+# endif -+#endif -diff -Naurp libiconv-1.14.org//srclib/allocator.h libiconv-1.14/srclib/allocator.h ---- libiconv-1.14.org//srclib/allocator.h 2011-08-07 06:42:06.000000000 -0700 -+++ libiconv-1.14/srclib/allocator.h 2012-01-08 02:07:40.050484444 -0800 -@@ -45,11 +45,10 @@ struct allocator - /* Call FREE to free memory, like 'free'. */ - void (*free) (void *); - -- /* If nonnull, call DIE (SIZE) if MALLOC (SIZE) or REALLOC (..., -- SIZE) fails. DIE should not return. SIZE should equal SIZE_MAX -- if size_t overflow was detected while calculating sizes to be -- passed to MALLOC or REALLOC. */ -- void (*die) (size_t); -+ /* If nonnull, call DIE if MALLOC or REALLOC fails. DIE should not -+ return. DIE can be used by code that detects memory overflow -+ while calculating sizes to be passed to MALLOC or REALLOC. */ -+ void (*die) (void); - }; - - /* An allocator using the stdlib functions and a null DIE function. */ -diff -Naurp libiconv-1.14.org//srclib/canonicalize-lgpl.c libiconv-1.14/srclib/canonicalize-lgpl.c ---- libiconv-1.14.org//srclib/canonicalize-lgpl.c 2011-08-07 06:42:06.000000000 -0700 -+++ libiconv-1.14/srclib/canonicalize-lgpl.c 2012-01-08 02:07:40.094484446 -0800 -@@ -125,7 +125,7 @@ __realpath (const char *name, char *reso - #else - path_max = pathconf (name, _PC_PATH_MAX); - if (path_max <= 0) -- path_max = 8192; -+ path_max = 1024; - #endif - - if (resolved == NULL) -diff -Naurp libiconv-1.14.org//srclib/careadlinkat.c libiconv-1.14/srclib/careadlinkat.c ---- libiconv-1.14.org//srclib/careadlinkat.c 2011-08-07 06:42:06.000000000 -0700 -+++ libiconv-1.14/srclib/careadlinkat.c 2012-01-08 02:07:40.102484445 -0800 -@@ -133,7 +133,6 @@ careadlinkat (int fd, char const *filena - if (buf == stack_buf) - { - char *b = (char *) alloc->allocate (link_size); -- buf_size = link_size; - if (! b) - break; - memcpy (b, buf, link_size); -@@ -157,11 +156,6 @@ careadlinkat (int fd, char const *filena - buf_size *= 2; - else if (buf_size < buf_size_max) - buf_size = buf_size_max; -- else if (buf_size_max < SIZE_MAX) -- { -- errno = ENAMETOOLONG; -- return NULL; -- } - else - break; - buf = (char *) alloc->allocate (buf_size); -@@ -169,7 +163,7 @@ careadlinkat (int fd, char const *filena - while (buf); - - if (alloc->die) -- alloc->die (buf_size); -+ alloc->die (); - errno = ENOMEM; - return NULL; - } -diff -Naurp libiconv-1.14.org//srclib/errno.in.h libiconv-1.14/srclib/errno.in.h ---- libiconv-1.14.org//srclib/errno.in.h 2011-08-07 06:42:06.000000000 -0700 -+++ libiconv-1.14/srclib/errno.in.h 2012-01-08 02:07:40.122484446 -0800 -@@ -16,7 +16,7 @@ - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - --#ifndef _@GUARD_PREFIX@_ERRNO_H -+#ifndef _GL_ERRNO_H - - #if __GNUC__ >= 3 - @PRAGMA_SYSTEM_HEADER@ -@@ -26,8 +26,8 @@ - /* The include_next requires a split double-inclusion guard. */ - #@INCLUDE_NEXT@ @NEXT_ERRNO_H@ - --#ifndef _@GUARD_PREFIX@_ERRNO_H --#define _@GUARD_PREFIX@_ERRNO_H -+#ifndef _GL_ERRNO_H -+#define _GL_ERRNO_H - - - /* On native Windows platforms, many macros are not defined. */ -@@ -147,16 +147,6 @@ - # define GNULIB_defined_ENOTSUP 1 - # endif - --# ifndef ENETRESET --# define ENETRESET 2011 --# define GNULIB_defined_ENETRESET 1 --# endif -- --# ifndef ECONNABORTED --# define ECONNABORTED 2012 --# define GNULIB_defined_ECONNABORTED 1 --# endif -- - # ifndef ESTALE - # define ESTALE 2009 - # define GNULIB_defined_ESTALE 1 -@@ -173,5 +163,5 @@ - # endif - - --#endif /* _@GUARD_PREFIX@_ERRNO_H */ --#endif /* _@GUARD_PREFIX@_ERRNO_H */ -+#endif /* _GL_ERRNO_H */ -+#endif /* _GL_ERRNO_H */ -diff -Naurp libiconv-1.14.org//srclib/error.c libiconv-1.14/srclib/error.c ---- libiconv-1.14.org//srclib/error.c 2011-08-07 06:42:06.000000000 -0700 -+++ libiconv-1.14/srclib/error.c 2012-01-08 02:07:40.134484448 -0800 -@@ -97,15 +97,11 @@ extern void __error_at_line (int status, - /* The gnulib override of fcntl is not needed in this file. */ - # undef fcntl - --# if !HAVE_DECL_STRERROR_R -+# if !HAVE_DECL_STRERROR_R && STRERROR_R_CHAR_P - # ifndef HAVE_DECL_STRERROR_R - "this configure-time declaration test was not run" - # endif --# if STRERROR_R_CHAR_P - char *strerror_r (); --# else --int strerror_r (); --# endif - # endif - - /* The calling program should define program_name and set it to the -diff -Naurp libiconv-1.14.org//srclib/fcntl.in.h libiconv-1.14/srclib/fcntl.in.h ---- libiconv-1.14.org//srclib/fcntl.in.h 2011-08-07 06:42:06.000000000 -0700 -+++ libiconv-1.14/srclib/fcntl.in.h 2012-01-08 02:07:40.154484449 -0800 -@@ -40,7 +40,7 @@ - #else - /* Normal invocation convention. */ - --#ifndef _@GUARD_PREFIX@_FCNTL_H -+#ifndef _GL_FCNTL_H - - #include - /* On some systems other than glibc, is a prerequisite of -@@ -55,8 +55,8 @@ - /* The include_next requires a split double-inclusion guard. */ - #@INCLUDE_NEXT@ @NEXT_FCNTL_H@ - --#ifndef _@GUARD_PREFIX@_FCNTL_H --#define _@GUARD_PREFIX@_FCNTL_H -+#ifndef _GL_FCNTL_H -+#define _GL_FCNTL_H - - #ifndef __GLIBC__ /* Avoid namespace pollution on glibc systems. */ - # include -@@ -320,6 +320,6 @@ _GL_WARN_ON_USE (openat, "openat is not - #endif - - --#endif /* _@GUARD_PREFIX@_FCNTL_H */ --#endif /* _@GUARD_PREFIX@_FCNTL_H */ -+#endif /* _GL_FCNTL_H */ -+#endif /* _GL_FCNTL_H */ - #endif -diff -Naurp libiconv-1.14.org//srclib/intprops.h libiconv-1.14/srclib/intprops.h ---- libiconv-1.14.org//srclib/intprops.h 2011-08-07 06:42:06.000000000 -0700 -+++ libiconv-1.14/srclib/intprops.h 2012-01-08 02:07:40.174484450 -0800 -@@ -22,13 +22,14 @@ - - #include - --/* Return an integer value, converted to the same type as the integer -- expression E after integer type promotion. V is the unconverted value. */ --#define _GL_INT_CONVERT(e, v) (0 * (e) + (v)) -+/* Return a integer value, converted to the same type as the integer -+ expression E after integer type promotion. V is the unconverted value. -+ E should not have side effects. */ -+#define _GL_INT_CONVERT(e, v) ((e) - (e) + (v)) - - /* Act like _GL_INT_CONVERT (E, -V) but work around a bug in IRIX 6.5 cc; see - . */ --#define _GL_INT_NEGATE_CONVERT(e, v) (0 * (e) - (v)) -+#define _GL_INT_NEGATE_CONVERT(e, v) ((e) - (e) - (v)) - - /* The extra casts in the following macros work around compiler bugs, - e.g., in Cray C 5.0.3.0. */ -@@ -52,7 +53,7 @@ - #define TYPE_SIGNED(t) (! ((t) 0 < (t) -1)) - - /* Return 1 if the integer expression E, after integer promotion, has -- a signed type. */ -+ a signed type. E should not have side effects. */ - #define _GL_INT_SIGNED(e) (_GL_INT_NEGATE_CONVERT (e, 1) < 0) - - -@@ -310,10 +311,13 @@ - /* Return 1 if the expression A B would overflow, - where OP_RESULT_OVERFLOW (A, B, MIN, MAX) does the actual test, - assuming MIN and MAX are the minimum and maximum for the result type. -- Arguments should be free of side effects. */ -+ -+ This macro assumes that A | B is a valid integer if both A and B are, -+ which is true of all known practical hosts. If this is a problem -+ for you, please let us know how to fix it for your host. */ - #define _GL_BINARY_OP_OVERFLOW(a, b, op_result_overflow) \ - op_result_overflow (a, b, \ -- _GL_INT_MINIMUM (0 * (b) + (a)), \ -- _GL_INT_MAXIMUM (0 * (b) + (a))) -+ _GL_INT_MINIMUM ((a) | (b)), \ -+ _GL_INT_MAXIMUM ((a) | (b))) - - #endif /* _GL_INTPROPS_H */ -diff -Naurp libiconv-1.14.org//srclib/Makefile.gnulib libiconv-1.14/srclib/Makefile.gnulib ---- libiconv-1.14.org//srclib/Makefile.gnulib 2012-01-08 02:05:18.754477606 -0800 -+++ libiconv-1.14/srclib/Makefile.gnulib 2012-01-08 02:07:43.138484592 -0800 -@@ -9,7 +9,7 @@ - # the same distribution terms as the rest of that program. - # - # Generated by gnulib-tool. --# Reproduce by: gnulib-tool --import --dir=. --local-dir=gnulib-local --lib=libicrt --source-base=srclib --m4-base=srcm4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --makefile-name=Makefile.gnulib --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files binary-io error gettext gettext-h libiconv-misc mbstate memmove progname relocatable-prog safe-read sigpipe stdio stdlib strerror unistd uniwidth/width unlocked-io xalloc -+# Reproduce by: gnulib-tool --import --dir=. --local-dir=gnulib-local --lib=libicrt --source-base=srclib --m4-base=srcm4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --makefile-name=Makefile.gnulib --no-libtool --macro-prefix=gl --no-vc-files binary-io error gettext gettext-h libiconv-misc mbstate memmove progname relocatable relocatable-prog safe-read sigpipe stdio stdlib strerror unistd uniwidth/width unlocked-io xalloc - - - MOSTLYCLEANFILES += core *.stackdump -@@ -60,12 +60,60 @@ EXTRA_DIST += areadlink.h - - ## end gnulib module areadlink - -+## begin gnulib module arg-nonnull -+ -+# The BUILT_SOURCES created by this Makefile snippet are not used via #include -+# statements but through direct file reference. Therefore this snippet must be -+# present in all Makefile.am that need it. This is ensured by the applicability -+# 'all' defined above. -+ -+BUILT_SOURCES += arg-nonnull.h -+# The arg-nonnull.h that gets inserted into generated .h files is the same as -+# build-aux/arg-nonnull.h, except that it has the copyright header cut off. -+arg-nonnull.h: $(top_srcdir)/build-aux/arg-nonnull.h -+ $(AM_V_GEN)rm -f $@-t $@ && \ -+ sed -n -e '/GL_ARG_NONNULL/,$$p' \ -+ < $(top_srcdir)/build-aux/arg-nonnull.h \ -+ > $@-t && \ -+ mv $@-t $@ -+MOSTLYCLEANFILES += arg-nonnull.h arg-nonnull.h-t -+ -+ARG_NONNULL_H=arg-nonnull.h -+ -+EXTRA_DIST += $(top_srcdir)/build-aux/arg-nonnull.h -+ -+## end gnulib module arg-nonnull -+ - ## begin gnulib module binary-io - - libicrt_a_SOURCES += binary-io.h - - ## end gnulib module binary-io - -+## begin gnulib module c++defs -+ -+# The BUILT_SOURCES created by this Makefile snippet are not used via #include -+# statements but through direct file reference. Therefore this snippet must be -+# present in all Makefile.am that need it. This is ensured by the applicability -+# 'all' defined above. -+ -+BUILT_SOURCES += c++defs.h -+# The c++defs.h that gets inserted into generated .h files is the same as -+# build-aux/c++defs.h, except that it has the copyright header cut off. -+c++defs.h: $(top_srcdir)/build-aux/c++defs.h -+ $(AM_V_GEN)rm -f $@-t $@ && \ -+ sed -n -e '/_GL_CXXDEFS/,$$p' \ -+ < $(top_srcdir)/build-aux/c++defs.h \ -+ > $@-t && \ -+ mv $@-t $@ -+MOSTLYCLEANFILES += c++defs.h c++defs.h-t -+ -+CXXDEFS_H=c++defs.h -+ -+EXTRA_DIST += $(top_srcdir)/build-aux/c++defs.h -+ -+## end gnulib module c++defs -+ - ## begin gnulib module canonicalize-lgpl - - -@@ -100,8 +148,7 @@ if GL_GENERATE_ERRNO_H - errno.h: errno.in.h $(top_builddir)/config.status - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ -- sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_ERRNO_H''@|$(NEXT_ERRNO_H)|g' \ -@@ -142,15 +189,14 @@ BUILT_SOURCES += fcntl.h - fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -- sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \ -- -e 's/@''GNULIB_FCNTL''@/$(GNULIB_FCNTL)/g' \ -- -e 's/@''GNULIB_NONBLOCKING''@/$(GNULIB_NONBLOCKING)/g' \ -- -e 's/@''GNULIB_OPEN''@/$(GNULIB_OPEN)/g' \ -- -e 's/@''GNULIB_OPENAT''@/$(GNULIB_OPENAT)/g' \ -+ -e 's|@''GNULIB_FCNTL''@|$(GNULIB_FCNTL)|g' \ -+ -e 's|@''GNULIB_NONBLOCKING''@|$(GNULIB_NONBLOCKING)|g' \ -+ -e 's|@''GNULIB_OPEN''@|$(GNULIB_OPEN)|g' \ -+ -e 's|@''GNULIB_OPENAT''@|$(GNULIB_OPENAT)|g' \ - -e 's|@''HAVE_FCNTL''@|$(HAVE_FCNTL)|g' \ - -e 's|@''HAVE_OPENAT''@|$(HAVE_OPENAT)|g' \ - -e 's|@''REPLACE_FCNTL''@|$(REPLACE_FCNTL)|g' \ -@@ -297,7 +343,7 @@ EXTRA_DIST += $(top_srcdir)/build-aux/co - ## begin gnulib module relocatable-prog-wrapper - - --EXTRA_DIST += allocator.c allocator.h areadlink.c areadlink.h c-ctype.c c-ctype.h canonicalize-lgpl.c careadlinkat.c careadlinkat.h malloca.c malloca.h progname.c progname.h progreloc.c readlink.c relocatable.c relocatable.h relocwrapper.c setenv.c -+EXTRA_DIST += allocator.c allocator.h areadlink.c areadlink.h c-ctype.c c-ctype.h canonicalize-lgpl.c careadlinkat.c careadlinkat.h malloca.c malloca.h progname.c progname.h progreloc.c readlink.c relocatable.c relocatable.h relocwrapper.c setenv.c strerror.c - - EXTRA_DIST += $(top_srcdir)/build-aux/install-reloc - -@@ -305,9 +351,10 @@ EXTRA_DIST += $(top_srcdir)/build-aux/in - - ## begin gnulib module safe-read - --libicrt_a_SOURCES += safe-read.c - --EXTRA_DIST += safe-read.h -+EXTRA_DIST += safe-read.c safe-read.h -+ -+EXTRA_libicrt_a_SOURCES += safe-read.c - - ## end gnulib module safe-read - -@@ -320,24 +367,20 @@ BUILT_SOURCES += signal.h - signal.h: signal.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ -- sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SIGNAL_H''@|$(NEXT_SIGNAL_H)|g' \ -- -e 's|@''GNULIB_PTHREAD_SIGMASK''@|$(GNULIB_PTHREAD_SIGMASK)|g' \ -- -e 's/@''GNULIB_SIGNAL_H_SIGPIPE''@/$(GNULIB_SIGNAL_H_SIGPIPE)/g' \ -- -e 's/@''GNULIB_SIGPROCMASK''@/$(GNULIB_SIGPROCMASK)/g' \ -- -e 's/@''GNULIB_SIGACTION''@/$(GNULIB_SIGACTION)/g' \ -+ -e 's|@''GNULIB_SIGNAL_H_SIGPIPE''@|$(GNULIB_SIGNAL_H_SIGPIPE)|g' \ -+ -e 's|@''GNULIB_SIGPROCMASK''@|$(GNULIB_SIGPROCMASK)|g' \ -+ -e 's|@''GNULIB_SIGACTION''@|$(GNULIB_SIGACTION)|g' \ - -e 's|@''HAVE_POSIX_SIGNALBLOCKING''@|$(HAVE_POSIX_SIGNALBLOCKING)|g' \ -- -e 's|@''HAVE_PTHREAD_SIGMASK''@|$(HAVE_PTHREAD_SIGMASK)|g' \ - -e 's|@''HAVE_SIGSET_T''@|$(HAVE_SIGSET_T)|g' \ - -e 's|@''HAVE_SIGINFO_T''@|$(HAVE_SIGINFO_T)|g' \ - -e 's|@''HAVE_SIGACTION''@|$(HAVE_SIGACTION)|g' \ - -e 's|@''HAVE_STRUCT_SIGACTION_SA_SIGACTION''@|$(HAVE_STRUCT_SIGACTION_SA_SIGACTION)|g' \ - -e 's|@''HAVE_TYPE_VOLATILE_SIG_ATOMIC_T''@|$(HAVE_TYPE_VOLATILE_SIG_ATOMIC_T)|g' \ - -e 's|@''HAVE_SIGHANDLER_T''@|$(HAVE_SIGHANDLER_T)|g' \ -- -e 's|@''REPLACE_PTHREAD_SIGMASK''@|$(REPLACE_PTHREAD_SIGMASK)|g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ -@@ -368,87 +411,6 @@ EXTRA_libicrt_a_SOURCES += sigprocmask.c - - ## end gnulib module sigprocmask - --## begin gnulib module snippet/_Noreturn -- --# Because this Makefile snippet defines a variable used by other --# gnulib Makefile snippets, it must be present in all Makefile.am that --# need it. This is ensured by the applicability 'all' defined above. -- --_NORETURN_H=$(top_srcdir)/build-aux/snippet/_Noreturn.h -- --EXTRA_DIST += $(top_srcdir)/build-aux/snippet/_Noreturn.h -- --## end gnulib module snippet/_Noreturn -- --## begin gnulib module snippet/arg-nonnull -- --# The BUILT_SOURCES created by this Makefile snippet are not used via #include --# statements but through direct file reference. Therefore this snippet must be --# present in all Makefile.am that need it. This is ensured by the applicability --# 'all' defined above. -- --BUILT_SOURCES += arg-nonnull.h --# The arg-nonnull.h that gets inserted into generated .h files is the same as --# build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut --# off. --arg-nonnull.h: $(top_srcdir)/build-aux/snippet/arg-nonnull.h -- $(AM_V_GEN)rm -f $@-t $@ && \ -- sed -n -e '/GL_ARG_NONNULL/,$$p' \ -- < $(top_srcdir)/build-aux/snippet/arg-nonnull.h \ -- > $@-t && \ -- mv $@-t $@ --MOSTLYCLEANFILES += arg-nonnull.h arg-nonnull.h-t -- --ARG_NONNULL_H=arg-nonnull.h -- --EXTRA_DIST += $(top_srcdir)/build-aux/snippet/arg-nonnull.h -- --## end gnulib module snippet/arg-nonnull -- --## begin gnulib module snippet/c++defs -- --# The BUILT_SOURCES created by this Makefile snippet are not used via #include --# statements but through direct file reference. Therefore this snippet must be --# present in all Makefile.am that need it. This is ensured by the applicability --# 'all' defined above. -- --BUILT_SOURCES += c++defs.h --# The c++defs.h that gets inserted into generated .h files is the same as --# build-aux/snippet/c++defs.h, except that it has the copyright header cut off. --c++defs.h: $(top_srcdir)/build-aux/snippet/c++defs.h -- $(AM_V_GEN)rm -f $@-t $@ && \ -- sed -n -e '/_GL_CXXDEFS/,$$p' \ -- < $(top_srcdir)/build-aux/snippet/c++defs.h \ -- > $@-t && \ -- mv $@-t $@ --MOSTLYCLEANFILES += c++defs.h c++defs.h-t -- --CXXDEFS_H=c++defs.h -- --EXTRA_DIST += $(top_srcdir)/build-aux/snippet/c++defs.h -- --## end gnulib module snippet/c++defs -- --## begin gnulib module snippet/warn-on-use -- --BUILT_SOURCES += warn-on-use.h --# The warn-on-use.h that gets inserted into generated .h files is the same as --# build-aux/snippet/warn-on-use.h, except that it has the copyright header cut --# off. --warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h -- $(AM_V_GEN)rm -f $@-t $@ && \ -- sed -n -e '/^.ifndef/,$$p' \ -- < $(top_srcdir)/build-aux/snippet/warn-on-use.h \ -- > $@-t && \ -- mv $@-t $@ --MOSTLYCLEANFILES += warn-on-use.h warn-on-use.h-t -- --WARN_ON_USE_H=warn-on-use.h -- --EXTRA_DIST += $(top_srcdir)/build-aux/snippet/warn-on-use.h -- --## end gnulib module snippet/warn-on-use -- - ## begin gnulib module stat - - -@@ -491,8 +453,7 @@ if GL_GENERATE_STDDEF_H - stddef.h: stddef.in.h $(top_builddir)/config.status - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ -- sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \ -@@ -521,8 +482,7 @@ if GL_GENERATE_STDINT_H - stdint.h: stdint.in.h $(top_builddir)/config.status - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -- sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -- -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \ -+ sed -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -@@ -570,63 +530,62 @@ BUILT_SOURCES += stdio.h - stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ -- sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -- -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -+ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \ -- -e 's/@''GNULIB_DPRINTF''@/$(GNULIB_DPRINTF)/g' \ -- -e 's/@''GNULIB_FCLOSE''@/$(GNULIB_FCLOSE)/g' \ -- -e 's/@''GNULIB_FFLUSH''@/$(GNULIB_FFLUSH)/g' \ -- -e 's/@''GNULIB_FGETC''@/$(GNULIB_FGETC)/g' \ -- -e 's/@''GNULIB_FGETS''@/$(GNULIB_FGETS)/g' \ -- -e 's/@''GNULIB_FOPEN''@/$(GNULIB_FOPEN)/g' \ -- -e 's/@''GNULIB_FPRINTF''@/$(GNULIB_FPRINTF)/g' \ -- -e 's/@''GNULIB_FPRINTF_POSIX''@/$(GNULIB_FPRINTF_POSIX)/g' \ -- -e 's/@''GNULIB_FPURGE''@/$(GNULIB_FPURGE)/g' \ -- -e 's/@''GNULIB_FPUTC''@/$(GNULIB_FPUTC)/g' \ -- -e 's/@''GNULIB_FPUTS''@/$(GNULIB_FPUTS)/g' \ -- -e 's/@''GNULIB_FREAD''@/$(GNULIB_FREAD)/g' \ -- -e 's/@''GNULIB_FREOPEN''@/$(GNULIB_FREOPEN)/g' \ -- -e 's/@''GNULIB_FSCANF''@/$(GNULIB_FSCANF)/g' \ -- -e 's/@''GNULIB_FSEEK''@/$(GNULIB_FSEEK)/g' \ -- -e 's/@''GNULIB_FSEEKO''@/$(GNULIB_FSEEKO)/g' \ -- -e 's/@''GNULIB_FTELL''@/$(GNULIB_FTELL)/g' \ -- -e 's/@''GNULIB_FTELLO''@/$(GNULIB_FTELLO)/g' \ -- -e 's/@''GNULIB_FWRITE''@/$(GNULIB_FWRITE)/g' \ -- -e 's/@''GNULIB_GETC''@/$(GNULIB_GETC)/g' \ -- -e 's/@''GNULIB_GETCHAR''@/$(GNULIB_GETCHAR)/g' \ -- -e 's/@''GNULIB_GETDELIM''@/$(GNULIB_GETDELIM)/g' \ -- -e 's/@''GNULIB_GETLINE''@/$(GNULIB_GETLINE)/g' \ -- -e 's/@''GNULIB_GETS''@/$(GNULIB_GETS)/g' \ -- -e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GNULIB_OBSTACK_PRINTF)/g' \ -- -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GNULIB_OBSTACK_PRINTF_POSIX)/g' \ -- -e 's/@''GNULIB_PERROR''@/$(GNULIB_PERROR)/g' \ -- -e 's/@''GNULIB_POPEN''@/$(GNULIB_POPEN)/g' \ -- -e 's/@''GNULIB_PRINTF''@/$(GNULIB_PRINTF)/g' \ -- -e 's/@''GNULIB_PRINTF_POSIX''@/$(GNULIB_PRINTF_POSIX)/g' \ -- -e 's/@''GNULIB_PUTC''@/$(GNULIB_PUTC)/g' \ -- -e 's/@''GNULIB_PUTCHAR''@/$(GNULIB_PUTCHAR)/g' \ -- -e 's/@''GNULIB_PUTS''@/$(GNULIB_PUTS)/g' \ -- -e 's/@''GNULIB_REMOVE''@/$(GNULIB_REMOVE)/g' \ -- -e 's/@''GNULIB_RENAME''@/$(GNULIB_RENAME)/g' \ -- -e 's/@''GNULIB_RENAMEAT''@/$(GNULIB_RENAMEAT)/g' \ -- -e 's/@''GNULIB_SCANF''@/$(GNULIB_SCANF)/g' \ -- -e 's/@''GNULIB_SNPRINTF''@/$(GNULIB_SNPRINTF)/g' \ -- -e 's/@''GNULIB_SPRINTF_POSIX''@/$(GNULIB_SPRINTF_POSIX)/g' \ -- -e 's/@''GNULIB_STDIO_H_NONBLOCKING''@/$(GNULIB_STDIO_H_NONB