package/libftdi1: drop second patch
PATCH 1/1 package/libftdi1: drop second patch
Second patch is not needed anymore as the only, optional, dependency of libusb is udev which can't be built statically
---
...check-for-g-when-FTDIPP-is-disabled.patch} | 0
.../0002-cmake-fix-FindUSB1.cmake.patch | 34 -------------------
...-swig.patch => 0003-cmake-find-swig.patch} | 0
3 files changed, 34 deletions(-)
rename package/libftdi1/{0003-cmake-do-not-check-for-g-when-FTDIPP-is-disabled.patch => 0002-cmake-do-not-check-for-g-when-FTDIPP-is-disabled.patch} (100%)
delete mode 100644 package/libftdi1/0002-cmake-fix-FindUSB1.cmake.patch
rename package/libftdi1/{0004-cmake-find-swig.patch => 0003-cmake-find-swig.patch} (100%)package/libftdi1/0002-cmake-do-not-check-for-g-when-FTDIPP-is-disabled.patch renamed from package/libftdi1/0003-cmake-do-not-check-for-g-when-FTDIPP-is-disabled.patch +0 -0
package/libftdi1/0002-cmake-fix-FindUSB1.cmake.patch deleted +0 -34
@@ -1,34 +0,0 @@ -From 81275d75ae88fe8ab1915d3ba260ea935e63c362 Mon Sep 17 00:00:00 2001 -From: Samuel Martin <[email protected]> -Date: Sun, 25 Jan 2015 10:01:17 +0100 -Subject: [PATCH 2/2] cmake: fix FindUSB1.cmake - -Make sure all ldflags are correctly set, especially for static build. - -Signed-off-by: Samuel Martin <[email protected]> ---- - cmake/FindUSB1.cmake | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/cmake/FindUSB1.cmake b/cmake/FindUSB1.cmake -index b90e297..e7f1b3c 100644 ---- a/cmake/FindUSB1.cmake -+++ b/cmake/FindUSB1.cmake -@@ -26,8 +26,12 @@ else (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) - PATH_SUFFIXES libusb-1.0 - PATHS ${PC_LIBUSB_INCLUDEDIR} ${PC_LIBUSB_INCLUDE_DIRS}) - -- FIND_LIBRARY(LIBUSB_LIBRARIES NAMES usb-1.0 -- PATHS ${PC_LIBUSB_LIBDIR} ${PC_LIBUSB_LIBRARY_DIRS}) -+ set(LIBUSB_LIBRARIES ${PC_LIBUSB_STATIC_LDFLAGS} ${PC_LIBUSB_STATIC_LDFLAGS_OTHER}) -+ foreach(libname ${PC_LIBUSB_STATIC_LIBRARIES}) -+ FIND_LIBRARY(lib NAMES ${libname} -+ PATHS ${PC_LIBUSB_LIBDIR} ${PC_LIBUSB_LIBRARY_DIRS}) -+ list(APPEND LIBUSB_LIBRARIES ${lib}) -+ endforeach() - - include(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBUSB DEFAULT_MSG LIBUSB_LIBRARIES LIBUSB_INCLUDE_DIR) --- -2.2.2 -
package/libftdi1/0003-cmake-find-swig.patch renamed from package/libftdi1/0004-cmake-find-swig.patch +0 -0
Signature · 1 line
2.23.0
Thomas Petazzoni
AppliedPATCH 1/1 package/libftdi1: drop second patch
Quoted 4 lines · On Wed, 2 Oct 2019 18:47:00 +0200 Fabrice Fontaine…
Second patch is not needed anymore as the only, optional, dependency of libusb is udev which can't be built statically
Signed-off-by Fabrice Fontaine <[email protected]>
Quoted 8 lines
---
...check-for-g-when-FTDIPP-is-disabled.patch} | 0
.../0002-cmake-fix-FindUSB1.cmake.patch | 34 -------------------
...-swig.patch => 0003-cmake-find-swig.patch} | 0
3 files changed, 34 deletions(-)
rename package/libftdi1/{0003-cmake-do-not-check-for-g-when-FTDIPP-is-disabled.patch => 0002-cmake-do-not-check-for-g-when-FTDIPP-is-disabled.patch} (100%)
delete mode 100644 package/libftdi1/0002-cmake-fix-FindUSB1.cmake.patch
rename package/libftdi1/{0004-cmake-find-swig.patch => 0003-cmake-find-swig.patch} (100%)Applied to master, thanks. I'm curious, how did you notice that this patch was no longer needed?
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 package/libftdi1: drop second patch
Hello Thomas,
Le mer. 2 oct. 2019 ? 21:01, Thomas Petazzoni
<[email protected]> a ?crit :
Quoted 17 lines
Quoted 4 lines · On Wed, 2 Oct 2019 18:47:00 +0200 Fabrice Fontaine…
Second patch is not needed anymore as the only, optional, dependency of libusb is udev which can't be built statically
Signed-off-by Fabrice Fontaine <[email protected]>Quoted 8 lines
--- ...check-for-g-when-FTDIPP-is-disabled.patch} | 0 .../0002-cmake-fix-FindUSB1.cmake.patch | 34 ------------------- ...-swig.patch => 0003-cmake-find-swig.patch} | 0 3 files changed, 34 deletions(-) rename package/libftdi1/{0003-cmake-do-not-check-for-g-when-FTDIPP-is-disabled.patch => 0002-cmake-do-not-check-for-g-when-FTDIPP-is-disabled.patch} (100%) delete mode 100644 package/libftdi1/0002-cmake-fix-FindUSB1.cmake.patch rename package/libftdi1/{0004-cmake-find-swig.patch => 0003-cmake-find-swig.patch} (100%)
Quoted 2 lines
Applied to master, thanks. I'm curious, how did you notice that this patch was no longer needed?
I tried to upstream this patch. They did not like the usage of PC_LIBUSB_STATC_xxx variables so I was working on a more simple approach using PC_LIBUSB_LIBRARIES but then I discovered that libftdi1 was building perfectly fine with libusb and that I could not enable udev in static build.
Quoted 8 lines
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
Best Regards,
Fabrice