OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Matthias Kurz
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 13-Sep-2005 21:47:25
Branch: HEAD Handle: 2005091320472500
Modified files:
openpkg-src/binutils binutils.patch binutils.spec
Log:
Problems with --disable-nls under Solaris
- Prevent inclusion of <libintl.h>, when ENABLE_NLS is not set.
When ENABLE_NLS is not set, some parts of binutils are declaring dummy
versions of bindtextdomain, texdomain etc.
<locale.h> under Solaris includes <libintl.h>, which leads to problems,
because the dummy definitions conflict with the definitions in libintl.h.
- Finally the dummy routines lead to a compilation error in gprof.c, because
they generate a warning ("statement without effect", or so) and the
compiler switch -Werror is used.
Real errors happen only in the current CVS version, but there where many
warnings in 2.16.1, so i applied the patch anyway.
Summary:
Revision Changes Path
1.14 +64 -0 openpkg-src/binutils/binutils.patch
1.65 +1 -1 openpkg-src/binutils/binutils.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/binutils/binutils.patch
============================================================================
$ cvs diff -u -r1.13 -r1.14 binutils.patch
--- openpkg-src/binutils/binutils.patch 3 May 2005 17:59:39 -0000
1.13
+++ openpkg-src/binutils/binutils.patch 13 Sep 2005 19:47:25 -0000
1.14
@@ -36,3 +36,67 @@
i[3-7]86-*-bsd* | i[3-7]86-*-freebsd[123] | i[3-7]86-*-freebsd[123]\.* |
i[3-7]86-*-freebsd4\.[01234] | i[3-7]86-*-freebsd4\.[01234]\.* |
i[3-7]86-*-freebsd*aout*)
COREFILE=trad-core.lo
TRAD_HEADER='"hosts/i386bsd.h"'
+
+-----------------------------------------------------------------------------
+
+Fight problems with --disable-nls under Solaris
+
+Index: binutils/bucomm.h
+--- binutils/bucomm.h.orig 2005-08-16 21:35:21.000000000 +0200
++++ binutils/bucomm.h 2005-09-13 16:55:29.276456000 +0200
+@@ -125,6 +125,11 @@
+ # endif /* HAVE_ALLOCA_H */
+ #endif
+
++#ifndef ENABLE_NLS
++# define _LIBINTL_H
++# define _LIBGETTEXT_H
++#endif
++
+ #ifdef HAVE_LOCALE_H
+ # include <locale.h>
+ #endif
+Index: gas/asintl.h
+--- gas/asintl.h.orig 2005-05-05 11:12:43.000000000 +0200
++++ gas/asintl.h 2005-09-13 16:58:29.082469000 +0200
+@@ -20,6 +20,11 @@
+ Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
+ 02110-1301, USA. */
+
++#ifndef ENABLE_NLS
++# define _LIBINTL_H
++# define _LIBGETTEXT_H
++#endif
++
+ #ifdef HAVE_LOCALE_H
+ # include <locale.h>
+ #endif
+Index: gprof/gprof.c
+--- gprof/gprof.c.orig 2005-04-23 19:13:31.000000000 +0200
++++ gprof/gprof.c 2005-09-13 17:13:52.242443000 +0200
+@@ -189,8 +189,10 @@
+ #if defined (HAVE_SETLOCALE)
+ setlocale (LC_CTYPE, "");
+ #endif
++#ifdef ENABLE_NLS
+ bindtextdomain (PACKAGE, LOCALEDIR);
+ textdomain (PACKAGE);
++#endif
+
+ whoami = argv[0];
+ xmalloc_set_program_name (whoami);
+Index: ld/ld.h
+--- ld/ld.h.orig 2005-06-09 04:05:46.000000000 +0200
++++ ld/ld.h 2005-09-13 17:24:03.767249000 +0200
+@@ -23,6 +23,11 @@
+ #ifndef LD_H
+ #define LD_H
+
++#ifndef ENABLE_NLS
++# define _LIBINTL_H
++# define _LIBGETTEXT_H
++#endif
++
+ #ifdef HAVE_LOCALE_H
+ # include <locale.h>
+ #endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/binutils/binutils.spec
============================================================================
$ cvs diff -u -r1.64 -r1.65 binutils.spec
--- openpkg-src/binutils/binutils.spec 9 Sep 2005 05:55:27 -0000
1.64
+++ openpkg-src/binutils/binutils.spec 13 Sep 2005 19:47:25 -0000
1.65
@@ -33,7 +33,7 @@
Group: Utility
License: GPL
Version: 2.16.1
-Release: 20050909
+Release: 20050913
# list of sources
Source0:
ftp://sources.redhat.com/pub/binutils/releases/binutils-%{version}.tar.bz2
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
