Re: [PATCH] libebl: Don't install libebl.a, libebl.h and remove backends from spec.

["Dmitry V. Levin" <ldv at altlinux dot org>]

Hi,

On Thu, Aug 29, 2019 at 11:43:58PM +0200, Mark Wielaard wrote:
> All archive members from libebl.a are now in libdw.a. We don't generate
> separate backend shared libraries anymore. So remove them from the
> elfutils.spec file.
> 
> Signed-off-by: Mark Wielaard <mark@klomp.org>
> ---
>  config/ChangeLog        |  7 +++++++
>  config/elfutils.spec.in | 10 ++--------
>  libebl/ChangeLog        |  5 +++++
>  libebl/Makefile.am      |  7 ++-----
>  4 files changed, 16 insertions(+), 13 deletions(-)
[...]
> diff --git a/libebl/ChangeLog b/libebl/ChangeLog
> index 6ba3a02b..4da7eeeb 100644
> --- a/libebl/ChangeLog
> +++ b/libebl/ChangeLog
> @@ -1,3 +1,8 @@
> +2019-08-29  Mark Wielaard  <mark@klomp.org>
> +
> +	* Makefile.am (noinst_LIBRARIES): Add libebl.a.
> +	(noinst_HEADERS): Add libebl.h.

(pkginclude_HEADERS): Remove.

> +
>  2019-07-05  Omar Sandoval  <osandov@fb.com>
>  
>  	* Makefile.am: Make libebl.a non-PIC by default.
> diff --git a/libebl/Makefile.am b/libebl/Makefile.am
> index 8af84633..d0d475b8 100644
> --- a/libebl/Makefile.am
> +++ b/libebl/Makefile.am
> @@ -34,10 +34,7 @@ endif
>  AM_CPPFLAGS += -I$(srcdir)/../libelf -I$(srcdir)/../libdw -I$(srcdir)/../libasm
>  VERSION = 1
>  
> -lib_LIBRARIES = libebl.a
> -noinst_LIBRARIES = libebl_pic.a
> -
> -pkginclude_HEADERS = libebl.h
> +noinst_LIBRARIES = libebl.a libebl_pic.a
>  
>  libebl_a_SOURCES = eblopenbackend.c eblclosebackend.c eblreloctypename.c \
>  		   eblsegmenttypename.c eblsectiontypename.c \
> @@ -62,6 +59,6 @@ libebl_a_SOURCES = eblopenbackend.c eblclosebackend.c eblreloctypename.c \
>  libebl_pic_a_SOURCES =
>  am_libebl_pic_a_OBJECTS = $(libebl_a_SOURCES:.c=.os)
>  
> -noinst_HEADERS = libeblP.h ebl-hooks.h
> +noinst_HEADERS = libebl.h libeblP.h ebl-hooks.h
>  
>  MOSTLYCLEANFILES = $(am_libebl_pic_a_OBJECTS)

After this part of the change libebl.h is no longer installed, but
it's included by libasm.h which is still installed.

This has to be fixed somehow, but I'm not sure whether libebl.h should be
reinstated, libasm.h should stop to include it, or libasm.h should stop
to be installed.


-- 
ldv

Attachment: signature.asc
Description: PGP signature