Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] libcap: split pkgconfig file
@ 2019-12-28  3:08 voidlinux-github
  2019-12-28  3:21 ` [PR PATCH] [Updated] [NoMerge] " voidlinux-github
  2019-12-28  3:27 ` [PR PATCH] [Merged]: " voidlinux-github
  0 siblings, 2 replies; 3+ messages in thread
From: voidlinux-github @ 2019-12-28  3:08 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 469 bytes --]

There is a new pull request by ndowens against master on the void-packages repository

https://github.com/ndowens/void-packages libcap-fix
https://github.com/void-linux/void-packages/pull/17832

libcap: split pkgconfig file
This fixes sway build as there was two Name fields
in the .pc file. I split it into two seperate ones
and this possibly will fix others if there is any

A patch file from https://github.com/void-linux/void-packages/pull/17832.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libcap-fix-17832.patch --]
[-- Type: text/x-diff, Size: 3196 bytes --]

From 3391f476b00b65554f2fd226c824b9d30d2dc8d3 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Fri, 27 Dec 2019 21:07:36 -0600
Subject: [PATCH] libcap: split pkgconfig file

This fixes sway build as there was two Name fields
in the .pc file. I split it into two seperate ones
and this possibly will fix others if there is any
---
 srcpkgs/libcap/patches/pkgconfig.patch | 60 ++++++++++++++++++++++++++
 srcpkgs/libcap/template                |  2 +-
 2 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libcap/patches/pkgconfig.patch

diff --git a/srcpkgs/libcap/patches/pkgconfig.patch b/srcpkgs/libcap/patches/pkgconfig.patch
new file mode 100644
index 00000000000..e49da77d2c3
--- /dev/null
+++ b/srcpkgs/libcap/patches/pkgconfig.patch
@@ -0,0 +1,60 @@
+diff --git libcap/Makefile libcap/Makefile
+index 949cfad..314a857 100644
+--- libcap/Makefile
++++ libcap/Makefile
+@@ -22,7 +22,7 @@ MAJLIBNAME=$(LIBNAME).$(VERSION)
+ MINLIBNAME=$(MAJLIBNAME).$(MINOR)
+ GPERF_OUTPUT = _caps_output.gperf
+ 
+-all: $(MINLIBNAME) $(STACAPLIBNAME) libcap.pc $(STAPSXLIBNAME)
++all: $(MINLIBNAME) $(STACAPLIBNAME) libcap.pc libpsx.pc $(STAPSXLIBNAME)
+ 
+ ifeq ($(BUILD_GPERF),yes)
+ USE_GPERF_OUTPUT = $(GPERF_OUTPUT)
+@@ -38,6 +38,15 @@ libcap.pc: libcap.pc.in
+ 		-e 's,@deps@,$(DEPS),' \
+ 		$< >$@
+ 
++libpsx.pc: libpsx.pc.in
++	sed -e 's,@prefix@,$(prefix),' \
++		-e 's,@exec_prefix@,$(exec_prefix),' \
++		-e 's,@libdir@,$(LIBDIR),' \
++		-e 's,@includedir@,$(inc_prefix)/include,' \
++		-e 's,@VERSION@,$(VERSION).$(MINOR),' \
++		-e 's,@deps@,$(DEPS),' \
++		$< >$@
++
+ _makenames: _makenames.c cap_names.list.h
+ 	$(BUILD_CC) $(BUILD_CFLAGS) $< -o $@
+ 
+@@ -86,6 +95,7 @@ ifeq ($(FAKEROOT),)
+ endif
+ 	mkdir -p -m 0755 $(FAKEROOT)$(PKGCONFIGDIR)
+ 	install -m 0644 libcap.pc $(FAKEROOT)$(PKGCONFIGDIR)/libcap.pc
++	install -m 0644 libpsx.pc $(FAKEROOT)$(PKGCONFIGDIR)/libpsx.pc
+ ifeq ($(GOLANG),yes)
+ 	mkdir -p -m 0755 $(FAKEROOT)$(GOPKGDIR)/libcap/cap
+ 	install -m 0644 src/libcap/cap/* $(FAKEROOT)$(GOPKGDIR)/libcap/cap/
+@@ -96,6 +106,7 @@ endif
+ clean:
+ 	$(LOCALCLEAN)
+ 	rm -f $(CAPOBJS) $(LIBNAME)* $(STACAPLIBNAME) libcap.pc
++	rm -f $(CAPOBJS) $(LIBNAME)* $(STACAPLIBNAME) libpsx.pc
+ 	rm -f $(PSXOBJS) $(STAPSXLIBNAME)
+ 	rm -f cap_names.h cap_names.list.h _makenames $(GPERF_OUTPUT)
+ 	cd include/sys && $(LOCALCLEAN)
+diff --git libcap/libcap.pc.in libcap/libcap.pc.in
+index 3d6b273..69cd231 100644
+--- libcap/libcap.pc.in
++++ libcap/libcap.pc.in
+@@ -9,10 +9,3 @@ Version: @VERSION@
+ Libs: -L${libdir} -lcap
+ Libs.private: @deps@
+ Cflags: -I${includedir}
+-
+-Name: libpsx
+-Description: libpsx - linux posix syscall API for pthreads
+-Version: @VERSION@
+-Libs: -L${libdir} -lpsx -lpthread -Wl,-wrap,pthread_create
+-Libs.private: @deps@
+-Cflags: -I${includedir}
diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index d2cec1fa923..4683623bf47 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -1,7 +1,7 @@
 # Template file for 'libcap'
 pkgname=libcap
 version=2.29
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-makefile
 make_install_args="SBINDIR=/usr/bin exec_prefix=/usr

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-12-28  3:27 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-28  3:08 [PR PATCH] libcap: split pkgconfig file voidlinux-github
2019-12-28  3:21 ` [PR PATCH] [Updated] [NoMerge] " voidlinux-github
2019-12-28  3:27 ` [PR PATCH] [Merged]: " voidlinux-github

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).