haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix libftdi to build libftdi++

Browse Source
This commit is contained in:
Ed Robbins
2014-01-13 12:44:19 +00:00
parent 9a28cf36d2
commit 60e33cc615
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dev-embedded/libftdi/libftdi-1.0.recipe
View File

@@ -23,6 +23,7 @@ PATCHES="libftdi-1.0.patch"
PROVIDES="
libftdi1$secondaryArchSuffix = $portVersion
lib:libftdi1$secondaryArchSuffix = $portVersion
lib:libftdipp1$secondaryArchSuffix = $portVersion
cmd:ftdi_eeprom$secondaryArchSuffix
cmd:libftdi1_config$secondaryArchSuffix
"
@@ -31,12 +32,14 @@ REQUIRES="
haiku$secondaryArchSuffix >= $haikuVersion
lib:libconfuse$secondaryArchSuffix >= 2.5
libusb$secondaryArchSuffix >= 1.0
boost$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
libconfuse${secondaryArchSuffix}_devel >= 2.5
libusb${secondaryArchSuffix}_devel
boost_devel$secondaryArchSuffix
"
BUILD_PREREQUIRES="
@@ -70,6 +73,7 @@ INSTALL()
cd build
make install
prepareInstalledDevelLib libftdi1
prepareInstalledDevelLib libftdipp1
fixPkgconfig
packageEntries devel $developDir
}
@@ -77,6 +81,7 @@ INSTALL()
PROVIDES_devel="
libftdi1${secondaryArchSuffix}_devel = $portVersion
devel:libftdi1$secondaryArchSuffix = $portVersion
devel:libftdipp1$secondaryArchSuffix = $portVersion
"
REQUIRES_devel="

24
dev-embedded/libftdi/patches/libftdi-1.0.patch
View File

@@ -1,6 +1,6 @@
diff -Naur libftdi1-1.0/CMakeLists.txt libftdi1-1.0-haiku/CMakeLists.txt
--- libftdi1-1.0/CMakeLists.txt 2013-01-29 13:21:38.038273024 +0000
+++ libftdi1-1.0-haiku/CMakeLists.txt 2014-01-12 22:10:44.125566976 +0000
--- libftdi1-1.0/CMakeLists.txt 2013-01-29 13:21:38.000262144 +0000
+++ libftdi1-1.0-haiku/CMakeLists.txt 2014-01-13 12:26:59.005505024 +0000
@@ -166,7 +166,7 @@
if ( UNIX )
configure_file ( libftdi1-config.in ${CMAKE_CURRENT_BINARY_DIR}/libftdi1-config @ONLY )
@@ -11,8 +11,8 @@ diff -Naur libftdi1-1.0/CMakeLists.txt libftdi1-1.0-haiku/CMakeLists.txt
# config script install path
if ( NOT DEFINED LIBFTDI_CMAKE_CONFIG_DIR )
diff -Naur libftdi1-1.0/ftdi_eeprom/CMakeLists.txt libftdi1-1.0-haiku/ftdi_eeprom/CMakeLists.txt
--- libftdi1-1.0/ftdi_eeprom/CMakeLists.txt 2013-01-29 13:21:38.042991616 +0000
+++ libftdi1-1.0-haiku/ftdi_eeprom/CMakeLists.txt 2014-01-12 22:11:26.599523328 +0000
--- libftdi1-1.0/ftdi_eeprom/CMakeLists.txt 2013-01-29 13:21:38.004718592 +0000
+++ libftdi1-1.0-haiku/ftdi_eeprom/CMakeLists.txt 2014-01-13 12:26:59.008912896 +0000
@@ -28,9 +28,9 @@
add_executable(ftdi_eeprom main.c)
@@ -25,9 +25,21 @@ diff -Naur libftdi1-1.0/ftdi_eeprom/CMakeLists.txt libftdi1-1.0-haiku/ftdi_eepro
else(Confuse_FOUND)
message(STATUS "libConfuse not found, won't build ftdi_eeprom")
diff -Naur libftdi1-1.0/ftdipp/CMakeLists.txt libftdi1-1.0-haiku/ftdipp/CMakeLists.txt
--- libftdi1-1.0/ftdipp/CMakeLists.txt 2013-01-29 13:21:38.005242880 +0000
+++ libftdi1-1.0-haiku/ftdipp/CMakeLists.txt 2014-01-13 12:32:43.713293824 +0000
@@ -51,7 +51,7 @@
COMPONENT staticlibs
)
install( FILES ${cpp_headers}
- DESTINATION include/${PROJECT_NAME}
+ DESTINATION develop/headers${INC_SUFFIX}/${PROJECT_NAME}
COMPONENT headers
)
endif(${UNIX})
diff -Naur libftdi1-1.0/src/CMakeLists.txt libftdi1-1.0-haiku/src/CMakeLists.txt
--- libftdi1-1.0/src/CMakeLists.txt 2013-01-29 13:21:38.044826624 +0000
+++ libftdi1-1.0-haiku/src/CMakeLists.txt 2014-01-12 21:54:24.677117952 +0000
--- libftdi1-1.0/src/CMakeLists.txt 2013-01-29 13:21:38.006553600 +0000
+++ libftdi1-1.0-haiku/src/CMakeLists.txt 2014-01-13 12:26:59.012058624 +0000
@@ -51,7 +51,7 @@
)