aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2012-06-15 23:42:48 +0000
committerJohn Crispin <blogic@openwrt.org>2012-06-15 23:42:48 +0000
commitdc9000ba82579d4842cc19e84a437b76798e7b63 (patch)
treecfc7bceeb053602a548c7eee0a55cfec9459f935
parente55e9ac7dac03fb845a722b1ebd371ee9cfabbb9 (diff)
downloadupstream-dc9000ba82579d4842cc19e84a437b76798e7b63.tar.gz
upstream-dc9000ba82579d4842cc19e84a437b76798e7b63.tar.bz2
upstream-dc9000ba82579d4842cc19e84a437b76798e7b63.zip
[pjsip] fixes ccache compile and adds missing -lc
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32387 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/pjsip/Makefile2
-rw-r--r--package/pjsip/patches/0001-configure-fixup.patch5
2 files changed, 3 insertions, 4 deletions
diff --git a/package/pjsip/Makefile b/package/pjsip/Makefile
index 20fb6fab73..d21efc02f1 100644
--- a/package/pjsip/Makefile
+++ b/package/pjsip/Makefile
@@ -87,7 +87,7 @@ endef
define Build/Compile
CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
- LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS) $(LIBGCC_S) -lm" \
+ LDFLAGS="$(TARGET_LDFLAGS) -lc $(LIBGCC_S) -lm" \
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(MAKE_PATH)
endef
diff --git a/package/pjsip/patches/0001-configure-fixup.patch b/package/pjsip/patches/0001-configure-fixup.patch
index 2f8a71f5e1..1a941710f7 100644
--- a/package/pjsip/patches/0001-configure-fixup.patch
+++ b/package/pjsip/patches/0001-configure-fixup.patch
@@ -1,14 +1,13 @@
--- a/aconfigure.ac
+++ b/aconfigure.ac
-@@ -48,9 +48,9 @@ if test -z "$CROSS_COMPILE"; then
+@@ -48,9 +48,8 @@ if test -z "$CROSS_COMPILE"; then
CROSS_COMPILE=`echo ${CC} | sed 's/gcc//'`
fi
-if test "$AR" = ""; then AR="${CROSS_COMPILE}ar rv"; fi
-+AR="${CROSS_COMPILE}ar rv"
++AR="${AR} rv"
AC_SUBST(AR)
-if test "$LD" = ""; then LD="$CC"; fi
-+LD="${CROSS_COMPILE}gcc"
AC_SUBST(LD)
if test "$LDOUT" = ""; then LDOUT="-o "; fi
AC_SUBST(LDOUT)