5d8926add5
attr is no longer a dependency, not even optional. Refresh our patches, and drop the backport from upstream. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
49 lines
1.7 KiB
Diff
49 lines
1.7 KiB
Diff
From af21635665ab568f3333ff9fe8b474f4950e5acb Mon Sep 17 00:00:00 2001
|
|
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
Date: Sun, 6 Mar 2016 22:53:24 +0100
|
|
Subject: [PATCH] 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>
|
|
[yann.morin.1998@free.fr: install the .pc file in the common rule]
|
|
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
|
|
|
diff --git a/libcap/Makefile b/libcap/Makefile
|
|
index d189777..44ddb27 100644
|
|
--- a/libcap/Makefile
|
|
+++ b/libcap/Makefile
|
|
@@ -62,19 +62,25 @@ $(MINLIBNAME): $(OBJS)
|
|
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 $(FAKEROOT)$(INCDIR)/sys
|
|
install -m 0644 include/sys/capability.h $(FAKEROOT)$(INCDIR)/sys
|
|
+ mkdir -p -m 0755 $(FAKEROOT)$(PKGCONFIGDIR)
|
|
+ install -m 0644 libcap.pc $(FAKEROOT)$(PKGCONFIGDIR)/libcap.pc
|
|
+
|
|
+install-static: $(STALIBNAME) install-common
|
|
mkdir -p -m 0755 $(FAKEROOT)$(LIBDIR)
|
|
install -m 0644 $(STALIBNAME) $(FAKEROOT)$(LIBDIR)/$(STALIBNAME)
|
|
+
|
|
+install-shared: $(MINLIBNAME) install-common
|
|
install -m 0644 $(MINLIBNAME) $(FAKEROOT)$(LIBDIR)/$(MINLIBNAME)
|
|
ln -sf $(MINLIBNAME) $(FAKEROOT)$(LIBDIR)/$(MAJLIBNAME)
|
|
ln -sf $(MAJLIBNAME) $(FAKEROOT)$(LIBDIR)/$(LIBNAME)
|
|
ifeq ($(FAKEROOT),)
|
|
-/sbin/ldconfig
|
|
endif
|
|
- mkdir -p -m 0755 $(FAKEROOT)$(PKGCONFIGDIR)
|
|
- install -m 0644 libcap.pc $(FAKEROOT)$(PKGCONFIGDIR)/libcap.pc
|
|
|
|
clean:
|
|
$(LOCALCLEAN)
|
|
--
|
|
1.9.1
|
|
|