[packages] re, rem, baresip, restund: use another approach to find the "sysroot"...

git-svn-id: svn://svn.openwrt.org/openwrt/packages@30325 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/libs/re/Makefile b/libs/re/Makefile
index e6f9ed4..86d3088 100644 (file)
--- 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="$$$$(echo '#include <pthread.h>' | $(TARGET_CROSS)cpp -x c | sed -ne 's,^# [0-9]* \"\(.*\)/include/pthread\.h\".*,\1,p' | head -n1)" \
+               SYSROOT="$$$$($(FIND) $(TOOLCHAIN_DIR) -path '*/include/pthread.h' | sed -ne '1s#/include/pthread.h##p')" \
                SYSROOT_ALT="$(STAGING_DIR)/usr" \
                RELEASE=1 \
                CROSS_COMPILE="$(TARGET_CROSS)" \

diff --git a/libs/rem/Makefile b/libs/rem/Makefile
index fc2d9c0..c145912 100644 (file)
--- a/libs/rem/Makefile
+++ b/libs/rem/Makefile
@@ -37,7 +37,7 @@ define Build/Compile
                EXTRA_CFLAGS="$(TARGET_CFLAGS) -DOPENWRT" \
                EXTRA_LFLAGS="-lm" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
-               SYSROOT="$(TOOLCHAIN_DIR)" \
+               SYSROOT="$$$$($(FIND) $(TOOLCHAIN_DIR) -path '*/include/pthread.h' | sed -ne '1s#/include/pthread.h##p')" \
                SYSROOT_ALT="$(STAGING_DIR)/usr" \
                RELEASE=1 \
                CROSS_COMPILE="$(TARGET_CROSS)" \

diff --git a/net/baresip/Makefile b/net/baresip/Makefile
index 02f6885..d3ec1c6 100644 (file)
--- a/net/baresip/Makefile
+++ b/net/baresip/Makefile
@@ -79,7 +79,7 @@ define Build/Compile
                CC="$(TARGET_CC)" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                EXTRA_CFLAGS="$(TARGET_CFLAGS) -DOPENWRT" \
-               SYSROOT="$$$$(echo '#include <pthread.h>' | $(TARGET_CROSS)cpp -x c | sed -ne 's,^# [0-9]* \"\(.*\)/include/pthread\.h\".*,\1,p' | head -n1)" \
+               SYSROOT="$$$$($(FIND) $(TOOLCHAIN_DIR) -path '*/include/pthread.h' | sed -ne '1s#/include/pthread.h##p')" \
                SYSROOT_ALT="$(STAGING_DIR)/usr" \
                RELEASE=1 \
                CROSS_COMPILE="$(TARGET_CROSS)" \

diff --git a/net/restund/Makefile b/net/restund/Makefile
index 551eac0..0f343ec 100644 (file)
--- a/net/restund/Makefile
+++ b/net/restund/Makefile
@@ -51,7 +51,7 @@ define Build/Compile
                CC="$(TARGET_CC)" \
                EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
-               SYSROOT="$$$$(echo '#include <pthread.h>' | $(TARGET_CROSS)cpp -x c | sed -ne 's,^# [0-9]* \"\(.*\)/include/pthread\.h\".*,\1,p' | head -n1)" \
+               SYSROOT="$$$$($(FIND) $(TOOLCHAIN_DIR) -path '*/include/pthread.h' | sed -ne '1s#/include/pthread.h##p')" \
                SYSROOT_ALT="$(STAGING_DIR)/usr" \
                RELEASE=1 \
                CROSS_COMPILE="$(TARGET_CROSS)" \