Return to patch-lib_Makefile CVS log | Up to [cvs.NetBSD.org] / pkgsrc / archivers / lz4 / patches |
File: [cvs.NetBSD.org] / pkgsrc / archivers / lz4 / patches / patch-lib_Makefile (download)
Revision 1.10, Tue Apr 30 09:17:38 2019 UTC (4 years, 11 months ago) by adam
lz4: updated to 1.9.1 LZ4 v1.9.1 Changes fix : decompression functions were reading a few bytes beyond input size api : fix : lz4frame initializers compatibility with c++ cli : added command --list build: improved Windows build build: AIX, by Norman Green LZ4 v1.9.0 This release brings an assortment of small improvements and bug fixes, as detailed below : perf: large decompression speed improvement on x86/x64 (up to +20%) api : changed : _destSize() compression variants are promoted to stable API api : new : LZ4_initStream(HC), replacing LZ4_resetStream(HC) api : changed : LZ4_resetStream(HC) as recommended reset function, for better performance on small data cli : support custom block sizes build: source code can be amalgamated, by Bing Xu build: added meson build build: new build macros : LZ4_DISTANCE_MAX, LZ4_FAST_DEC_LOOP install: MidnightBSD install: msys2 on Windows 10 |
$NetBSD: patch-lib_Makefile,v 1.10 2019/04/30 09:17:38 adam Exp $ Make portable. Unlock install target. Use pkgsrc install scripts. --- lib/Makefile.orig 2019-04-23 17:18:40.000000000 +0000 +++ lib/Makefile @@ -33,9 +33,9 @@ # ################################################################ # Version numbers -LIBVER_MAJOR_SCRIPT:=`sed -n '/define LZ4_VERSION_MAJOR/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < ./lz4.h` -LIBVER_MINOR_SCRIPT:=`sed -n '/define LZ4_VERSION_MINOR/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < ./lz4.h` -LIBVER_PATCH_SCRIPT:=`sed -n '/define LZ4_VERSION_RELEASE/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < ./lz4.h` +LIBVER_MAJOR_SCRIPT:=`awk '$$2=="LZ4_VERSION_MAJOR" {print $$3}' < lz4.h` +LIBVER_MINOR_SCRIPT:=`awk '$$2=="LZ4_VERSION_MINOR" {print $$3}' < lz4.h` +LIBVER_PATCH_SCRIPT:=`awk '$$2=="LZ4_VERSION_RELEASE" {print $$3}' < lz4.h` LIBVER_SCRIPT:= $(LIBVER_MAJOR_SCRIPT).$(LIBVER_MINOR_SCRIPT).$(LIBVER_PATCH_SCRIPT) LIBVER_MAJOR := $(shell echo $(LIBVER_MAJOR_SCRIPT)) LIBVER_MINOR := $(shell echo $(LIBVER_MINOR_SCRIPT)) @@ -45,6 +45,7 @@ LIBVER := $(shell echo $(LIBVER_SCRIPT) BUILD_SHARED:=yes BUILD_STATIC:=yes +OS ?= $(shell uname) CPPFLAGS+= -DXXH_NAMESPACE=LZ4_ CFLAGS ?= -O3 DEBUGFLAGS:= -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow \ @@ -156,28 +157,23 @@ libdir ?= $(LIBDIR) INCLUDEDIR ?= $(prefix)/include includedir ?= $(INCLUDEDIR) - ifneq (,$(filter $(TARGET_OS),OpenBSD FreeBSD NetBSD DragonFly MidnightBSD)) -PKGCONFIGDIR ?= $(prefix)/libdata/pkgconfig - else -PKGCONFIGDIR ?= $(libdir)/pkgconfig - endif -pkgconfigdir ?= $(PKGCONFIGDIR) +pkgconfigdir ?= $(prefix)/lib/pkgconfig liblz4.pc: liblz4.pc.in Makefile @echo creating pkgconfig - $(Q)sed -e 's|@PREFIX@|$(prefix)|' \ - -e 's|@LIBDIR@|$(libdir)|' \ - -e 's|@INCLUDEDIR@|$(includedir)|' \ - -e 's|@VERSION@|$(LIBVER)|' \ + $(Q)sed -e 's|@PREFIX@|$(prefix)|g' \ + -e 's|@LIBDIR@|$(libdir)|g' \ + -e 's|@INCLUDEDIR@|$(includedir)|g' \ + -e 's|@VERSION@|$(LIBVER)|g' \ $< >$@ install: lib liblz4.pc - $(Q)$(INSTALL_DIR) $(DESTDIR)$(pkgconfigdir)/ $(DESTDIR)$(includedir)/ $(DESTDIR)$(libdir)/ $(DESTDIR)$(bindir)/ - $(Q)$(INSTALL_DATA) liblz4.pc $(DESTDIR)$(pkgconfigdir)/ + $(Q)$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(pkgconfigdir)/ $(DESTDIR)$(includedir)/ $(DESTDIR)$(libdir)/ $(DESTDIR)$(bindir)/ + $(Q)$(BSD_INSTALL_DATA) liblz4.pc $(DESTDIR)$(pkgconfigdir)/ @echo Installing libraries ifeq ($(BUILD_STATIC),yes) - $(Q)$(INSTALL_DATA) liblz4.a $(DESTDIR)$(libdir)/liblz4.a - $(Q)$(INSTALL_DATA) lz4frame_static.h $(DESTDIR)$(includedir)/lz4frame_static.h + $(Q)$(BSD_INSTALL_LIB) liblz4.a $(DESTDIR)$(libdir)/liblz4.a + $(Q)$(BSD_INSTALL_DATA) lz4frame_static.h $(DESTDIR)$(includedir)/lz4frame_static.h endif ifeq ($(BUILD_SHARED),yes) # Traditionnally, one installs the DLLs in the bin directory as programs @@ -187,15 +183,15 @@ install: lib liblz4.pc $(Q)$(INSTALL_PROGRAM) dll/$(LIBLZ4).dll $(DESTDIR)$(bindir) $(Q)$(INSTALL_PROGRAM) dll/$(LIBLZ4_EXP) $(DESTDIR)$(libdir) else - $(Q)$(INSTALL_PROGRAM) liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(libdir) + $(Q)$(BSD_INSTALL_LIB) liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(libdir) $(Q)$(LN_SF) liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(libdir)/liblz4.$(SHARED_EXT_MAJOR) $(Q)$(LN_SF) liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(libdir)/liblz4.$(SHARED_EXT) endif endif @echo Installing headers in $(includedir) - $(Q)$(INSTALL_DATA) lz4.h $(DESTDIR)$(includedir)/lz4.h - $(Q)$(INSTALL_DATA) lz4hc.h $(DESTDIR)$(includedir)/lz4hc.h - $(Q)$(INSTALL_DATA) lz4frame.h $(DESTDIR)$(includedir)/lz4frame.h + $(Q)$(BSD_INSTALL_DATA) lz4.h $(DESTDIR)$(includedir)/lz4.h + $(Q)$(BSD_INSTALL_DATA) lz4hc.h $(DESTDIR)$(includedir)/lz4hc.h + $(Q)$(BSD_INSTALL_DATA) lz4frame.h $(DESTDIR)$(includedir)/lz4frame.h @echo lz4 libraries installed uninstall: