From caf621fc98966f61e1d589d3893a24c3319cada6 Mon Sep 17 00:00:00 2001 From: jow Date: Thu, 19 Jan 2012 13:14:07 +0000 Subject: [PATCH] [packages] re: infer SYSROOT from the cross cpp's idea of pthread.h location Until now, SYSROOT was always assumed to be $(TOOLCHAIN_DIR), but neither backfire nor external toolchains put their core headers into $(TOOLCHAIN_DIR)/include, therfore feature detection failed badly. git-svn-id: svn://svn.openwrt.org/openwrt/packages@29799 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- libs/re/Makefile | 2 +- libs/re/patches/200-stdint.h.patch | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 libs/re/patches/200-stdint.h.patch diff --git a/libs/re/Makefile b/libs/re/Makefile index 4fa53106e..e6f9ed4ce 100644 --- a/libs/re/Makefile +++ b/libs/re/Makefile @@ -35,7 +35,7 @@ define Build/Compile EXTRA_CFLAGS="$(TARGET_CFLAGS) -DOPENWRT" \ EXTRA_LFLAGS="-lm" \ DESTDIR="$(PKG_INSTALL_DIR)" \ - SYSROOT="$(TOOLCHAIN_DIR)" \ + SYSROOT="$$$$(echo '#include ' | $(TARGET_CROSS)cpp -x c | sed -ne 's,^# [0-9]* \"\(.*\)/include/pthread\.h\".*,\1,p' | head -n1)" \ SYSROOT_ALT="$(STAGING_DIR)/usr" \ RELEASE=1 \ CROSS_COMPILE="$(TARGET_CROSS)" \ diff --git a/libs/re/patches/200-stdint.h.patch b/libs/re/patches/200-stdint.h.patch deleted file mode 100644 index 58f9a93e7..000000000 --- a/libs/re/patches/200-stdint.h.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/include/re_types.h -+++ b/include/re_types.h -@@ -5,6 +5,7 @@ - */ - - #include -+#include - - #ifdef _MSC_VER - #include