gettext/gettext.patch

Wed, 01 Aug 2012 23:49:03 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Wed, 01 Aug 2012 23:49:03 +0200
changeset 436
f26e9329b115
permissions
-rw-r--r--

Hack rpmconstant header file to allow targets to build, because...
Solaris studio cc(1) fails to build targets in rpmconstant with errors:
'undefined symbol first referenced in file constant.o' regarding symbols:
rpmdsInit, rpmdsNext, rpmdsTagN, rpmHeaderFormats, hdrVec, rpmTagTable,
rpmdsSearch, rpmdsResult, rpmTags, rpmdsIx, rpmdsDNEVR, rpmdsSetResult.
It seems that these symbols are not used by RPM in any way, and thus
the build configuration can succeed without including the nasty headers.

     1 Index: gettext-runtime/intl/plural-exp.c
     2 --- gettext-runtime/intl/plural-exp.c.orig	2009-06-28 21:44:04.000000000 +0200
     3 +++ gettext-runtime/intl/plural-exp.c	2010-05-10 08:51:14.000000000 +0200
     4 @@ -27,7 +27,7 @@
     6  #include "plural-exp.h"
     8 -#if (defined __GNUC__ && !(__APPLE_CC__ > 1) && !defined __cplusplus) \
     9 +#if (defined __GNUC__ && !(__APPLE_CC__+0 > 1) && !defined __cplusplus) \
    10      || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
    12  /* These structs are the constant expression for the germanic plural
    13 Index: gettext-tools/gnulib-lib/execute.c
    14 --- gettext-tools/gnulib-lib/execute.c.orig	2010-02-16 22:32:17.000000000 +0100
    15 +++ gettext-tools/gnulib-lib/execute.c	2010-05-10 20:22:18.000000000 +0200
    16 @@ -200,6 +200,9 @@
    17       subprocess to exit with return code 127.  It is implementation
    18       dependent which error is reported which way.  We treat both cases as
    19       equivalent.  */
    20 +#ifndef HAVE_ENVIRON_DECL
    21 +  extern char **environ;
    22 +#endif
    23    sigset_t blocked_signals;
    24    posix_spawn_file_actions_t actions;
    25    bool actions_allocated;

mercurial