buildroot

keyutils: Allow building of the shared library to be suppressed

​

Upstream patch:

  https://kernel.googlesource.com/pub/scm/linux/kernel/git/dhowells/keyutils/+/a4deb71ddc05e951c8be8d46615beed9d408a5c8

​

Signed-off-by: Vicente Olivert Riera <vincent.riera@imgtec.com>

​

LIB: Allow building of the shared library to be suppressed

​

Allow building of the shared library to be suppressed by passing NO_SOLIB=1 to

the Makefile.

​

Reported-and-tested-by: Vicente Olivert Riera <vincent.riera@imgtec.com>

Signed-off-by: David Howells <dhowells@redhat.com>

diff --git a/Makefile b/Makefile

index c904eaf..5dd2113 100644

--- a/Makefile

+++ b/Makefile

@@ -5,6 +5,7 @@

 SPECFILE   := keyutils.spec

 NO_GLIBC_KEYERR    := 0

 NO_ARLIB   := 0

+NO_SOLIB   := 0

 ETCDIR     := /etc

 BINDIR     := /bin

 SBINDIR        := /sbin

@@ -95,7 +96,7 @@

 # Normal build rule

 #

 ###############################################################################

-all: $(DEVELLIB) keyctl request-key key.dns_resolver

+all: keyctl request-key key.dns_resolver

 ###############################################################################

 #

@@ -104,20 +105,23 @@

 ###############################################################################

 #RPATH = -Wl,-rpath,$(LIBDIR)

-ifeq ($(NO_ARLIB),0)

-all: $(ARLIB)

-$(ARLIB): keyutils.o

-   $(AR) rcs $@ $<

-endif

-

 VCPPFLAGS  := -DPKGBUILD="\"$(shell date -u +%F)\""

 VCPPFLAGS  += -DPKGVERSION="\"keyutils-$(VERSION)\""

 VCPPFLAGS  += -DAPIVERSION="\"libkeyutils-$(APIVERSION)\""

+ifeq ($(NO_ARLIB),0)

+all: $(ARLIB)

+$(ARLIB): keyutils.o

+   $(AR) rcs $@ $<

+

 keyutils.o: keyutils.c keyutils.h Makefile

    $(CC) $(CPPFLAGS) $(VCPPFLAGS) $(CFLAGS) -UNO_GLIBC_KEYERR -o $@ -c $<

+LIB_DEPENDENCY := libkeyutils.a

+endif

+ifeq ($(NO_SOLIB),0)

+all: $(DEVELLIB)

 $(DEVELLIB): $(SONAME)