06d5b3dd97
And re-format patches as git patches.
Fixes:
http://autobuild.buildroot.org/results/c13/c13fb87c2e4739106e256f34fff93696b0133bf6/
http://autobuild.buildroot.org/results/f82/f822801f9b811e1a0fb4627f6b528116375cacfe/
http://autobuild.buildroot.org/results/07c/07c0315a35089a8d3e8eb1a305dcd8bf1fb882ee/
and many more...
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
49 lines
1.5 KiB
Diff
49 lines
1.5 KiB
Diff
From 8d7339169b9a5df2082731fe5468923be4be39af 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 97fea3f..7ac45dd 100644
|
|
--- a/libcap/Makefile
|
|
+++ b/libcap/Makefile
|
|
@@ -70,19 +70,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 $(INCDIR)/sys
|
|
install -m 0644 include/sys/capability.h $(INCDIR)/sys
|
|
+ mkdir -p -m 0755 $(PKGCONFIGDIR)
|
|
+ install -m 0644 libcap.pc $(PKGCONFIGDIR)/libcap.pc
|
|
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)
|
|
ifeq ($(FAKEROOT),)
|
|
-/sbin/ldconfig
|
|
endif
|
|
- mkdir -p -m 0755 $(PKGCONFIGDIR)
|
|
- install -m 0644 libcap.pc $(PKGCONFIGDIR)/libcap.pc
|
|
|
|
clean:
|
|
$(LOCALCLEAN)
|
|
--
|
|
1.9.1
|
|
|