diff -rupN zstd-1.3.4.orig/contrib/pzstd/Makefile zstd-1.3.4/contrib/pzstd/Makefile --- zstd-1.3.4.orig/contrib/pzstd/Makefile 2018-03-27 00:19:34.000000000 +0200 +++ zstd-1.3.4/contrib/pzstd/Makefile 2018-06-14 13:46:16.485820353 +0200 @@ -32,7 +32,7 @@ LDFLAGS ?= # Include flags PZSTD_INC = -I$(ZSTDDIR) -I$(ZSTDDIR)/common -I$(PROGDIR) -I. -GTEST_INC = -isystem googletest/googletest/include +GTEST_INC = PZSTD_CPPFLAGS = $(PZSTD_INC) PZSTD_CCXXFLAGS = @@ -46,7 +46,7 @@ ALL_LDFLAGS = $(EXTRA_FLAGS) $(LDFLA # gtest libraries need to go before "-lpthread" because they depend on it. -GTEST_LIB = -L googletest/build/googlemock/gtest +GTEST_LIB = LIBS = # Compilation commands @@ -212,10 +212,7 @@ GTEST_CMAKEFLAGS = .PHONY: googletest googletest: PZSTD_CCXXFLAGS += -fPIC googletest: - @$(RM) -rf googletest - @git clone https://github.com/google/googletest - @mkdir -p googletest/build - @cd googletest/build && cmake $(GTEST_CMAKEFLAGS) -DCMAKE_CXX_FLAGS="$(ALL_CXXFLAGS)" .. && $(MAKE) + true .PHONY: googletest32 googletest32: PZSTD_CCXXFLAGS += -m32