[PATCH dwarves 1/2] libbpf: if LIBBPF_EMBEDDED=OFF and libbpf-dev/pkgconfig is not available, fail the build

[PATCH dwarves 1/2] libbpf: if LIBBPF_EMBEDDED=OFF and libbpf-dev/pkgconfig is not available, fail the build

[Luca Boccassi]

If using the system library was explicitly requested, ensure it is present
and fail the build if it is not, rather than falling back to the
embedded version (same for pkg-config).

Signed-off-by: Luca Boccassi <bluca@debian.org>
---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 669ea59..0f967d1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,9 +4,9 @@ cmake_policy(SET CMP0005 NEW)
 
 option(LIBBPF_EMBEDDED "Use the embedded version of libbpf instead of searching it via pkg-config" ON)
 if (NOT LIBBPF_EMBEDDED)
-	find_package(PkgConfig)
+	find_package(PkgConfig REQUIRED)
 	if(PKGCONFIG_FOUND)
-		pkg_check_modules(LIBBPF libbpf>=0.3.0)
+		pkg_check_modules(LIBBPF REQUIRED libbpf>=0.3.0)
 	endif()
 endif()
 
-- 
2.30.2

[PATCH dwarves 2/2] libbpf: bump dependency to >= 0.4.0

[Luca Boccassi]

Required for the new API btf__add_float()

Signed-off-by: Luca Boccassi <bluca@debian.org>
---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0f967d1..a8c0af8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ option(LIBBPF_EMBEDDED "Use the embedded version of libbpf instead of searching
 if (NOT LIBBPF_EMBEDDED)
 	find_package(PkgConfig REQUIRED)
 	if(PKGCONFIG_FOUND)
-		pkg_check_modules(LIBBPF REQUIRED libbpf>=0.3.0)
+		pkg_check_modules(LIBBPF REQUIRED libbpf>=0.4.0)
 	endif()
 endif()
 
-- 
2.30.2

Re: [PATCH dwarves 1/2] libbpf: if LIBBPF_EMBEDDED=OFF and libbpf-dev/pkgconfig is not available, fail the build

[Arnaldo Carvalho de Melo]

Em Sun, Jun 13, 2021 at 02:47:05PM +0100, Luca Boccassi escreveu:
> If using the system library was explicitly requested, ensure it is present
> and fail the build if it is not, rather than falling back to the
> embedded version (same for pkg-config).


Thanks, applied and tested both patches,

- Arnaldo
 
> Signed-off-by: Luca Boccassi <bluca@debian.org>
> ---
>  CMakeLists.txt | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/CMakeLists.txt b/CMakeLists.txt
> index 669ea59..0f967d1 100644
> --- a/CMakeLists.txt
> +++ b/CMakeLists.txt
> @@ -4,9 +4,9 @@ cmake_policy(SET CMP0005 NEW)
>  
>  option(LIBBPF_EMBEDDED "Use the embedded version of libbpf instead of searching it via pkg-config" ON)
>  if (NOT LIBBPF_EMBEDDED)
> -	find_package(PkgConfig)
> +	find_package(PkgConfig REQUIRED)
>  	if(PKGCONFIG_FOUND)
> -		pkg_check_modules(LIBBPF libbpf>=0.3.0)
> +		pkg_check_modules(LIBBPF REQUIRED libbpf>=0.3.0)
>  	endif()
>  endif()
>  
> -- 
> 2.30.2
> 

-- 

- Arnaldo