diff options
| author | Yann E. MORIN <yann.morin.1998@free.fr> | 2016-03-16 21:20:08 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2016-03-16 22:58:01 +0100 |
| commit | 5d8926add5da1b0bdfb90a41f4d7f857864c5524 (patch) | |
| tree | ce3e1a5376bc7019f583f5e54cb9259a39ad6f49 /package/libcap/0002-libcap-split-install-into-install-shared-install-sta.patch | |
| parent | 05506de0ad4665f7dd913eb7bc4e6a7ccbb12063 (diff) | |
| download | buildroot-5d8926add5da1b0bdfb90a41f4d7f857864c5524.tar.gz buildroot-5d8926add5da1b0bdfb90a41f4d7f857864c5524.zip | |
libcap: bump version
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>
Diffstat (limited to 'package/libcap/0002-libcap-split-install-into-install-shared-install-sta.patch')
| -rw-r--r-- | package/libcap/0002-libcap-split-install-into-install-shared-install-sta.patch | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/package/libcap/0002-libcap-split-install-into-install-shared-install-sta.patch b/package/libcap/0002-libcap-split-install-into-install-shared-install-sta.patch index a7a9d13fb6..a8579b7660 100644 --- a/package/libcap/0002-libcap-split-install-into-install-shared-install-sta.patch +++ b/package/libcap/0002-libcap-split-install-into-install-shared-install-sta.patch @@ -1,4 +1,4 @@ -From 8d7339169b9a5df2082731fe5468923be4be39af Mon Sep 17 00:00:00 2001 +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 @@ -11,10 +11,10 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> diff --git a/libcap/Makefile b/libcap/Makefile -index 97fea3f..7ac45dd 100644 +index d189777..44ddb27 100644 --- a/libcap/Makefile +++ b/libcap/Makefile -@@ -70,19 +70,25 @@ $(MINLIBNAME): $(OBJS) +@@ -62,19 +62,25 @@ $(MINLIBNAME): $(OBJS) cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS) $(CC) $(CFLAGS) $(IPATH) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@ @@ -22,24 +22,24 @@ index 97fea3f..7ac45dd 100644 +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) + 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: install-common - install -m 0644 $(STALIBNAME) $(LIBDIR)/$(STALIBNAME) ++install-static: $(STALIBNAME) install-common + mkdir -p -m 0755 $(FAKEROOT)$(LIBDIR) + install -m 0644 $(STALIBNAME) $(FAKEROOT)$(LIBDIR)/$(STALIBNAME) + -+install-shared: install-common - install -m 0755 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME) - ln -sf $(MINLIBNAME) $(LIBDIR)/$(MAJLIBNAME) - ln -sf $(MAJLIBNAME) $(LIBDIR)/$(LIBNAME) ++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 $(PKGCONFIGDIR) -- install -m 0644 libcap.pc $(PKGCONFIGDIR)/libcap.pc +- mkdir -p -m 0755 $(FAKEROOT)$(PKGCONFIGDIR) +- install -m 0644 libcap.pc $(FAKEROOT)$(PKGCONFIGDIR)/libcap.pc clean: $(LOCALCLEAN) |
