Accepting request 1074111 from hardware
OBS-URL: https://build.opensuse.org/request/show/1074111 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libftdi1?expand=0&rev=22factory
Dominique Leuenberger
2 months ago
committed by
Git OBS Bridge
commit
e3cc5181ad
@ -0,0 +1,34 @@
|
||||
From 579f5cb2df5e337df2848f686af3308e45950b81 Mon Sep 17 00:00:00 2001
|
||||
From: Fabian Vogt <fvogt@suse.de>
|
||||
Date: Thu, 16 Mar 2023 10:55:18 +0100
|
||||
Subject: [PATCH] Fix race during build of python bindings
|
||||
|
||||
The CMake documentation says about add_custom_command that the output must
|
||||
not be used as dependency in more than one target, but this was the case
|
||||
here: Both the doc_i target and the SWIG target depended on ftdi1_doc.i.
|
||||
Make the SWIG target depend on doc_i instead.
|
||||
|
||||
This fixes that ftdi1_doc.i was built twice with parallel builds, leading
|
||||
to random errors.
|
||||
|
||||
Signed-off-by: Fabian Vogt <fvogt@suse.de>
|
||||
---
|
||||
python/CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
|
||||
index 5b6f420..1a8142b 100644
|
||||
--- a/python/CMakeLists.txt
|
||||
+++ b/python/CMakeLists.txt
|
||||
@@ -25,7 +25,7 @@ link_directories ( ${CMAKE_CURRENT_BINARY_DIR}/../src )
|
||||
if ( DOCUMENTATION )
|
||||
set(CMAKE_SWIG_FLAGS -DDOXYGEN=${DOXYGEN_FOUND})
|
||||
# manually add dependency for new cmake / swig versions
|
||||
- set_property(SOURCE ftdi1.i PROPERTY DEPENDS ftdi1_doc.i)
|
||||
+ set_property(SOURCE ftdi1.i PROPERTY DEPENDS doc_i)
|
||||
endif()
|
||||
if(NOT CMAKE_VERSION VERSION_LESS 3.8.0)
|
||||
swig_add_library ( ftdi1 LANGUAGE python SOURCES ftdi1.i )
|
||||
--
|
||||
2.39.2
|
||||
|
||||
Loading…
Reference in New Issue