On Sun 23/01/2022 14:35, Stuart Henderson wrote:
> On 2022/01/21 05:40, Bjorn Ketelaars wrote:
> > --- lib/libzstd.mk.orig
> > +++ lib/libzstd.mk
> > -@@ -79,7 +79,7 @@ endif
> > +@@ -81,7 +81,7 @@ endif
> > CFLAGS += -fno-stack-protector -fomit-frame-pointer -fno-ident \
> > -DDYNAMIC_BMI2=0 -DNDEBUG
> > else
> > -- CFLAGS += -O3
> > -+ CFLAGS +=
> > +- CFLAGS ?= -O3
> > ++ CFLAGS ?=
>
> is there any need to patch this now that upstream changed it to "?=" ?
There is no need, thank you for noticing this. New diff:
diff --git Makefile Makefile
index 9c9e26b1911..edc7e0bbb80 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
COMMENT = zstandard fast real-time compression algorithm
-V = 1.5.1
+V = 1.5.2
DISTNAME = zstd-${V}
SHARED_LIBS = zstd 6.1 # 1.5.1
diff --git distinfo distinfo
index a4aad9aef0e..25b30205e17 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (zstd-1.5.1.tar.gz) = 4osvLtVxDqDToeysP2qUegFrlyud0wJCNpAQ5fU9cAI=
-SIZE (zstd-1.5.1.tar.gz) = 1934669
+SHA256 (zstd-1.5.2.tar.gz) = fELVb6wSaSmmqF28c/8dskEdBPEE+um96lEwVmOoP9A=
+SIZE (zstd-1.5.2.tar.gz) = 1936664
diff --git patches/patch-lib_libzstd_mk patches/patch-lib_libzstd_mk
index 1cf669345a6..f88a8fea02c 100644
--- patches/patch-lib_libzstd_mk
+++ patches/patch-lib_libzstd_mk
@@ -1,21 +1,11 @@
$OpenBSD: patch-lib_libzstd_mk,v 1.1 2021/12/25 13:28:13 bket Exp $
-Don't set compiler optimisation level.
Some compilers don't have -Wvla.
Index: lib/libzstd.mk
--- lib/libzstd.mk.orig
+++ lib/libzstd.mk
-@@ -79,7 +79,7 @@ endif
- CFLAGS += -fno-stack-protector -fomit-frame-pointer -fno-ident \
- -DDYNAMIC_BMI2=0 -DNDEBUG
- else
-- CFLAGS += -O3
-+ CFLAGS +=
- endif
-
- DEBUGLEVEL ?= 0
-@@ -90,7 +90,7 @@ endif
+@@ -92,7 +92,7 @@ endif
DEBUGFLAGS= -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow \
-Wstrict-aliasing=1 -Wswitch-enum -Wdeclaration-after-statement \
-Wstrict-prototypes -Wundef -Wpointer-arith \
@@ -23,4 +13,4 @@ Index: lib/libzstd.mk
+ -Wformat=2 -Winit-self -Wfloat-equal -Wwrite-strings \
-Wredundant-decls -Wmissing-prototypes -Wc++-compat
CFLAGS += $(DEBUGFLAGS) $(MOREFLAGS)
- LDFLAGS += $(MOREFLAGS)
+ ASFLAGS += $(DEBUGFLAGS) $(MOREFLAGS) $(CFLAGS)
