diff options
| author | Lars Wendler <polynomial-c@gentoo.org> | 2019-12-29 10:39:33 +0100 |
|---|---|---|
| committer | Andrew G. Morgan <morgan@kernel.org> | 2019-12-29 08:01:54 -0800 |
| commit | 64b31970dfa7bb10907b9e09df2018bde3d92de1 (patch) | |
| tree | 601d1326b046003b986ab6f64db6cfda53eaebab /libcap | |
| parent | a269c95dc8a9b94e2956295179f9dc8f4515465a (diff) | |
| download | libcap-64b31970dfa7bb10907b9e09df2018bde3d92de1.tar.gz | |
Use separate libpsx.pc file instead of libcap.pc (take two)
pkgconfig fails to parse current libcap.pc file but pkgconf succeeds
Gentoo-bug: https://bugs.gentoo.org/703932
Signed-off-by: Andrew G. Morgan <morgan@kernel.org>
Diffstat (limited to 'libcap')
| -rw-r--r-- | libcap/Makefile | 12 | ||||
| -rw-r--r-- | libcap/libcap.pc.in | 8 | ||||
| -rw-r--r-- | libcap/libpsx.pc.in | 11 |
3 files changed, 23 insertions, 8 deletions
diff --git a/libcap/Makefile b/libcap/Makefile index a87e18b..fbfc008 100644 --- a/libcap/Makefile +++ b/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 clean: $(LOCALCLEAN) diff --git a/libcap/libcap.pc.in b/libcap/libcap.pc.in index 3d6b273..8358274 100644 --- a/libcap/libcap.pc.in +++ b/libcap/libcap.pc.in @@ -9,10 +9,4 @@ 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} +Requires: libpsx diff --git a/libcap/libpsx.pc.in b/libcap/libpsx.pc.in new file mode 100644 index 0000000..d032b9f --- /dev/null +++ b/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} |