Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/mbpoll: fix build without c++
@ 2023-07-30  6:56 Bernd Kuhls
  2023-07-30 10:12 ` Thomas Petazzoni via buildroot
  0 siblings, 1 reply; 2+ messages in thread
From: Bernd Kuhls @ 2023-07-30  6:56 UTC (permalink / raw)
  To: buildroot; +Cc: Jon Ringle

Add patch to enable build without c++.

Add configure option to fix subsequent configure error due to patched
source file during git version check:

CMake Error at cmake/GitVersion.cmake:118 (message):
  Unable to find current project version !
Call Stack (most recent call first):
  CMakeLists.txt:100 (GetGitVersion)

Fixes:
http://autobuild.buildroot.net/results/2f8/2f819871a89cb2a2df239b1f879c1babcdd022fc/

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 ...dd-LANGUAGES-option-to-project-varia.patch | 30 +++++++++++++++++++
 package/mbpoll/mbpoll.mk                      |  1 +
 2 files changed, 31 insertions(+)
 create mode 100644 package/mbpoll/0001-CMakeLists.txt-Add-LANGUAGES-option-to-project-varia.patch

diff --git a/package/mbpoll/0001-CMakeLists.txt-Add-LANGUAGES-option-to-project-varia.patch b/package/mbpoll/0001-CMakeLists.txt-Add-LANGUAGES-option-to-project-varia.patch
new file mode 100644
index 0000000000..8c9d1a5680
--- /dev/null
+++ b/package/mbpoll/0001-CMakeLists.txt-Add-LANGUAGES-option-to-project-varia.patch
@@ -0,0 +1,30 @@
+From 97a2c39fea591509ac1f8a31598b7555b63b8d55 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd@kuhls.net>
+Date: Sun, 30 Jul 2023 08:45:58 +0200
+Subject: [PATCH] CMakeLists.txt: Add LANGUAGES option to project variable
+
+Fixes build with toolchains without c++.
+
+Upstream: https://github.com/epsilonrt/mbpoll/pull/71
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6daa039..11dcd05 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -3,7 +3,7 @@
+ cmake_minimum_required(VERSION 2.9)
+ 
+ # Workspace name
+-project(mbpoll)
++project(mbpoll LANGUAGES C)
+ 
+ # This setting is useful for providing JSON file used by CodeLite for code completion
+ set(CMAKE_EXPORT_COMPILE_COMMANDS 1)
+-- 
+2.39.2
+
diff --git a/package/mbpoll/mbpoll.mk b/package/mbpoll/mbpoll.mk
index 466d9a0ec1..4289264e0d 100644
--- a/package/mbpoll/mbpoll.mk
+++ b/package/mbpoll/mbpoll.mk
@@ -9,5 +9,6 @@ MBPOLL_SITE = $(call github,epsilonrt,mbpoll,v$(MBPOLL_VERSION))
 MBPOLL_DEPENDENCIES = host-pkgconf libmodbus
 MBPOLL_LICENSE = GPL-3.0+
 MBPOLL_LICENSE_FILES = COPYING
+MBPOLL_CONF_OPTS = -DGIT_EXECUTABLE=/bin/false
 
 $(eval $(cmake-package))
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [Buildroot] [PATCH 1/1] package/mbpoll: fix build without c++
  2023-07-30  6:56 [Buildroot] [PATCH 1/1] package/mbpoll: fix build without c++ Bernd Kuhls
@ 2023-07-30 10:12 ` Thomas Petazzoni via buildroot
  0 siblings, 0 replies; 2+ messages in thread
From: Thomas Petazzoni via buildroot @ 2023-07-30 10:12 UTC (permalink / raw)
  To: Bernd Kuhls; +Cc: Jon Ringle, buildroot

On Sun, 30 Jul 2023 08:56:37 +0200
Bernd Kuhls <bernd@kuhls.net> wrote:

> Add patch to enable build without c++.
> 
> Add configure option to fix subsequent configure error due to patched
> source file during git version check:
> 
> CMake Error at cmake/GitVersion.cmake:118 (message):
>   Unable to find current project version !
> Call Stack (most recent call first):
>   CMakeLists.txt:100 (GetGitVersion)
> 
> Fixes:
> http://autobuild.buildroot.net/results/2f8/2f819871a89cb2a2df239b1f879c1babcdd022fc/
> 
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
>  ...dd-LANGUAGES-option-to-project-varia.patch | 30 +++++++++++++++++++
>  package/mbpoll/mbpoll.mk                      |  1 +
>  2 files changed, 31 insertions(+)
>  create mode 100644 package/mbpoll/0001-CMakeLists.txt-Add-LANGUAGES-option-to-project-varia.patch

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2023-07-30 10:13 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-30  6:56 [Buildroot] [PATCH 1/1] package/mbpoll: fix build without c++ Bernd Kuhls
2023-07-30 10:12 ` Thomas Petazzoni via buildroot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox