Diff below updates lz4 to 1.9.3. From the release notes [0]: LZ4 v1.9.3
is a maintenance release, offering more than 200+ commits to fix
multiple corner cases and build scenarios. Update is recommended. liblz4
API is not modified, so it should be a drop-in replacement.
The statement "API is not modified" seems not entirely true as check_sym
did find a new symbol.
Changes to the port:
- Bump minor of SHARED_LIBS
- Update HOMEPAGE
- Take MAINTAINER
- Set DEBUG_PACKAGES=${BUILD_PACKAGES}
- Follow Makefile.template
Testing:
- Build tested consumers
- 'make test' runs successfully
Comments/OK?
[0] https://github.com/lz4/lz4/releases/tag/v1.9.3
Index: Makefile
===================================================================
RCS file: /cvs/ports/archivers/lz4/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile 3 Feb 2020 20:40:37 -0000 1.27
+++ Makefile 16 Nov 2020 06:10:03 -0000
@@ -1,38 +1,39 @@
# $OpenBSD: Makefile,v 1.27 2020/02/03 20:40:37 sthen Exp $
-SHARED_LIBS += lz4 3.0
-
COMMENT= fast BSD-licensed data compression
GH_ACCOUNT= lz4
GH_PROJECT= lz4
-GH_TAGNAME= v1.9.2
-REVISION= 0
+GH_TAGNAME= v1.9.3
+
+SHARED_LIBS= lz4 3.1
CATEGORIES= archivers
-HOMEPAGE= https://fastcompression.blogspot.com/p/lz4.html
+HOMEPAGE= https://lz4.github.io/lz4/
+
+MAINTAINER= Bjorn Ketelaars <b...@openbsd.org>
# library: BSD, tools: GPLv2
PERMIT_PACKAGE= Yes
-WANTLIB += c
+WANTLIB= c
-USE_GMAKE= Yes
MAKE_FLAGS= CC="${CC}" \
- CXX="${CXX}" \
- CFLAGS="${CFLAGS}" \
- V=1 \
+ CFLAGS="${CFLAGS} -DLZ4_FORCE_MEMORY_ACCESS=1" \
MANDIR="${PREFIX}/man" \
+ SHARED_EXT_VER="so.${LIBlz4_VERSION}" \
SONAME_FLAGS= \
- SHARED_EXT_VER="so.${LIBlz4_VERSION}"
-FAKE_FLAGS= PREFIX=${PREFIX}
-TEST_ENV+= MAKE_PROGRAM=${MAKE_PROGRAM}
-CFLAGS+= -DLZ4_FORCE_MEMORY_ACCESS=1
-
-post-install:
- mv ${PREFIX}/libdata/pkgconfig/* ${PREFIX}/lib/pkgconfig/
- rmdir ${PREFIX}/libdata/pkgconfig
- rm ${PREFIX}/lib/liblz4.so{.1,}
+ V=1
+FAKE_FLAGS= PKGCONFIGDIR="${PREFIX}/lib/pkgconfig" \
+ PREFIX="${PREFIX}"
+TEST_ENV= MAKE_PROGRAM=${MAKE_PROGRAM}
+
+USE_GMAKE= Yes
+
+DEBUG_PACKAGES= ${BUILD_PACKAGES}
+
+ALL_TARGET= default
+TEST_TARGET= check
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/archivers/lz4/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo 21 Aug 2019 10:55:41 -0000 1.17
+++ distinfo 16 Nov 2020 06:10:03 -0000
@@ -1,2 +1,2 @@
-SHA256 (lz4-1.9.2.tar.gz) = ZYumGR+kTJIoDUqiwnGw9PvA400klXjdBeUOdtDl78w=
-SIZE (lz4-1.9.2.tar.gz) = 305796
+SHA256 (lz4-1.9.3.tar.gz) = AwZE30YRAH/33JYtmB85A2HmyXo05cvDk9374Bn/4sE=
+SIZE (lz4-1.9.3.tar.gz) = 320958
Index: patches/patch-lib_Makefile
===================================================================
RCS file: /cvs/ports/archivers/lz4/patches/patch-lib_Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 patch-lib_Makefile
--- patches/patch-lib_Makefile 21 Aug 2019 10:55:41 -0000 1.11
+++ patches/patch-lib_Makefile 16 Nov 2020 06:10:03 -0000
@@ -3,13 +3,12 @@ $OpenBSD: patch-lib_Makefile,v 1.11 2019
Index: lib/Makefile
--- lib/Makefile.orig
+++ lib/Makefile
-@@ -113,9 +113,6 @@ ifeq ($(BUILD_SHARED),yes) # can be disabled on comma
- $(Q)$(CC) $(FLAGS) -DLZ4_DLL_EXPORT=1 -shared $^ -o dll/$@.dll
-Wl,--out-implib,dll/$(LIBLZ4_EXP)
- else
- $(Q)$(CC) $(FLAGS) -shared $^ -fPIC -fvisibility=hidden $(SONAME_FLAGS)
-o $@
-- @echo creating versioned links
-- $(Q)$(LN_SF) $@ liblz4.$(SHARED_EXT_MAJOR)
-- $(Q)$(LN_SF) $@ liblz4.$(SHARED_EXT)
+@@ -187,8 +187,6 @@ install: lib liblz4.pc
+ $(Q)$(INSTALL_PROGRAM) dll/$(LIBLZ4_EXP) $(DESTDIR)$(libdir)
+ else
+ $(Q)$(INSTALL_PROGRAM) 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
- endif
-
+ @echo Installing headers in $(includedir)
Index: patches/patch-tests_test_install_sh
===================================================================
RCS file: patches/patch-tests_test_install_sh
diff -N patches/patch-tests_test_install_sh
--- patches/patch-tests_test_install_sh 24 Sep 2018 21:01:34 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-tests_test_install_sh,v 1.1 2018/09/24 21:01:34 sthen Exp $
-
-Index: tests/test_install.sh
---- tests/test_install.sh.orig
-+++ tests/test_install.sh
-@@ -1,7 +1,7 @@
- #/usr/bin/env sh
- set -e
-
--make="make -C $lz4_root"
-+make="${MAKE_PROGRAM:=make} -C $lz4_root"
- for cmd in install uninstall; do
- for upper in DUMMY PREFIX EXEC_PREFIX LIBDIR INCLUDEDIR PKGCONFIGDIR BINDIR
MANDIR MAN1DIR ; do
- lower=$(echo $upper | tr '[:upper:]' '[:lower:]')
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/archivers/lz4/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST 16 Jan 2018 14:03:45 -0000 1.6
+++ pkg/PLIST 16 Nov 2020 06:10:03 -0000
@@ -7,7 +7,7 @@ include/lz4.h
include/lz4frame.h
include/lz4frame_static.h
include/lz4hc.h
-lib/liblz4.a
+@static-lib lib/liblz4.a
@lib lib/liblz4.so.${LIBlz4_VERSION}
lib/pkgconfig/liblz4.pc
@man man/man1/lz4.1
