summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2015-04-10 15:16:57 +0200
committerDaniel Golle <daniel@makrotopia.org>2015-04-10 15:16:57 +0200
commit85542a25809354f0323bd12aa807fcc3acd66815 (patch)
tree84ca24ac6a3b9e9a206dac33fda87bdb82d625d8
parentb503392f2e56a0a3fb4e0ed6964b5885ad37b6e2 (diff)
libsrtp: make uninstall before install
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
-rw-r--r--libs/libsrtp/Makefile5
-rw-r--r--libs/pjproject/Makefile2
2 files changed, 6 insertions, 1 deletions
diff --git a/libs/libsrtp/Makefile b/libs/libsrtp/Makefile
index ac09f55..4d7d5a6 100644
--- 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 fa8c30e..9d8de1e 100644
--- 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