From 75e9bbbcaeda573704d126ca678e25dfe06736e3 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Fri, 15 Jun 2012 23:42:48 +0000 Subject: [PATCH] fixes ccache compile and adds missing -lc SVN-Revision: 32387 --- package/pjsip/Makefile | 2 +- package/pjsip/patches/0001-configure-fixup.patch | 5 ++--- 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) -- 2.25.1