diff --git a/app-arch/zstd/patches/zstd-1.3.8-gcc2.patchset b/app-arch/zstd/patches/zstd-1.4.1-gcc2.patchset similarity index 70% rename from app-arch/zstd/patches/zstd-1.3.8-gcc2.patchset rename to app-arch/zstd/patches/zstd-1.4.1-gcc2.patchset index 14f568a4d..91d03cacc 100644 --- a/app-arch/zstd/patches/zstd-1.3.8-gcc2.patchset +++ b/app-arch/zstd/patches/zstd-1.4.1-gcc2.patchset @@ -1,27 +1,27 @@ -From a877e2ecbca87e9cdf28f28fc884bc8a88d93d08 Mon Sep 17 00:00:00 2001 +From f5b2d80f7e83b4410d97602c4f85bfa5878d91cc Mon Sep 17 00:00:00 2001 From: fbrosson Date: Wed, 28 Mar 2018 16:51:49 +0000 Subject: Drop gcc options unknown to gcc2. diff --git a/lib/Makefile b/lib/Makefile -index 386583e..a30c956 100644 +index 87a396c..d1dbe83 100644 --- a/lib/Makefile +++ b/lib/Makefile -@@ -23,10 +23,9 @@ ifeq ($(OS),Windows_NT) # MinGW assumed +@@ -24,10 +24,10 @@ ifeq ($(OS),Windows_NT) # MinGW assumed CPPFLAGS += -D__USE_MINGW_ANSI_STDIO # compatibility with %zu formatting endif CFLAGS ?= -O3 -DEBUGFLAGS= -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow \ -- -Wstrict-aliasing=1 -Wswitch-enum -Wdeclaration-after-statement \ -+DEBUGFLAGS= -Wall -Wcast-qual -Wcast-align -Wshadow \ - -Wstrict-prototypes -Wundef -Wpointer-arith -Wformat-security \ ++DEBUGFLAGS= -Wall -Wcast-qual -Wcast-align -Wshadow \ + -Wstrict-aliasing=1 -Wswitch-enum -Wdeclaration-after-statement \ + -Wstrict-prototypes -Wundef -Wpointer-arith \ - -Wvla -Wformat=2 -Winit-self -Wfloat-equal -Wwrite-strings \ + -Wvla -Wformat=2 -Wwrite-strings \ -Wredundant-decls -Wmissing-prototypes -Wc++-compat CFLAGS += $(DEBUGFLAGS) $(MOREFLAGS) FLAGS = $(CPPFLAGS) $(CFLAGS) -@@ -157,7 +156,7 @@ $(LIBZSTD): $(ZSTD_FILES) +@@ -166,7 +166,7 @@ $(LIBZSTD): $(ZSTD_FILES) else LIBZSTD = libzstd.$(SHARED_EXT_VER) @@ -31,34 +31,34 @@ index 386583e..a30c956 100644 @echo compiling dynamic library $(LIBVER) @$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@ diff --git a/programs/Makefile b/programs/Makefile -index d1910fb..0a70b38 100644 +index 64dcae0..6adf081 100644 --- a/programs/Makefile +++ b/programs/Makefile -@@ -49,10 +49,9 @@ ifeq ($(OS),Windows_NT) # MinGW assumed +@@ -49,10 +49,10 @@ ifeq ($(OS),Windows_NT) # MinGW assumed CPPFLAGS += -D__USE_MINGW_ANSI_STDIO # compatibility with %zu formatting endif CFLAGS ?= -O3 -DEBUGFLAGS+=-Wall -Wextra -Wcast-qual -Wcast-align -Wshadow \ -- -Wstrict-aliasing=1 -Wswitch-enum -Wdeclaration-after-statement \ +DEBUGFLAGS+=-Wall -Wcast-qual -Wcast-align -Wshadow \ - -Wstrict-prototypes -Wundef -Wpointer-arith -Wformat-security \ + -Wstrict-aliasing=1 -Wswitch-enum -Wdeclaration-after-statement \ + -Wstrict-prototypes -Wundef -Wpointer-arith \ - -Wvla -Wformat=2 -Winit-self -Wfloat-equal -Wwrite-strings \ -+ -Wformat=2 -Wwrite-strings \ ++ -Wvla -Wformat=2 -Wwrite-strings \ -Wredundant-decls -Wmissing-prototypes -Wc++-compat CFLAGS += $(DEBUGFLAGS) $(MOREFLAGS) FLAGS = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -- -2.19.1 +2.21.0 -From 9f9453b5e5f676a0bab5684e593d822b15a3e87b Mon Sep 17 00:00:00 2001 +From bf78b65e9775e0418d0c8b78b12503da6eb5927a Mon Sep 17 00:00:00 2001 From: fbrosson Date: Mon, 29 Oct 2018 19:39:46 +0000 Subject: Remove "-Werror" from MOREFLAGS to fix "make test" with gcc2. diff --git a/Makefile b/Makefile -index ed78d19..9aa89a6 100644 +index f2ec8c9..82dfca0 100644 --- a/Makefile +++ b/Makefile @@ -65,7 +65,7 @@ zlibwrapper: lib @@ -71,32 +71,32 @@ index ed78d19..9aa89a6 100644 MOREFLAGS="$(MOREFLAGS)" $(MAKE) -j -C $(PRGDIR) allVariants $(MAKE) -C $(TESTDIR) $@ -- -2.19.1 +2.21.0 -From 43d9e0026339fdba22637a8507f12d3ffafd67d3 Mon Sep 17 00:00:00 2001 +From 95daf183bd126fc0b1c74e53d0529ba98b9e56ee Mon Sep 17 00:00:00 2001 From: fbrosson Date: Tue, 30 Oct 2018 11:07:16 +0000 Subject: Drop gcc options unknown to gcc2 in tests/Makefile. diff --git a/tests/Makefile b/tests/Makefile -index 25bd5c8..d08c48a 100644 +index bd2f909..e1d14da 100644 --- a/tests/Makefile +++ b/tests/Makefile -@@ -31,10 +31,9 @@ ifeq ($(OS),Windows_NT) # MinGW assumed +@@ -31,10 +31,10 @@ ifeq ($(OS),Windows_NT) # MinGW assumed CPPFLAGS += -D__USE_MINGW_ANSI_STDIO # compatibility with %zu formatting endif CFLAGS ?= -O3 -CFLAGS += -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow \ -- -Wstrict-aliasing=1 -Wswitch-enum -Wdeclaration-after-statement \ +CFLAGS += -Wall -Wcast-qual -Wcast-align -Wshadow \ - -Wstrict-prototypes -Wundef -Wformat-security \ + -Wstrict-aliasing=1 -Wswitch-enum -Wdeclaration-after-statement \ + -Wstrict-prototypes -Wundef \ - -Wvla -Wformat=2 -Winit-self -Wfloat-equal -Wwrite-strings \ -+ -Wformat=2 -Wwrite-strings \ ++ -Wvla -Wformat=2 -Wwrite-strings \ -Wredundant-decls -Wmissing-prototypes CFLAGS += $(DEBUGFLAGS) $(MOREFLAGS) FLAGS = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -- -2.19.1 +2.21.0 diff --git a/app-arch/zstd/patches/zstd-1.3.8.patchset b/app-arch/zstd/patches/zstd-1.4.1.patchset similarity index 100% rename from app-arch/zstd/patches/zstd-1.3.8.patchset rename to app-arch/zstd/patches/zstd-1.4.1.patchset diff --git a/app-arch/zstd/zstd-1.3.8.recipe b/app-arch/zstd/zstd-1.4.1.recipe similarity index 97% rename from app-arch/zstd/zstd-1.3.8.recipe rename to app-arch/zstd/zstd-1.4.1.recipe index ecf7570ea..9ab2ebdc0 100644 --- a/app-arch/zstd/zstd-1.3.8.recipe +++ b/app-arch/zstd/zstd-1.4.1.recipe @@ -14,7 +14,7 @@ LICENSE="BSD (2-clause) REVISION="1" SOURCE_URI="https://github.com/facebook/zstd/archive/v$portVersion.tar.gz" SOURCE_FILENAME="zstd-$portVersion.tar.gz" -CHECKSUM_SHA256="90d902a1282cc4e197a8023b6d6e8d331c1fd1dfe60f7f8e4ee9da40da886dc3" +CHECKSUM_SHA256="f91ea3397e6cc65d398e1bc0713cf2f0b0de2fb85ea9dabb1eb3e8f1b22f8d6f" PATCHES="zstd-$portVersion.patchset" if [ "$effectiveTargetArchitecture" = x86_gcc2 ]; then PATCHES="$PATCHES