From: Yann Collet <cyan@fb.com>
Date: Tue, 27 Oct 2020 22:45:30 +0000 (-0700)
Subject: Merge branch 'dev' into libzstd_autoconf_full
X-Git-Tag: v1.4.7~41^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ceccd7ae2d1bcec061ad0bfbdb437c6b0bb1d55f;p=thirdparty%2Fzstd.git

Merge branch 'dev' into libzstd_autoconf_full
---

ceccd7ae2d1bcec061ad0bfbdb437c6b0bb1d55f
diff --cc lib/Makefile
index a549b82bd,b66f81608..b6d6e25b9
--- a/lib/Makefile
+++ b/lib/Makefile
@@@ -189,15 -183,22 +189,15 @@@ else ifeq ($(UNAME), OpenBSD
  endif
  HASH ?= md5sum
  
- HASH_DIR = conf_$(shell echo $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(ZSTD_FILES) | $(HASH) | head -c 16)
 -HAVE_HASH := $(shell echo 1 | $(HASH) > /dev/null && echo 1 || echo 0)
 -ifeq ($(HAVE_HASH), 1)
 -  HASH_VALUE := $(shell echo $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(ZSTD_FILES) | $(HASH) | dd bs=1 count=16 status=none)
 -  HASH_DIR := conf_$(HASH_VALUE)
 -else
 -  $(info warning : could not find hash function to differentiate builds with different flags)
 -  HASH_DIR := 0
++HASH_DIR = conf_$(shell echo $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(ZSTD_FILES) | $(HASH) | cut -f 1 -d " " )
 +HAVE_HASH :=$(shell echo 1 | $(HASH) > /dev/null && echo 1 || echo 0)
 +ifeq ($(HAVE_HASH),0)
 +  $(info warning : could not find HASH ($(HASH)), needed to differentiate builds using different flags)
 +  BUILD_DIR := obj/generic_noconf
  endif
 +endif # $(BUILD_DIR) == 0
  
  
 -BUILD_DIR ?= obj/$(HASH_DIR)
 -ZSTD_DYNLIB_DIR := $(BUILD_DIR)/dynlib
 -ZSTD_DYNLIB_OBJ := $(addprefix $(ZSTD_DYNLIB_DIR)/, $(ZSTD_LOCAL_OBJ))
 -ZSTD_STATLIB_DIR := $(BUILD_DIR)/statlib
 -ZSTD_STATLIB_OBJ := $(addprefix $(ZSTD_STATLIB_DIR)/, $(ZSTD_LOCAL_OBJ))
 -
  # macOS linker doesn't support -soname, and use different extension
  # see : https://developer.apple.com/library/mac/documentation/DeveloperTools/Conceptual/DynamicLibraries/100-Articles/DynamicLibraryDesignGuidelines.html
  ifeq ($(UNAME), Darwin)
diff --cc programs/Makefile
index e9ba02cd5,8f27f1539..b412e986e
--- a/programs/Makefile
+++ b/programs/Makefile
@@@ -110,13 -105,17 +110,13 @@@ else ifeq ($(UNAME), OpenBSD
  endif
  HASH ?= md5sum
  
- HASH_DIR = conf_$(shell echo $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(ZSTD_FILES) | $(HASH) | head -c 16)
 -HAVE_HASH := $(shell echo 1 | $(HASH) > /dev/null && echo 1 || echo 0)
 -ifeq ($(HAVE_HASH), 1)
 -  HASH_VALUE := $(shell echo $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) | $(HASH) | dd bs=1 count=16 status=none)
 -  HASH_DIR := conf_$(HASH_VALUE)
 -else
 -  $(info warning : could not find hash function to differentiate builds with different flags)
 -  HASH_DIR := 0
++HASH_DIR = conf_$(shell echo $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(ZSTD_FILES) | $(HASH) | cut -f 1 -d " ")
 +HAVE_HASH :=$(shell echo 1 | $(HASH) > /dev/null && echo 1 || echo 0)
 +ifeq ($(HAVE_HASH),0)
 +  $(info warning : could not find HASH ($(HASH)), needed to differentiate builds using different flags)
 +  BUILD_DIR := obj/generic_noconf
  endif
 -
 -BUILD_DIR ?= obj/$(HASH_DIR)
 -ZSTD_OBJ := $(addprefix $(BUILD_DIR)/, $(ZSTD_ALL_OBJ))
 +endif # $(BUILD_DIR) == 0
  
  # Define *.exe as extension for Windows systems
  ifneq (,$(filter Windows%,$(OS)))