From b0392b06610821bd0d0fe0756970cb814c454783 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 29 Dec 2007 20:31:48 +0000
Subject: [PATCH] replace cflags hacks with the correct solution

SVN-Revision: 10031
---
 package/ipsec-tools/Makefile    | 2 --
 package/keynote/Makefile        | 2 --
 toolchain/uClibc/config/arm     | 2 +-
 toolchain/uClibc/config/armeb   | 2 +-
 toolchain/uClibc/config/avr32   | 2 +-
 toolchain/uClibc/config/i386    | 2 +-
 toolchain/uClibc/config/i686    | 2 +-
 toolchain/uClibc/config/mips    | 2 +-
 toolchain/uClibc/config/mipsel  | 2 +-
 toolchain/uClibc/config/powerpc | 2 +-
 10 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile
index 08c6c92023..0f24ae12ee 100644
--- a/package/ipsec-tools/Makefile
+++ b/package/ipsec-tools/Makefile
@@ -42,8 +42,6 @@ CONFIGURE_ARGS += \
 	--enable-adminport \
 	--enable-ipv6
 
-TARGET_CFLAGS += -Dbcopy=memmove -Dindex\(s,c\)=strchr\(s,c\)
-
 define Build/Configure
 	(cd $(PKG_BUILD_DIR); touch \
 		configure.ac \
diff --git a/package/keynote/Makefile b/package/keynote/Makefile
index 56bbeb0e58..5b27257b4a 100644
--- a/package/keynote/Makefile
+++ b/package/keynote/Makefile
@@ -40,8 +40,6 @@ CONFIGURE_ARGS += \
 MAKE_FLAGS += \
 	CFLAGS="$(TARGET_CFLAGS)"
 
-TARGET_CFLAGS += -Dbcopy=memmove -Dindex\(s,c\)=strchr\(s,c\)
-
 define Build/InstallDev
 	mkdir -p $(1)/usr/include/keynote
 	$(CP) $(PKG_BUILD_DIR)/{assertion,header,keynote,signature}.h $(1)/usr/include/keynote/
diff --git a/toolchain/uClibc/config/arm b/toolchain/uClibc/config/arm
index c409daea08..ee1e47a6dc 100644
--- a/toolchain/uClibc/config/arm
+++ b/toolchain/uClibc/config/arm
@@ -94,7 +94,7 @@ UCLIBC_DYNAMIC_ATEXIT=y
 HAS_SHADOW=y
 COMPAT_ATEXIT=y
 # UCLIBC_SUSV3_LEGACY is not set
-# UCLIBC_SUSV3_LEGACY_MACROS is not set
+UCLIBC_SUSV3_LEGACY_MACROS=y
 # UCLIBC_HAS_SHADOW is not set
 # UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
 UCLIBC_HAS___PROGNAME=y
diff --git a/toolchain/uClibc/config/armeb b/toolchain/uClibc/config/armeb
index baea691f89..367a07a899 100644
--- a/toolchain/uClibc/config/armeb
+++ b/toolchain/uClibc/config/armeb
@@ -95,7 +95,7 @@ UCLIBC_DYNAMIC_ATEXIT=y
 HAS_SHADOW=y
 COMPAT_ATEXIT=y
 # UCLIBC_SUSV3_LEGACY is not set
-# UCLIBC_SUSV3_LEGACY_MACROS is not set
+UCLIBC_SUSV3_LEGACY_MACROS=y
 # UCLIBC_HAS_SHADOW is not set
 # UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
 UCLIBC_HAS___PROGNAME=y
diff --git a/toolchain/uClibc/config/avr32 b/toolchain/uClibc/config/avr32
index 821ad7c8f9..dc55e802a5 100644
--- a/toolchain/uClibc/config/avr32
+++ b/toolchain/uClibc/config/avr32
@@ -79,7 +79,7 @@ UCLIBC_DYNAMIC_ATEXIT=y
 HAS_SHADOW=y
 COMPAT_ATEXIT=y
 # UCLIBC_SUSV3_LEGACY is not set
-# UCLIBC_SUSV3_LEGACY_MACROS is not set
+UCLIBC_SUSV3_LEGACY_MACROS=y
 # UCLIBC_HAS_SHADOW is not set
 # UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
 UCLIBC_HAS___PROGNAME=y
diff --git a/toolchain/uClibc/config/i386 b/toolchain/uClibc/config/i386
index ad4342f57b..edc72b5cb4 100644
--- a/toolchain/uClibc/config/i386
+++ b/toolchain/uClibc/config/i386
@@ -95,7 +95,7 @@ MALLOC_GLIBC_COMPAT=y
 UCLIBC_DYNAMIC_ATEXIT=y
 COMPAT_ATEXIT=y
 # UCLIBC_SUSV3_LEGACY is not set
-# UCLIBC_SUSV3_LEGACY_MACROS is not set
+UCLIBC_SUSV3_LEGACY_MACROS=y
 # UCLIBC_HAS_SHADOW is not set
 # UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
 UCLIBC_HAS___PROGNAME=y
diff --git a/toolchain/uClibc/config/i686 b/toolchain/uClibc/config/i686
index d0e99310a6..546d2eed49 100644
--- a/toolchain/uClibc/config/i686
+++ b/toolchain/uClibc/config/i686
@@ -95,7 +95,7 @@ MALLOC_GLIBC_COMPAT=y
 UCLIBC_DYNAMIC_ATEXIT=y
 COMPAT_ATEXIT=y
 # UCLIBC_SUSV3_LEGACY is not set
-# UCLIBC_SUSV3_LEGACY_MACROS is not set
+UCLIBC_SUSV3_LEGACY_MACROS=y
 # UCLIBC_HAS_SHADOW is not set
 # UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
 UCLIBC_HAS___PROGNAME=y
diff --git a/toolchain/uClibc/config/mips b/toolchain/uClibc/config/mips
index cf819f6785..a783f8bad5 100644
--- a/toolchain/uClibc/config/mips
+++ b/toolchain/uClibc/config/mips
@@ -92,7 +92,7 @@ UCLIBC_DYNAMIC_ATEXIT=y
 HAS_SHADOW=y
 COMPAT_ATEXIT=y
 # UCLIBC_SUSV3_LEGACY is not set
-# UCLIBC_SUSV3_LEGACY_MACROS is not set
+UCLIBC_SUSV3_LEGACY_MACROS=y
 # UCLIBC_HAS_SHADOW is not set
 # UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
 UCLIBC_HAS___PROGNAME=y
diff --git a/toolchain/uClibc/config/mipsel b/toolchain/uClibc/config/mipsel
index b8efcff264..11940ffdd6 100644
--- a/toolchain/uClibc/config/mipsel
+++ b/toolchain/uClibc/config/mipsel
@@ -92,7 +92,7 @@ UCLIBC_DYNAMIC_ATEXIT=y
 HAS_SHADOW=y
 COMPAT_ATEXIT=y
 # UCLIBC_SUSV3_LEGACY is not set
-# UCLIBC_SUSV3_LEGACY_MACROS is not set
+UCLIBC_SUSV3_LEGACY_MACROS=y
 # UCLIBC_HAS_SHADOW is not set
 # UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
 UCLIBC_HAS___PROGNAME=y
diff --git a/toolchain/uClibc/config/powerpc b/toolchain/uClibc/config/powerpc
index 739daf6705..7451c56e6c 100644
--- a/toolchain/uClibc/config/powerpc
+++ b/toolchain/uClibc/config/powerpc
@@ -81,7 +81,7 @@ UCLIBC_DYNAMIC_ATEXIT=y
 HAS_SHADOW=y
 COMPAT_ATEXIT=y
 # UCLIBC_SUSV3_LEGACY is not set
-# UCLIBC_SUSV3_LEGACY_MACROS is not set
+UCLIBC_SUSV3_LEGACY_MACROS=y
 # UCLIBC_HAS_SHADOW is not set
 # UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
 UCLIBC_HAS___PROGNAME=y