Commit c016a48b authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

libcap: fix static link 

With BR2_PREFER_STATIC_LIB, libcap fails to build:

  http://autobuild.buildroot.net/results/619bceb3491ecd2ed4e1ae552fdb237a0ed2fa47/build-end.log



This is due to the fact that it still tries to build a shared
library. This commit fixes that by adding a patch that makes libcap
provide install-shared/install-static targets. We also now only build
the $(@D)/libcap subdirectory, so removing the build of the progs
subdirectory is no longer needed.

[Peter: fixup description]
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: default avatarSamuel Martin <s.martin49@gmail.com>
Reviewed-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 2bea7b8c

package/libcap/libcap-02-split-static-shared-install.patch

0 → 100644
+30 −0
Original line number Diff line number Diff line 
libcap: split install into install-shared/install-static



In order to support static only builds, split the install target into

install-shared and install-static targets.



Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>



Index: b/libcap/Makefile

===================================================================

--- a/libcap/Makefile

+++ b/libcap/Makefile

@@ -60,11 +60,17 @@

 cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS)

 	$(CC) $(CFLAGS) $(IPATH) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@

 

-install: all

+install: install-shared install-static

+

+install-common:

 	mkdir -p -m 0755 $(INCDIR)/sys

 	install -m 0644 include/sys/capability.h $(INCDIR)/sys

 	mkdir -p -m 0755 $(LIBDIR)

+

+install-static: install-common

 	install -m 0644 $(STALIBNAME) $(LIBDIR)/$(STALIBNAME)

+

+install-shared: install-common

 	install -m 0755 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME)

 	ln -sf $(MINLIBNAME) $(LIBDIR)/$(MAJLIBNAME)

 	ln -sf $(MAJLIBNAME) $(LIBDIR)/$(LIBNAME)

package/libcap/libcap.mk

+14 −13
Original line number Diff line number Diff line
@@ -25,29 +25,30 @@ endif 
# we don't have host-attr

HOST_LIBCAP_DEPENDENCIES =



ifeq ($(BR2_PREFER_STATIC_LIB),y)

LIBCAP_MAKE_TARGET = libcap.a

LIBCAP_MAKE_INSTALL_TARGET = install-static

else

LIBCAP_MAKE_TARGET = all

LIBCAP_MAKE_INSTALL_TARGET = install

endif



define LIBCAP_BUILD_CMDS

	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \

	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/libcap \

		LIBATTR=$(LIBCAP_HAVE_LIBATTR) BUILD_CC="$(HOSTCC)" \

		BUILD_CFLAGS="$(HOST_CFLAGS)"

		BUILD_CFLAGS="$(HOST_CFLAGS)" $(LIBCAP_MAKE_TARGET)

endef



define LIBCAP_INSTALL_STAGING_CMDS

	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=$(LIBCAP_HAVE_LIBATTR) \

		DESTDIR=$(STAGING_DIR) prefix=/usr lib=lib install

	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libcap LIBATTR=$(LIBCAP_HAVE_LIBATTR) \

		DESTDIR=$(STAGING_DIR) prefix=/usr lib=lib $(LIBCAP_MAKE_INSTALL_TARGET)

endef



define LIBCAP_INSTALL_TARGET_CMDS

	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=$(LIBCAP_HAVE_LIBATTR) \

		DESTDIR=$(TARGET_DIR) prefix=/usr lib=lib install

	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libcap LIBATTR=$(LIBCAP_HAVE_LIBATTR) \

		DESTDIR=$(TARGET_DIR) prefix=/usr lib=lib $(LIBCAP_MAKE_INSTALL_TARGET)

endef



# progs use fork()

define LIBCAP_DISABLE_PROGS

	$(SED) '/-C progs/d' $(@D)/Makefile

endef



LIBCAP_POST_PATCH_HOOKS += LIBCAP_DISABLE_PROGS



define HOST_LIBCAP_BUILD_CMDS

	$(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) LIBATTR=no

endef