pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/archivers/lz4
Module Name: pkgsrc
Committed By: adam
Date: Tue Jul 23 06:22:37 UTC 2024
Modified Files:
pkgsrc/archivers/lz4: Makefile PLIST distinfo
pkgsrc/archivers/lz4/patches: patch-lib_Makefile
patch-programs_Makefile
Log Message:
lz4: updated to 1.10.0
LZ4 v1.10.0 introduces major updates, integrating 600+ commits that significantly enhance its capabilities. This version brings multithreading support to the forefront, harnessing modern multi-core
processors to accelerate both compression and decompression processing. It's a good upgrade for users looking to optimize performance in high-throughput environments.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/archivers/lz4/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/archivers/lz4/PLIST
cvs rdiff -u -r1.26 -r1.27 pkgsrc/archivers/lz4/distinfo
cvs rdiff -u -r1.12 -r1.13 pkgsrc/archivers/lz4/patches/patch-lib_Makefile
cvs rdiff -u -r1.13 -r1.14 \
pkgsrc/archivers/lz4/patches/patch-programs_Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/archivers/lz4/Makefile
diff -u pkgsrc/archivers/lz4/Makefile:1.28 pkgsrc/archivers/lz4/Makefile:1.29
--- pkgsrc/archivers/lz4/Makefile:1.28 Sun Mar 17 12:39:50 2024
+++ pkgsrc/archivers/lz4/Makefile Tue Jul 23 06:22:37 2024
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.28 2024/03/17 12:39:50 nia Exp $
+# $NetBSD: Makefile,v 1.29 2024/07/23 06:22:37 adam Exp $
-DISTNAME= lz4-1.9.4
+DISTNAME= lz4-1.10.0
CATEGORIES= archivers
MASTER_SITES= ${MASTER_SITE_GITHUB:=lz4/}
-GITHUB_TAG= v${PKGVERSION_NOREV}
+GITHUB_RELEASE= v${PKGVERSION_NOREV}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://lz4.github.io/lz4/
COMMENT= Extremely Fast Compression algorithm
LICENSE= 2-clause-bsd
-USE_LANGUAGES= c99 c++
+USE_CC_FEATURES= c99
+USE_LANGUAGES= c c++
USE_TOOLS+= gmake
USE_LIBTOOL= yes
PKGCONFIG_OVERRIDE+= lib/liblz4.pc.in
Index: pkgsrc/archivers/lz4/PLIST
diff -u pkgsrc/archivers/lz4/PLIST:1.12 pkgsrc/archivers/lz4/PLIST:1.13
--- pkgsrc/archivers/lz4/PLIST:1.12 Sun Mar 17 12:39:50 2024
+++ pkgsrc/archivers/lz4/PLIST Tue Jul 23 06:22:37 2024
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.12 2024/03/17 12:39:50 nia Exp $
+@comment $NetBSD: PLIST,v 1.13 2024/07/23 06:22:37 adam Exp $
bin/lz4
bin/lz4c
bin/lz4cat
bin/unlz4
include/lz4.h
+include/lz4file.h
include/lz4frame.h
include/lz4frame_static.h
include/lz4hc.h
Index: pkgsrc/archivers/lz4/distinfo
diff -u pkgsrc/archivers/lz4/distinfo:1.26 pkgsrc/archivers/lz4/distinfo:1.27
--- pkgsrc/archivers/lz4/distinfo:1.26 Sun Mar 17 12:39:50 2024
+++ pkgsrc/archivers/lz4/distinfo Tue Jul 23 06:22:37 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.26 2024/03/17 12:39:50 nia Exp $
+$NetBSD: distinfo,v 1.27 2024/07/23 06:22:37 adam Exp $
-BLAKE2s (lz4-1.9.4.tar.gz) = 47eac8d4a549b2ab125e6b44d9c0acd1ed2c4d0e86054ecacc5f9704a0d4c208
-SHA512 (lz4-1.9.4.tar.gz) = 043a9acb2417624019d73db140d83b80f1d7c43a6fd5be839193d68df8fd0b3f610d7ed4d628c2a9184f7cde9a0fd1ba9d075d8251298e3eb4b3a77f52736684
-Size (lz4-1.9.4.tar.gz) = 354063 bytes
+BLAKE2s (lz4-1.10.0.tar.gz) = 808c7e29e470bced688f9c8f965518b4eb2ead74521cf6f79f1699593d756fca
+SHA512 (lz4-1.10.0.tar.gz) = 8c4ceb217e6dc8e7e0beba99adc736aca8963867bcf9f970d621978ba11ce92855912f8b66138037a1d2ae171e8e17beb7be99281fea840106aa60373c455b28
+Size (lz4-1.10.0.tar.gz) = 387114 bytes
SHA1 (patch-Makefile.inc) = 7f27fb9d4cde9c14623c8fce167990bec0332161
-SHA1 (patch-lib_Makefile) = e62b85be5c4b9628f194398262a041f0309f2f6b
-SHA1 (patch-programs_Makefile) = bf3a8b296bfac8407c3e233c41fa037ba989876c
+SHA1 (patch-lib_Makefile) = 1e43f41313a7f600a828d212e1bd4920fdc62920
+SHA1 (patch-programs_Makefile) = 572e70b467fe6566f4898d3cf0b660ee72f589a1
Index: pkgsrc/archivers/lz4/patches/patch-lib_Makefile
diff -u pkgsrc/archivers/lz4/patches/patch-lib_Makefile:1.12 pkgsrc/archivers/lz4/patches/patch-lib_Makefile:1.13
--- pkgsrc/archivers/lz4/patches/patch-lib_Makefile:1.12 Sun Mar 17 12:39:50 2024
+++ pkgsrc/archivers/lz4/patches/patch-lib_Makefile Tue Jul 23 06:22:37 2024
@@ -1,40 +1,42 @@
-$NetBSD: patch-lib_Makefile,v 1.12 2024/03/17 12:39:50 nia Exp $
+$NetBSD: patch-lib_Makefile,v 1.13 2024/07/23 06:22:37 adam Exp $
Make portable (inc. libtoolize).
Unlock install target. Use pkgsrc install scripts.
---- lib/Makefile.orig 2022-08-15 22:45:31.000000000 +0000
+--- lib/Makefile.orig 2024-07-21 17:29:49.000000000 +0000
+++ lib/Makefile
@@ -34,9 +34,9 @@
- SED = sed
+ SED ?= sed
# 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:=`$(SED) -n '/define[[:blank:]][[:blank:]]*LZ4_VERSION_MAJOR/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < ./lz4.h`
+-LIBVER_MINOR_SCRIPT:=`$(SED) -n '/define[[:blank:]][[:blank:]]*LZ4_VERSION_MINOR/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < ./lz4.h`
+-LIBVER_PATCH_SCRIPT:=`$(SED) -n '/define[[:blank:]][[:blank:]]*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))
-@@ -56,6 +56,7 @@ CFLAGS += $(DEBUGFLAGS)
- FLAGS = $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
+@@ -55,6 +55,7 @@ CFLAGS = $(DEBUGFLAGS) $(USERCFLAGS)
+ ALLFLAGS = $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
SRCFILES := $(sort $(wildcard *.c))
+OBJFILES := $(patsubst %.c,%.lo,$(SRCFILES))
include ../Makefile.inc
-@@ -92,10 +93,13 @@ all: lib
+@@ -97,11 +98,15 @@ all: lib liblz4.pc
all32: CFLAGS+=-m32
all32: all
--liblz4.a: $(SRCFILES)
+.SUFFIXES: .lo
+.c.lo:
+ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(CFLAGS) $(CPPFLAGS) -c $^ -o $@
+
++
+ CLEAN += liblz4.a
+-liblz4.a: $(SRCFILES)
+liblz4.a: $(OBJFILES)
ifeq ($(BUILD_STATIC),yes) # can be disabled on command line
@echo compiling static library
@@ -42,46 +44,49 @@ Unlock install target. Use pkgsrc instal
$(AR) rcs $@ *.o
endif
-@@ -117,17 +121,13 @@ $(LIBLZ4): $(SRCFILES) liblz4-dll.o
+@@ -128,29 +133,26 @@ $(LIBLZ4): $(SRCFILES) liblz4-dll.o
else # not windows
-$(LIBLZ4): $(SRCFILES)
-- @echo compiling dynamic library $(LIBVER)
-- $(CC) $(FLAGS) -shared $^ -fPIC -fvisibility=hidden $(SONAME_FLAGS) -o $@
++liblz4.la: $(OBJFILES)
+ ifeq ($(BUILD_SHARED),yes)
+ @echo compiling dynamic library $(LIBVER)
+- $(CC) $(ALLFLAGS) -shared $^ -fPIC -fvisibility=hidden $(SONAME_FLAGS) -o $@
- @echo creating versioned links
- $(LN_SF) $@ liblz4.$(SHARED_EXT_MAJOR)
- $(LN_SF) $@ liblz4.$(SHARED_EXT)
--
-+liblz4.la: $(OBJFILES)
-+ @echo linking dynamic library $(LIBVER)
+ $(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) -rpath $(PREFIX)/lib -version-info $(LIBVER_MAJOR):0 $^ -o $@
+ endif
+
endif
+ CLEAN += $(LIBLZ4)
.PHONY: liblz4
-liblz4: $(LIBLZ4)
+liblz4: liblz4.la
- .PHONY: clean
- clean:
-@@ -171,20 +171,20 @@ pkgconfigdir ?= $(PKGCONFIGDIR)
-
+ CLEAN += liblz4.pc
liblz4.pc: liblz4.pc.in Makefile
@echo creating pkgconfig
- $(SED) -e 's|@PREFIX@|$(prefix)|' \
-- -e 's|@LIBDIR@|$(libdir)|' \
-- -e 's|@INCLUDEDIR@|$(includedir)|' \
-- -e 's|@VERSION@|$(LIBVER)|' \
-- -e 's|=${prefix}/|=$${prefix}/|' \
+- -e 's|@LIBDIR@|$(libdir)|' \
+- -e 's|@INCLUDEDIR@|$(includedir)|' \
+- -e 's|@VERSION@|$(LIBVER)|' \
+- -e 's|=${prefix}/|=$${prefix}/|' \
+ $(SED) -e 's|@PREFIX@|$(prefix)|g' \
-+ -e 's|@LIBDIR@|$(libdir)|g' \
-+ -e 's|@INCLUDEDIR@|$(includedir)|g' \
-+ -e 's|@VERSION@|$(LIBVER)|g' \
-+ -e 's|=${prefix}/|=$${prefix}/|g' \
- $< >$@
++ -e 's|@LIBDIR@|$(libdir)|g' \
++ -e 's|@INCLUDEDIR@|$(includedir)|g' \
++ -e 's|@VERSION@|$(LIBVER)|g' \
++ -e 's|=${prefix}/|=$${prefix}/|g' \
+ $< >$@
+
+ .PHONY: clean
+@@ -195,13 +197,13 @@ pkgconfigdir ?= $(PKGCONFIGDIR)
+ .PHONY: install
install: lib liblz4.pc
-- $(INSTALL_DIR) $(DESTDIR)$(pkgconfigdir)/ $(DESTDIR)$(includedir)/ $(DESTDIR)$(libdir)/ $(DESTDIR)$(bindir)/
+- $(MAKE_DIR) $(DESTDIR)$(pkgconfigdir)/ $(DESTDIR)$(includedir)/ $(DESTDIR)$(libdir)/ $(DESTDIR)$(bindir)/
- $(INSTALL_DATA) liblz4.pc $(DESTDIR)$(pkgconfigdir)/
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(pkgconfigdir)/ $(DESTDIR)$(includedir)/ $(DESTDIR)$(libdir)/ $(DESTDIR)$(bindir)/
+ $(BSD_INSTALL_DATA) liblz4.pc $(DESTDIR)$(pkgconfigdir)/
@@ -89,14 +94,16 @@ Unlock install target. Use pkgsrc instal
ifeq ($(BUILD_STATIC),yes)
- $(INSTALL_DATA) liblz4.a $(DESTDIR)$(libdir)/liblz4.a
- $(INSTALL_DATA) lz4frame_static.h $(DESTDIR)$(includedir)/lz4frame_static.h
+- $(INSTALL_DATA) lz4file.h $(DESTDIR)$(includedir)/lz4file.h
+ $(BSD_INSTALL_LIB) liblz4.a $(DESTDIR)$(libdir)/liblz4.a
+ $(BSD_INSTALL_DATA) lz4frame_static.h $(DESTDIR)$(includedir)/lz4frame_static.h
++ $(BSD_INSTALL_DATA) lz4file.h $(DESTDIR)$(includedir)/lz4file.h
endif
ifeq ($(BUILD_SHARED),yes)
# Traditionally, one installs the DLLs in the bin directory as programs
-@@ -194,15 +194,13 @@ install: lib liblz4.pc
- $(INSTALL_PROGRAM) dll/$(LIBLZ4).dll $(DESTDIR)$(bindir)
- $(INSTALL_PROGRAM) dll/$(LIBLZ4_EXP) $(DESTDIR)$(libdir)
+@@ -211,15 +213,13 @@ install: lib liblz4.pc
+ $(INSTALL_PROGRAM) $(LIBLZ4) $(DESTDIR)$(bindir)
+ $(INSTALL_PROGRAM) $(LIBLZ4_EXP) $(DESTDIR)$(libdir)
else
- $(INSTALL_PROGRAM) liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(libdir)
- $(LN_SF) liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(libdir)/liblz4.$(SHARED_EXT_MAJOR)
@@ -113,4 +120,4 @@ Unlock install target. Use pkgsrc instal
+ $(BSD_INSTALL_DATA) lz4frame.h $(DESTDIR)$(includedir)/lz4frame.h
@echo lz4 libraries installed
- uninstall:
+ .PHONY: uninstall
Index: pkgsrc/archivers/lz4/patches/patch-programs_Makefile
diff -u pkgsrc/archivers/lz4/patches/patch-programs_Makefile:1.13 pkgsrc/archivers/lz4/patches/patch-programs_Makefile:1.14
--- pkgsrc/archivers/lz4/patches/patch-programs_Makefile:1.13 Tue Aug 16 13:02:56 2022
+++ pkgsrc/archivers/lz4/patches/patch-programs_Makefile Tue Jul 23 06:22:37 2024
@@ -1,10 +1,22 @@
-$NetBSD: patch-programs_Makefile,v 1.13 2022/08/16 13:02:56 adam Exp $
+$NetBSD: patch-programs_Makefile,v 1.14 2024/07/23 06:22:37 adam Exp $
+Remove OS_VERSION as it is defined by pkgsrc, and causes "No such file or directory" message.
Unlock install target. Use pkgsrc install scripts.
---- programs/Makefile.orig 2022-08-15 22:45:31.000000000 +0000
+--- programs/Makefile.orig 2024-07-21 17:29:49.000000000 +0000
+++ programs/Makefile
-@@ -165,20 +165,20 @@ BINDIR ?= $(exec_prefix)/bin
+@@ -55,10 +55,6 @@ CPPFLAGS += -I$(LIBDIR) -DXXH_NAMESPACE=
+
+ include ../Makefile.inc
+
+-OS_VERSION ?= $(UNAME) -r
+-ifeq ($(TARGET_OS)$(shell $(OS_VERSION)),SunOS5.10)
+-LDFLAGS += -lrt
+-endif
+
+ ALLFLAGS = $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
+
+@@ -201,7 +197,7 @@ BINDIR ?= $(exec_prefix)/bin
bindir ?= $(BINDIR)
DATAROOTDIR ?= $(prefix)/share
datarootdir ?= $(DATAROOTDIR)
@@ -13,10 +25,11 @@ Unlock install target. Use pkgsrc instal
mandir ?= $(MANDIR)
MAN1DIR ?= $(mandir)/man1
man1dir ?= $(MAN1DIR)
-
+@@ -209,13 +205,13 @@ man1dir ?= $(MAN1DIR)
+ .PHONY: install
install: lz4
@echo Installing binaries in $(DESTDIR)$(bindir)
-- $(INSTALL_DIR) $(DESTDIR)$(bindir)/ $(DESTDIR)$(man1dir)/
+- $(MAKE_DIR) $(DESTDIR)$(bindir)/ $(DESTDIR)$(man1dir)/
- $(INSTALL_PROGRAM) lz4$(EXT) $(DESTDIR)$(bindir)/lz4$(EXT)
+ $(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(bindir)/ $(DESTDIR)$(man1dir)/
+ $(BSD_INSTALL_PROGRAM) lz4$(EXT) $(DESTDIR)$(bindir)/lz4$(EXT)
Home |
Main Index |
Thread Index |
Old Index