ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2912 from felixhandte/pkg-config-fix

Browse Source 
Fix Up #2659; Build libzstd.pc Whenever Building the Lib on Unix
This commit is contained in:
Felix Handte
2021-12-08 15:22:56 -05:00
committed by GitHub
parent 38dfc4699e 9f1dee8fa5
commit 33562c55de
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Makefile
+2 -2
View File
@@ -251,7 +251,7 @@ clean:
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
ifneq (,$(filter $(UNAME),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku AIX)) ifneq (,$(filter $(UNAME),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku AIX))
all: libzstd.pc lib: libzstd.pc
HAS_EXPLICIT_EXEC_PREFIX := $(if $(or $(EXEC_PREFIX),$(exec_prefix)),1,) HAS_EXPLICIT_EXEC_PREFIX := $(if $(or $(EXEC_PREFIX),$(exec_prefix)),1,)
@@ -296,7 +296,6 @@ INSTALL_PROGRAM ?= $(INSTALL)
INSTALL_DATA ?= $(INSTALL) -m 644 INSTALL_DATA ?= $(INSTALL) -m 644
libzstd.pc:
libzstd.pc: libzstd.pc.in libzstd.pc: libzstd.pc.in
@echo creating pkgconfig @echo creating pkgconfig
@sed $(SED_ERE_OPT) \ @sed $(SED_ERE_OPT) \
@@ -305,6 +304,7 @@ libzstd.pc: libzstd.pc.in
-e 's|@INCLUDEDIR@|$(PCINCPREFIX)$(PCINCDIR)|' \ -e 's|@INCLUDEDIR@|$(PCINCPREFIX)$(PCINCDIR)|' \
-e 's|@LIBDIR@|$(PCLIBPREFIX)$(PCLIBDIR)|' \ -e 's|@LIBDIR@|$(PCLIBPREFIX)$(PCLIBDIR)|' \
-e 's|@VERSION@|$(VERSION)|' \ -e 's|@VERSION@|$(VERSION)|' \
-e 's|@LIBS_PRIVATE@|$(LDFLAGS_DYNLIB)|' \
$< >$@ $< >$@
.PHONY: install .PHONY: install
lib/libzstd.pc.in
+1
View File
@@ -12,4 +12,5 @@ Description: fast lossless compression algorithm library
URL: http://www.zstd.net/ URL: http://www.zstd.net/
Version: @VERSION@ Version: @VERSION@
Libs: -L${libdir} -lzstd Libs: -L${libdir} -lzstd
Libs.private: @LIBS_PRIVATE@
Cflags: -I${includedir} Cflags: -I${includedir}