pool/libftdi1
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1072320 from home:favogt:branches:hardware

Browse Source 
- Add patch to fix random build failures:
  * 0001-Fix-race-during-build-of-python-bindings.patch

OBS-URL: https://build.opensuse.org/request/show/1072320
OBS-URL: https://build.opensuse.org/package/show/hardware/libftdi1?expand=0&rev=34
This commit is contained in:
Dominique Leuenberger 2023-03-24 09:04:05 +00:00 committed by Git OBS Bridge
parent 5104711112
commit c3febc4524
3 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
0001-Fix-race-during-build-of-python-bindings.patch Normal file
View File

@ -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

6
libftdi1.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Mar 16 10:02:33 UTC 2023 - Fabian Vogt <fvogt@suse.com>
- Add patch to fix random build failures:
* 0001-Fix-race-during-build-of-python-bindings.patch
-------------------------------------------------------------------
Mon Sep 27 14:01:32 UTC 2021 - Thomas Renninger <trenn@suse.de>

5
libftdi1.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package libftdi1
#
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -26,7 +26,8 @@ License: LGPL-2.1-only AND GPL-2.0-only AND GPL-2.0-with-classpath-except
Group: Hardware/Other
URL: https://www.intra2net.com/en/developer/libftdi
Source: libftdi1-%{version}.tar.xz
# PATCH-FIX-UPSTREAM -- http://developer.intra2net.com/git/?p=libftdi;a=patch;h=11a50ae5b80b3e03694a19e84513345d0794e563
# PATCH-FIX-UPSTREAM: http://developer.intra2net.com/mailarchive/html/libftdi/2023/msg00005.html
Patch1: 0001-Fix-race-during-build-of-python-bindings.patch
BuildRequires: cmake >= 2.8
BuildRequires: doxygen
BuildRequires: gcc-c++