Dwarves Archive on lore.kernel.org
 help / color / Atom feed
* Re: [PATCH pahole] cmake: libebl was merged into libdw
       [not found] ` <20191216210646.721790-1-Jason-OnJsPKxuuEcAvxtiuMwx3w@public.gmane.org>
@ 2020-02-03  9:30   ` Arnaldo Carvalho de Melo
  0 siblings, 0 replies; only message in thread
From: Arnaldo Carvalho de Melo @ 2020-02-03  9:30 UTC (permalink / raw)
  To: Jason A. Donenfeld
  Cc: Mark Wielaard, Jiri Olsa, dwarves-u79uwXL29TY76Z2rM5mHXA

Em Mon, Dec 16, 2019 at 10:06:46PM +0100, Jason A. Donenfeld escreveu:
> Since elfutils 178, libebl is now part of libdw, so searching for libebl
> always fails. Simply remove it from the search.
> 
> Signed-off-by: Jason A. Donenfeld <Jason-OnJsPKxuuEcAvxtiuMwx3w@public.gmane.org>

Thanks, applied and pushed out, will be in the 1.16 rpm for fedora 31
and also in the upcoming 1.17 release.

Mark Wieelard tested it with older elfutils versions and provided his
reviewed-by tag.

Sorry for taking too long to process this, my system was still with a
older elfutils version so this ended up falling thru the cracks :-\

- Arnaldo

> ---
>  cmake/modules/FindDWARF.cmake | 23 +++++++----------------
>  1 file changed, 7 insertions(+), 16 deletions(-)
> 
> diff --git a/cmake/modules/FindDWARF.cmake b/cmake/modules/FindDWARF.cmake
> index f4feec4..027d06e 100644
> --- a/cmake/modules/FindDWARF.cmake
> +++ b/cmake/modules/FindDWARF.cmake
> @@ -37,14 +37,9 @@ find_library(ELF_LIBRARY
>  	PATHS /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64 ~/usr/local/lib ~/usr/local/lib64
>  )
>  
> -find_library(EBL_LIBRARY
> -	NAMES ebl
> -	PATHS /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64 ~/usr/local/lib ~/usr/local/lib64
> -)
> -
> -if (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY AND EBL_LIBRARY)
> +if (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY)
>  	set(DWARF_FOUND TRUE)
> -	set(DWARF_LIBRARIES ${DWARF_LIBRARY} ${ELF_LIBRARY} ${EBL_LIBRARY})
> +	set(DWARF_LIBRARIES ${DWARF_LIBRARY} ${ELF_LIBRARY})
>  
>  	set(CMAKE_REQUIRED_LIBRARIES ${DWARF_LIBRARIES})
>  	# check if libdw have the dwfl_module_build_id routine, i.e. if it supports the buildid
> @@ -52,10 +47,10 @@ if (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY AN
>  	# in distributions such as fedora). We do it against libelf because, IIRC, some distros
>  	# include libdw linked statically into libelf.
>  	check_library_exists(elf dwfl_module_build_id "" HAVE_DWFL_MODULE_BUILD_ID)
> -else (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY AND EBL_LIBRARY)
> +else (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY)
>  	set(DWARF_FOUND FALSE)
>  	set(DWARF_LIBRARIES)
> -endif (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY AND EBL_LIBRARY)
> +endif (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY)
>  
>  if (DWARF_FOUND)
>  	if (NOT DWARF_FIND_QUIETLY)
> @@ -63,7 +58,6 @@ if (DWARF_FOUND)
>  		message(STATUS "Found elfutils/libdw.h header: ${LIBDW_INCLUDE_DIR}")
>  		message(STATUS "Found libdw library: ${DWARF_LIBRARY}")
>  		message(STATUS "Found libelf library: ${ELF_LIBRARY}")
> -		message(STATUS "Found libebl library: ${EBL_LIBRARY}")
>  	endif (NOT DWARF_FIND_QUIETLY)
>  else (DWARF_FOUND)
>  	if (DWARF_FIND_REQUIRED)
> @@ -73,9 +67,9 @@ else (DWARF_FOUND)
>  		find_path(FEDORA fedora-release /etc)
>  		find_path(REDHAT redhat-release /etc)
>  		if (FEDORA OR REDHAT)
> -			if (NOT DWARF_INCLUDE_DIR OR NOT LIBDW_INCLUDE_DIR OR NOT EBL_LIBRARY)
> +			if (NOT DWARF_INCLUDE_DIR OR NOT LIBDW_INCLUDE_DIR)
>  				message(STATUS "Please install the elfutils-devel package")
> -			endif (NOT DWARF_INCLUDE_DIR OR NOT LIBDW_INCLUDE_DIR OR NOT EBL_LIBRARY)
> +			endif (NOT DWARF_INCLUDE_DIR OR NOT LIBDW_INCLUDE_DIR)
>  			if (NOT DWARF_LIBRARY)
>  				message(STATUS "Please install the elfutils-libs package")
>  			endif (NOT DWARF_LIBRARY)
> @@ -89,9 +83,6 @@ else (DWARF_FOUND)
>  			if (NOT LIBDW_INCLUDE_DIR)
>  				message(STATUS "Could NOT find libdw include dir")
>  			endif (NOT LIBDW_INCLUDE_DIR)
> -			if (NOT EBL_LIBRARY)
> -				message(STATUS "Could NOT find libebl library")
> -			endif (NOT EBL_LIBRARY)
>  			if (NOT DWARF_LIBRARY)
>  				message(STATUS "Could NOT find libdw library")
>  			endif (NOT DWARF_LIBRARY)
> @@ -103,7 +94,7 @@ else (DWARF_FOUND)
>  	endif (DWARF_FIND_REQUIRED)
>  endif (DWARF_FOUND)
>  
> -mark_as_advanced(DWARF_INCLUDE_DIR LIBDW_INCLUDE_DIR DWARF_LIBRARY ELF_LIBRARY EBL_LIBRARY)
> +mark_as_advanced(DWARF_INCLUDE_DIR LIBDW_INCLUDE_DIR DWARF_LIBRARY ELF_LIBRARY)
>  include_directories(${DWARF_INCLUDE_DIR} ${LIBDW_INCLUDE_DIR})
>  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_SOURCE_DIR}/config.h)
>  
> -- 
> 2.24.1

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, back to index

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <20191216210646.721790-1-Jason@zx2c4.com>
     [not found] ` <20191216210646.721790-1-Jason-OnJsPKxuuEcAvxtiuMwx3w@public.gmane.org>
2020-02-03  9:30   ` [PATCH pahole] cmake: libebl was merged into libdw Arnaldo Carvalho de Melo

Dwarves Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/dwarves/0 dwarves/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dwarves dwarves/ https://lore.kernel.org/dwarves \
		dwarves@vger.kernel.org
	public-inbox-index dwarves

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.dwarves


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git