svn commit: trunk/uClibc/utils

[psm at uclibc.org]

Author: psm
Date: 2005-12-10 10:27:03 -0800 (Sat, 10 Dec 2005)
New Revision: 12822

Log:
Solve warning about redefined _GNU_SOURCE, allow iconv to build

Modified:
   trunk/uClibc/utils/Makefile.in
   trunk/uClibc/utils/ldd.c


Changeset:
Modified: trunk/uClibc/utils/Makefile.in
===================================================================
--- trunk/uClibc/utils/Makefile.in	2005-12-10 18:26:05 UTC (rev 12821)
+++ trunk/uClibc/utils/Makefile.in	2005-12-10 18:27:03 UTC (rev 12822)
@@ -20,7 +20,8 @@
 
 CFLAGS-ldd := $(CFLAGS-utils-common) $(CFLAGS-utils-shared) -D_GNU_SOURCE
 
-CFLAGS-iconv := $(CFLAGS-utils-shared) -DL_iconv_main
+# needs CFLAGS-utils explicitely, because the source file is not located in utils
+CFLAGS-iconv := $(CFLAGS-utils) $(CFLAGS-utils-shared) -DL_iconv_main
 
 CFLAGS-readelf := $(CFLAGS-utils-shared)
 

Modified: trunk/uClibc/utils/ldd.c
===================================================================
--- trunk/uClibc/utils/ldd.c	2005-12-10 18:26:05 UTC (rev 12821)
+++ trunk/uClibc/utils/ldd.c	2005-12-10 18:27:03 UTC (rev 12822)
@@ -26,7 +26,9 @@
  *
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE
+#endif
 #include <stdlib.h>
 #include <stdio.h>
 #include <fcntl.h>