[Buildroot] [PATCH 1/2] package/libsolv: drop unrecognized variables

[Buildroot] [PATCH 1/2] package/libsolv: drop unrecognized variables

[Fabrice Fontaine]

Drop unrecognized variables:

CMake Warning:
  Manually-specified variables were not used by the project:

    BUILD_DOC
    BUILD_DOCS
    BUILD_EXAMPLE
    BUILD_EXAMPLES
    BUILD_TEST
    BUILD_TESTING
    BUILD_TESTS
    CMAKE_CXX_COMPILER_FORCED
    DISABLE_STATIC
    ENABLE_SHARED

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/libsolv/libsolv.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/libsolv/libsolv.mk b/package/libsolv/libsolv.mk
index 29f8a6a3d2..04fdb387fd 100644
--- a/package/libsolv/libsolv.mk
+++ b/package/libsolv/libsolv.mk
@@ -11,16 +11,15 @@ LIBSOLV_LICENSE_FILES = LICENSE.BSD
 LIBSOLV_CPE_ID_VENDOR = opensuse
 LIBSOLV_INSTALL_STAGING = YES
 LIBSOLV_DEPENDENCIES = zlib
-LIBSOLV_CONF_OPTS = -DCMAKE_CXX_COMPILER_FORCED=ON
 
 ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y)
 LIBSOLV_CONF_OPTS += -DENABLE_STATIC=ON
 else
-LIBSOLV_CONF_OPTS += -DDISABLE_STATIC=ON
+LIBSOLV_CONF_OPTS += -DENABLE_STATIC=OFF
 endif
 
 ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y)
-LIBSOLV_CONF_OPTS += -DENABLE_SHARED=ON
+LIBSOLV_CONF_OPTS += -DDISABLE_SHARED=OFF
 else
 LIBSOLV_CONF_OPTS += -DDISABLE_SHARED=ON
 endif
-- 
2.39.0

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

[Buildroot] [PATCH 2/2] package/libsolv: fix build without C++

[Fabrice Fontaine]

Fix the following build failure without C++ raised since the addition ot
the package in commit 93ce3c1be0753189d6af3ee9968b935037519c25:

CMake Error at CMakeLists.txt:1 (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.

Fixes:
 - http://autobuild.buildroot.org/results/a7f2176d40f156c319754ef5d3b7fd0decfe754f

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 .../libsolv/0001-Fix-build-without-C.patch    | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 package/libsolv/0001-Fix-build-without-C.patch

diff --git a/package/libsolv/0001-Fix-build-without-C.patch b/package/libsolv/0001-Fix-build-without-C.patch
new file mode 100644
index 0000000000..2389aebcde
--- /dev/null
+++ b/package/libsolv/0001-Fix-build-without-C.patch
@@ -0,0 +1,49 @@
+From 5691f58d1f8ce1332b02536e48f1ac5864629c6c Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Sun, 12 Feb 2023 15:27:27 +0100
+Subject: [PATCH] Fix build without C++
+
+Fix the following build failure without C++:
+
+CMake Error at CMakeLists.txt:1 (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.
+
+Fixes:
+ - http://autobuild.buildroot.org/results/a7f2176d40f156c319754ef5d3b7fd0decfe754f
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status: https://github.com/openSUSE/libsolv/pull/520]
+---
+ CMakeLists.txt     | 2 +-
+ ext/CMakeLists.txt | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3541f496..f899c49a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-PROJECT (libsolv)
++PROJECT (libsolv C)
+ 
+ CMAKE_MINIMUM_REQUIRED (VERSION 2.8.5)
+ 
+diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt
+index f01c0238..589fa946 100644
+--- a/ext/CMakeLists.txt
++++ b/ext/CMakeLists.txt
+@@ -103,6 +103,7 @@ IF (ENABLE_CUDFREPO)
+ ENDIF (ENABLE_CUDFREPO)
+ 
+ IF (ENABLE_HAIKU)
++    enable_language(CXX)
+     SET (libsolvext_SRCS ${libsolvext_SRCS}
+ 	repo_haiku.cpp)
+     SET (libsolvext_HEADERS ${libsolvext_HEADERS}
+-- 
+2.39.0
+
-- 
2.39.0

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

Re: [Buildroot] [PATCH 1/2] package/libsolv: drop unrecognized variables

[Yann E. MORIN]

Fabrice, All,

On 2023-02-12 15:43 +0100, Fabrice Fontaine spake thusly:
> Drop unrecognized variables:
> 
> CMake Warning:
>   Manually-specified variables were not used by the project:
> 
>     BUILD_DOC
>     BUILD_DOCS
>     BUILD_EXAMPLE
>     BUILD_EXAMPLES
>     BUILD_TEST
>     BUILD_TESTING
>     BUILD_TESTS
>     CMAKE_CXX_COMPILER_FORCED
>     DISABLE_STATIC
>     ENABLE_SHARED
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Both patches applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  package/libsolv/libsolv.mk | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/package/libsolv/libsolv.mk b/package/libsolv/libsolv.mk
> index 29f8a6a3d2..04fdb387fd 100644
> --- a/package/libsolv/libsolv.mk
> +++ b/package/libsolv/libsolv.mk
> @@ -11,16 +11,15 @@ LIBSOLV_LICENSE_FILES = LICENSE.BSD
>  LIBSOLV_CPE_ID_VENDOR = opensuse
>  LIBSOLV_INSTALL_STAGING = YES
>  LIBSOLV_DEPENDENCIES = zlib
> -LIBSOLV_CONF_OPTS = -DCMAKE_CXX_COMPILER_FORCED=ON
>  
>  ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y)
>  LIBSOLV_CONF_OPTS += -DENABLE_STATIC=ON
>  else
> -LIBSOLV_CONF_OPTS += -DDISABLE_STATIC=ON
> +LIBSOLV_CONF_OPTS += -DENABLE_STATIC=OFF
>  endif
>  
>  ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y)
> -LIBSOLV_CONF_OPTS += -DENABLE_SHARED=ON
> +LIBSOLV_CONF_OPTS += -DDISABLE_SHARED=OFF
>  else
>  LIBSOLV_CONF_OPTS += -DDISABLE_SHARED=ON
>  endif
> -- 
> 2.39.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  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
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot