From b948c9371b2bce7b5c3ca5812cc4b9d9a02b49b9 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 14 Jul 2016 13:02:48 +0200 Subject: [PATCH] uclibc++: fix build with gcc 6.1.0, which defaults to using C++14 ABI Signed-off-by: Felix Fietkau --- package/libs/uclibc++/Makefile | 1 + .../uclibc++/patches/040-delete-c++14.patch | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 package/libs/uclibc++/patches/040-delete-c++14.patch diff --git a/package/libs/uclibc++/Makefile b/package/libs/uclibc++/Makefile index 4c7c7678e3..c386550292 100644 --- a/package/libs/uclibc++/Makefile +++ b/package/libs/uclibc++/Makefile @@ -63,6 +63,7 @@ MAKE_FLAGS:= \ LDFLAGS="-Wl,--warn-common -Wl,--warn-once -Wl,-z,combreloc -Wl,-z,defs $(TARGET_LDFLAGS)" \ CP="$(CP)" \ GEN_LIBS="-lc $(LIBGCC_S) $(SSP_LIB)" \ + GEN_CFLAGS="-std=gnu++98 -nostdinc++" \ check_as_needed= # check_as_needed overrides dependency on libgcc_s diff --git a/package/libs/uclibc++/patches/040-delete-c++14.patch b/package/libs/uclibc++/patches/040-delete-c++14.patch new file mode 100644 index 0000000000..f48a78f0a4 --- /dev/null +++ b/package/libs/uclibc++/patches/040-delete-c++14.patch @@ -0,0 +1,20 @@ +--- a/src/del_op.cpp ++++ b/src/del_op.cpp +@@ -24,3 +24,7 @@ + _UCXXEXPORT void operator delete(void* ptr) throw(){ + free(ptr); + } ++ ++_UCXXEXPORT void operator delete(void* ptr, size_t size) throw(){ ++ free(ptr); ++} +--- a/src/del_opv.cpp ++++ b/src/del_opv.cpp +@@ -24,3 +24,7 @@ + _UCXXEXPORT void operator delete[](void * ptr) throw(){ + free(ptr); + } ++ ++_UCXXEXPORT void operator delete[](void * ptr, size_t size) throw(){ ++ free(ptr); ++} -- 2.30.2