From: Markus Blatt <markus@dr-blatt.de>
Date: Wed, 20 Nov 2024 11:10:33 +0000 (+0100)
Subject: [PATCH] [dunecontrol] Module without CMakeLists.txt next to dune.module is installed
X-Git-Tag: archive/raspbian/2.10.0-4+rpi1^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=84a49ac21ffa0d2d77837ac8029872caa957213e;p=dune-common.git

[PATCH] [dunecontrol] Module without CMakeLists.txt next to dune.module is installed

The decision whether a module is installed is usually based on whether
pkgconfig was able to find it. If the DUNE module does not ship  a
pkgconf file or pkgconf is missing, then dunecontrol tries to build
this installed modules, too. That fails miserably.

With this commit we add a check at the end that checks whether
there is a CMakeLists.txt file in the source directory of the
module. This directory is where the dune.module file was found. If
there is none we also assume that the module is installed and do not
try to build it.

Gbp-Pq: Name dunecontrol-Module-without-CMakeLists.txt-next-to-du.patch
---

diff --git a/lib/dunemodules.lib b/lib/dunemodules.lib
index 0d11ffe..7ac4383 100644
--- a/lib/dunemodules.lib
+++ b/lib/dunemodules.lib
@@ -99,6 +99,12 @@ parse_control() {
       module_inst="yes"
     fi
   fi
+  # Mark modules as installed if there is no CMakeLists.txt in path
+  # Not that path is where the dune.module file is located.
+  if test "$module_inst" = "no" && ! test -e "$path/CMakeLists.txt"; then
+    module_inst="yes"
+  fi
+
   # avoid multiple definition of the same module
   if eval test "x\$HAVE_$module" != "x"; then
     # make sure we don't stumble over the same module twice