jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

libcap: split pkgconfig file

Browse source 
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

Signed-off-by: Nathan Owens <ndowens04@gmail.com>
This commit is contained in:
Nathan Owens 2019-12-27 21:07:36 -06:00 committed by Michael Aldridge
parent a93e643524
commit 55c28d1cbc
2 changed files with 85 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
srcpkgs/libcap/patches/pkgconfig.patch Normal file
View file

@ -0,0 +1,84 @@
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}
libcap/libpsx.pc.in | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 libcap/libpsx.pc.in
diff --git a/libcap/libpsx.pc.in b/libcap/libpsx.pc.in
new file mode 100644
index 0000000..d032b9f
--- /dev/null
+++ libcap/libpsx.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@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}
--
2.24.1

2
srcpkgs/libcap/template
View file

@ -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