Skip to contentSkip to conversation

package/fxdiv: fix build without C++ toolchain

PATCH Applied James Hilliard 2 participants 2 messages Jan 30, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/fxdiv: fix build without C++ toolchain

The cmake project for fxdiv sets the project language to C and CXX even when only C is required.

Add a patch which disables CXX unless required.

Fixes:
- http://autobuild.buildroot.net/results/b0f/b0f3b6352429a5156a8c3a2b932331753887b65b
- http://autobuild.buildroot.net/results/52f/52f634c06bdfe983280a2c01bb9fec4b0e1a4b34
- http://autobuild.buildroot.net/results/181/181b85d9dd505693ed23fab823085b001aa785f4

---
 ...le-CXX-unless-building-tests-benchma.patch | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 package/fxdiv/0001-CMake-don-t-enable-CXX-unless-building-tests-benchma.patch
package/fxdiv/0001-CMake-don-t-enable-CXX-unless-building-tests-benchma.patch new file +49 -0
new file mode 100644
index 0000000000..0336f5e1cc
@@ -0,0 +1,49 @@
+From 8c2d8fc60306a8edd21182a1f5f267a7aca55763 Mon Sep 17 00:00:00 2001
+From: James Hilliard <[email protected]>
+Date: Sun, 29 Jan 2023 21:18:28 -0700
+Subject: [PATCH] CMake: don't enable CXX unless building tests/benchmarks
+
+We only need CXX support when building tests/benchmarks.
+
+Fixes:
+CMake Error at CMakeLists.txt:4 (PROJECT):
+  No CMAKE_CXX_COMPILER could be found.
+
+  Tell CMake where to find the compiler by setting either the environment
+  variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path
+  to the compiler, or to the compiler name if it is in the PATH.
+
+Signed-off-by: James Hilliard <[email protected]>
+[Upstream status:
+https://github.com/Maratyszcza/FXdiv/pull/3]
+---
+ CMakeLists.txt | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bcae6b5..c75f558 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ CMAKE_MINIMUM_REQUIRED(VERSION 3.5 FATAL_ERROR)
+ 
+ # ---[ Project
+-PROJECT(FXdiv C CXX)
++PROJECT(FXdiv C)
+ 
+ # ---[ Options.
+ OPTION(FXDIV_USE_INLINE_ASSEMBLY "Allow use of inline assembly in FXdiv" OFF)
+@@ -16,6 +16,10 @@ ENDIF()
+ # ---[ CMake options
+ INCLUDE(GNUInstallDirs)
+ 
++IF(FXDIV_BUILD_TESTS OR FXDIV_BUILD_BENCHMARKS)
++  ENABLE_LANGUAGE(CXX)
++ENDIF()
++
+ IF(FXDIV_BUILD_TESTS)
+   ENABLE_TESTING()
+ ENDIF()
+-- 
+2.34.1
+
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

James, All,

On 2023-01-29 21:29 -0700, James Hilliard spake thusly:

Quoted 11 lines

The cmake project for fxdiv sets the project language to C and CXX even when only C is required.

Add a patch which disables CXX unless required.

Fixes:
- http://autobuild.buildroot.net/results/b0f/b0f3b6352429a5156a8c3a2b932331753887b65b
- http://autobuild.buildroot.net/results/52f/52f634c06bdfe983280a2c01bb9fec4b0e1a4b34
- http://autobuild.buildroot.net/results/181/181b85d9dd505693ed23fab823085b001aa785f4

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 67 lines
---
 ...le-CXX-unless-building-tests-benchma.patch | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 package/fxdiv/0001-CMake-don-t-enable-CXX-unless-building-tests-benchma.patch
package/fxdiv/0001-CMake-don-t-enable-CXX-unless-building-tests-benchma.patch new file +49 -0
new file mode 100644
index 0000000000..0336f5e1cc
@@ -0,0 +1,49 @@
+From 8c2d8fc60306a8edd21182a1f5f267a7aca55763 Mon Sep 17 00:00:00 2001
+From: James Hilliard <[email protected]>
+Date: Sun, 29 Jan 2023 21:18:28 -0700
+Subject: [PATCH] CMake: don't enable CXX unless building tests/benchmarks
+
+We only need CXX support when building tests/benchmarks.
+
+Fixes:
+CMake Error at CMakeLists.txt:4 (PROJECT):
+  No CMAKE_CXX_COMPILER could be found.
+
+  Tell CMake where to find the compiler by setting either the environment
+  variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path
+  to the compiler, or to the compiler name if it is in the PATH.
+
+Signed-off-by: James Hilliard <[email protected]>
+[Upstream status:
+https://github.com/Maratyszcza/FXdiv/pull/3]
+---
+ CMakeLists.txt | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bcae6b5..c75f558 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ CMAKE_MINIMUM_REQUIRED(VERSION 3.5 FATAL_ERROR)
+ 
+ # ---[ Project
+-PROJECT(FXdiv C CXX)
++PROJECT(FXdiv C)
+ 
+ # ---[ Options.
+ OPTION(FXDIV_USE_INLINE_ASSEMBLY "Allow use of inline assembly in FXdiv" OFF)
+@@ -16,6 +16,10 @@ ENDIF()
+ # ---[ CMake options
+ INCLUDE(GNUInstallDirs)
+ 
++IF(FXDIV_BUILD_TESTS OR FXDIV_BUILD_BENCHMARKS)
++  ENABLE_LANGUAGE(CXX)
++ENDIF()
++
+ IF(FXDIV_BUILD_TESTS)
+   ENABLE_TESTING()
+ ENDIF()
+-- 
+2.34.1
+
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot