libsrtp: make uninstall before install

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

diff --git a/libs/libsrtp/Makefile b/libs/libsrtp/Makefile
index ac09f557f864ebb4ef0bd495da9d5063c8fe81e1..4d7d5a61795185471cc1b73617b23b40719a6aa1 100644 (file)
--- a/libs/libsrtp/Makefile
+++ b/libs/libsrtp/Makefile
@@ -41,6 +41,11 @@ Protocol (SRTP) originally authored by Cisco Systems, Inc.
 It is available under a BSD-style license.
 endef
 
+define Build/Install
+       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) uninstall
+       $(call Build/Install/Default)
+endef
+
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/include
        $(CP) $(PKG_INSTALL_DIR)/usr/include/srtp $(1)/usr/include/

diff --git a/libs/pjproject/Makefile b/libs/pjproject/Makefile
index fa8c30e55e830e79454c680a2a000cd3fe4a313e..9d8de1e0193b2c8d0f46afc27d6d9259aad7a723 100644 (file)
--- a/libs/pjproject/Makefile
+++ b/libs/pjproject/Makefile
@@ -83,7 +83,7 @@ CONFIGURE_ARGS += \
        --disable-ffmpeg \
        --disable-v4l2
 
-TARGET_LDFLAGS+=-lc $(LIBGCC_S) -lm
+TARGET_LDFLAGS+=-lc $(LIBGCC) -lm
 TARGET_CFLAGS+=$(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)
 
 define Build/Compile