This is the mail archive of the
gcc-bugs@gcc.gnu.org
mailing list for the GCC project.
Re: Irix build fails in gcc/fixinc
- To: "Kaveh R. Ghazi" <ghazi at caip dot rutgers dot edu>
- Subject: Re: Irix build fails in gcc/fixinc
- From: Bruce Korb <bkorb at sco dot COM>
- Date: Thu, 14 Dec 2000 10:57:31 -0800
- CC: David dot Billinghurst at riotinto dot com, bkorb at gnu dot org, gcc-bugs at gcc dot gnu dot org, gcc-patches at gcc dot gnu dot org
- Organization: The Santa Cruz Operation
- References: <200012141819.NAA27007@caip.rutgers.edu>
"Kaveh R. Ghazi" wrote:
> This patch:
>
> > 2000-12-13 Bruce Korb <bkorb@gnu.org>
> > * fixinc/gnu-regex.c: reorder some includes to avoid _GNU_SOURCE
> > warning. Also, eliminate the ``#ifdef emacs'' stuff.
>
> moved auto-host.h above the aforementioned code. Suddenly ENABLE_NLS
> is defined and we don't elide `gettext'. Since fixincl doesn't link
> with libintl.a, it chokes.
>
> The solution IMHO would be to either #undef ENABLE_NLS right after
> including auto-host.h, or link with libintl.a. Since fixincl is a
> "build" program, we probably don't need/want to intl it.
>
> This patch allows fixincl to link on Irix6. OK to install?
I think yours is better than mine (below). So, please, go ahead.
Thanks!
> 2000-12-14 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
>
> * fixinc/gnu-regex.c: Disable NLS.
>
> diff -rup orig/egcs-CVS20001213/gcc/fixinc/gnu-regex.c egcs-CVS20001213/gcc/fixinc/gnu-regex.c
> --- orig/egcs-CVS20001213/gcc/fixinc/gnu-regex.c Wed Dec 13 16:29:46 2000
> +++ egcs-CVS20001213/gcc/fixinc/gnu-regex.c Thu Dec 14 12:51:32 2000
> @@ -23,6 +23,8 @@
> Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
>
> #include "auto-host.h"
> +/* GCC LOCAL: we don't need NLS here. */
> +#undef ENABLE_NLS
>
> #undef _GNU_SOURCE
> #define _GNU_SOURCE
Index: gnu-regex.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/fixinc/gnu-regex.c,v
retrieving revision 1.11
diff -u -r1.11 gnu-regex.c
--- gnu-regex.c 2000/12/13 20:07:46 1.11
+++ gnu-regex.c 2000/12/14 18:51:48
@@ -22,9 +22,6 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-#include "auto-host.h"
-
-#undef _GNU_SOURCE
#define _GNU_SOURCE
#ifdef HAVE_CONFIG_H
@@ -77,6 +74,8 @@
strings. */
# define gettext_noop(String) String
#endif
+
+#include "auto-host.h"
# if !defined(volatile) && !defined(HAVE_VOLATILE)
# define volatile