X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/b04e48ab360165984c4adfabc34e6e26e97e50e2..f8479b9f2e0a3982ff197e780411d32bce2344ba:/openwrt/package/libosip2/Makefile

diff --git a/openwrt/package/libosip2/Makefile b/openwrt/package/libosip2/Makefile
index d7a504ae1..bacf07287 100644
--- a/openwrt/package/libosip2/Makefile
+++ b/openwrt/package/libosip2/Makefile
@@ -3,14 +3,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libosip2
-PKG_VERSION:=2.0.9
+PKG_VERSION:=2.2.0
 PKG_RELEASE:=1
-PKG_MD5SUM:=dba6d47332f4842f70694792939fec2d
+PKG_MD5SUM:=f1237af0250c59b318bd64a59f5750ea
 
-PKG_SOURCE_URL:=http://ftp.gnu.org/gnu/osip/ \
-	ftp://ftp.belnet.be/mirror/ftp.gnu.org/gnu/osip/ \
-	ftp://ftp.mirror.nl/pub/mirror/gnu/osip/ \
-	http://mirror.switch.ch/ftp/mirror/gnu/osip/
+PKG_SOURCE_URL:=@GNU/osip
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 
@@ -26,7 +23,7 @@ $(PKG_BUILD_DIR)/.configured:
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(strip $(TARGET_CFLAGS))" \
 		CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+		LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
 		./configure \
 		  --target=$(GNU_TARGET_NAME) \
 		  --host=$(GNU_TARGET_NAME) \
@@ -68,15 +65,17 @@ $(PKG_BUILD_DIR)/.built:
 
 $(IPKG_LIBOSIP2):
 	install -m0755 -d $(IDIR_LIBOSIP2)/usr/lib
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libosip{,parser}2.so.* $(IDIR_LIBOSIP2)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libosip{,parser}2.so.* $(IDIR_LIBOSIP2)/usr/lib/
 	$(RSTRIP) $(IDIR_LIBOSIP2)
 	$(IPKG_BUILD) $(IDIR_LIBOSIP2) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libosip2.so: $(PKG_BUILD_DIR)/.built
 	mkdir -p $(STAGING_DIR)/usr/include
-	cp -fpR $(PKG_INSTALL_DIR)/usr/include/osip{,parser}2 $(STAGING_DIR)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/osip{,parser}2 $(STAGING_DIR)/usr/include/
 	mkdir -p $(STAGING_DIR)/usr/lib
-	cp -fp $(PKG_INSTALL_DIR)/usr/lib/libosip{,parser}2.{a,so*} $(STAGING_DIR)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libosip{,parser}2.{a,so*} $(STAGING_DIR)/usr/lib/
+	mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libosip2.pc $(STAGING_DIR)/usr/lib/pkgconfig/
 	touch $@
 
 install-dev: $(STAGING_DIR)/usr/lib/libosip2.so
@@ -85,6 +84,7 @@ uninstall-dev:
 	rm -rf \
 		$(STAGING_DIR)/usr/include/osip{,parser}2 \
 		$(STAGING_DIR)/usr/lib/libosip{,parser}2.{a,so*} \
+		$(STAGING_DIR)/usr/lib/pkgconfig/libosip2.pc \
 
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev