openwrt-mirror/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-22 01:44:32 +04:00
Code Issues Packages Projects Releases Wiki Activity

libftdi1: Fix compilation with most recent CMake

Browse Source 
Description from Amol Bhave:

This package fails to compile with boost 1.70 when the boost cmake
config gets used.
As far as I can tell, Boost 1.70 introduced
BoostConfigVersion.cmake. In that file, the value of PACKAGE_VERSION is
set to 1.70. This makes CMake auto set the variable Boost_VERSION to
1.70. Historically, Boost_VERSION has been using the format like 170000,
and not 1.70. Some package cmake files still depend on this behavior
and make assertions such as Boost_VERSION > 168000. This is incompatible
with the new scheme.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2019-05-15 14:46:13 -07:00
parent 762778b36e
commit 7df84e7472
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/libftdi1/Makefile
View File

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=libftdi1 PKG_NAME:=libftdi1
PKG_VERSION:=1.4 PKG_VERSION:=1.4
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://www.intra2net.com/en/developer/libftdi/download/ PKG_SOURCE_URL:=http://www.intra2net.com/en/developer/libftdi/download/
@@ -22,8 +22,6 @@ PKG_LICENSE_FILES:=COPYING.LIB
PKG_INSTALL:=1 PKG_INSTALL:=1
PKG_USE_MIPS16:=0 PKG_USE_MIPS16:=0
CMAKE_OPTIONS:=-DBUILD_TESTS=OFF
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk include $(INCLUDE_DIR)/cmake.mk
@@ -60,6 +58,10 @@ define Package/ftdi_eeprom/description
read. Otherwise, you will still get the old values. read. Otherwise, you will still get the old values.
endef endef
CMAKE_OPTIONS:= \
-DBUILD_TESTS=OFF \
-DBoost_NO_BOOST_CMAKE=ON
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include/libftdi1/ $(INSTALL_DIR) $(1)/usr/include/libftdi1/
$(CP) $(PKG_INSTALL_DIR)/usr/include/libftdi1/ftdi.h $(1)/usr/include/libftdi1/ $(CP) $(PKG_INSTALL_DIR)/usr/include/libftdi1/ftdi.h $(1)/usr/include/libftdi1/