diff options
| author | blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-06-15 23:42:48 +0000 |
|---|---|---|
| committer | blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-06-15 23:42:48 +0000 |
| commit | b008f41eef870d4a8af71d783451921fb62e3fe7 (patch) | |
| tree | cfc7bceeb053602a548c7eee0a55cfec9459f935 | |
| parent | 7ae94609deaad83ca195cb465807ebf58ec02371 (diff) | |
[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/Makefile | 2 | ||||
| -rw-r--r-- | 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 20fb6fab7..d21efc02f 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 2f8a71f5e..1a941710f 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) |