fixes ccache compile and adds missing -lc
authorJohn Crispin <john@openwrt.org>
Fri, 15 Jun 2012 23:42:48 +0000 (23:42 +0000)
committerJohn Crispin <john@openwrt.org>
Fri, 15 Jun 2012 23:42:48 +0000 (23:42 +0000)
SVN-Revision: 32387

package/pjsip/Makefile
package/pjsip/patches/0001-configure-fixup.patch

index 20fb6fab734cd1c44721bd72db5764c309bb034b..d21efc02f1d312e534c3f28e5b4fa3b14ee34523 100644 (file)
@@ -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
 
index 2f8a71f5e1264b42b5caa196cd928d149289e1a2..1a941710f7a4bedfe716ee3ac49a8862a5e877ff 100644 (file)
@@ -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)