From 1b03fd0720b1fa66b637b502c43b3fac7919ea05 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 29 Dec 2007 20:31:48 +0000 Subject: [PATCH] replace cflags hacks with the correct solution git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10031 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- 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 08c6c9202..0f24ae12e 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 56bbeb0e5..5b27257b4 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 c409daea0..ee1e47a6d 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 baea691f8..367a07a89 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 821ad7c8f..dc55e802a 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 ad4342f57..edc72b5cb 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 d0e99310a..546d2eed4 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 cf819f678..a783f8bad 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 b8efcff26..11940ffdd 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 739daf670..7451c56e6 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 -- 2.35.1