hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[pjsip] fixes ccache compile and adds missing -lc 

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32387 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
John Crispin 2012-06-15 23:42:48 +00:00
parent e55e9ac7da
commit dc9000ba82
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/pjsip/Makefile
View File

@ -87,7 +87,7 @@ endef
define Build/Compile define Build/Compile
CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \ CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
CXXFLAGS="$(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) $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(MAKE_PATH)
endef endef

5
package/pjsip/patches/0001-configure-fixup.patch
View File

@ -1,14 +1,13 @@
--- a/aconfigure.ac --- a/aconfigure.ac
+++ b/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//'` CROSS_COMPILE=`echo ${CC} | sed 's/gcc//'`
fi fi
-if test "$AR" = ""; then AR="${CROSS_COMPILE}ar rv"; fi -if test "$AR" = ""; then AR="${CROSS_COMPILE}ar rv"; fi
+AR="${CROSS_COMPILE}ar rv" +AR="${AR} rv"
AC_SUBST(AR) AC_SUBST(AR)
-if test "$LD" = ""; then LD="$CC"; fi -if test "$LD" = ""; then LD="$CC"; fi
+LD="${CROSS_COMPILE}gcc"
AC_SUBST(LD) AC_SUBST(LD)
if test "$LDOUT" = ""; then LDOUT="-o "; fi if test "$LDOUT" = ""; then LDOUT="-o "; fi
AC_SUBST(LDOUT) AC_SUBST(LDOUT)