From: Hannu Nyman Date: Sat, 21 Oct 2017 06:11:11 +0000 (+0300) Subject: Merge pull request #4985 from ClaymorePT/boost_1.65.1_r2 X-Git-Url: http://git.openwrt.org/?p=feed%2Fpackages.git;a=commitdiff_plain;h=655f96fe05a15fbe91ca4cd8e6a989f4c8600387;hp=ecb166740c00ca3fd3891a55ad90a91262298721 Merge pull request #4985 from ClaymorePT/boost_1.65.1_r2 boost: Bug-fix release --- diff --git a/libs/libiio/Makefile b/libs/libiio/Makefile index 4a9b4406d8..9105568db5 100644 --- a/libs/libiio/Makefile +++ b/libs/libiio/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libiio PKG_VERSION:=0.10 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/analogdevicesinc/libiio/tar.gz/v$(PKG_VERSION)? @@ -91,6 +91,8 @@ define Package/libiio/install endef define Package/iiod/install + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/iiod.init $(1)/etc/init.d/iiod $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/iiod $(1)/usr/sbin/ endef diff --git a/libs/libiio/files/iiod.init b/libs/libiio/files/iiod.init new file mode 100644 index 0000000000..1ac62f3c8f --- /dev/null +++ b/libs/libiio/files/iiod.init @@ -0,0 +1,12 @@ +#!/bin/sh /etc/rc.common + +START=90 +USE_PROCD=1 +PROG=/usr/sbin/iiod + +start_service() { + procd_open_instance + procd_set_param command $PROG + procd_set_param respawn + procd_close_instance +} diff --git a/libs/libxml2/Makefile b/libs/libxml2/Makefile index f33309643f..bd1e6a1bcc 100644 --- a/libs/libxml2/Makefile +++ b/libs/libxml2/Makefile @@ -118,6 +118,10 @@ define Build/InstallDev $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxml2.{la,a,so*} $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/lib/cmake/libxml2 + $(CP) $(PKG_INSTALL_DIR)/usr/lib/cmake/libxml2/libxml2-config.cmake \ + $(1)/usr/lib/cmake/libxml2 + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libxml-2.0.pc $(1)/usr/lib/pkgconfig/