From 7df55e17e976105436af7233ce72064d190cbd27 Mon Sep 17 00:00:00 2001
From: Nick Terrell <terrelln@fb.com>
Date: Thu, 1 Sep 2016 18:26:19 -0700
Subject: [PATCH 1/6] Fix up Makefiles, and fix include issues compiling with
 gcc

---
 contrib/pzstd/Makefile            | 10 ++++------
 contrib/pzstd/Options.cpp         |  1 +
 contrib/pzstd/test/Makefile       |  8 ++++----
 contrib/pzstd/utils/Range.h       |  1 +
 contrib/pzstd/utils/test/Makefile |  6 +++---
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/contrib/pzstd/Makefile b/contrib/pzstd/Makefile
index ba86f5d4d..2ef10b6ef 100644
--- a/contrib/pzstd/Makefile
+++ b/contrib/pzstd/Makefile
@@ -11,12 +11,10 @@ ZSTDDIR = ../../lib
 PROGDIR = ../../programs
 
 CPPFLAGS = -I$(ZSTDDIR) -I$(ZSTDDIR)/common -I$(ZSTDDIR)/dictBuilder -I$(PROGDIR) -I.
-CFLAGS  ?= -O3
-CFLAGS  += -Wall -Wextra -Wcast-qual -Wcast-align -Wstrict-aliasing=1 \
-           -Wswitch-enum -Wdeclaration-after-statement -Wstrict-prototypes -Wundef \
-		 			-std=c++11
-CFLAGS  += $(MOREFLAGS)
-FLAGS    = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
+CXXFLAGS  ?= -O3
+CXXFLAGS  += -std=c++11
+CXXFLAGS  += $(MOREFLAGS)
+FLAGS    = $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)
 
 
 ZSTDCOMMON_FILES := $(ZSTDDIR)/common/*.c
diff --git a/contrib/pzstd/Options.cpp b/contrib/pzstd/Options.cpp
index dc6aeef14..693e9a515 100644
--- a/contrib/pzstd/Options.cpp
+++ b/contrib/pzstd/Options.cpp
@@ -9,6 +9,7 @@
 #include "Options.h"
 
 #include <cstdio>
+#include <cstring>
 
 namespace pzstd {
 
diff --git a/contrib/pzstd/test/Makefile b/contrib/pzstd/test/Makefile
index 147d9bd79..5f0e144e9 100644
--- a/contrib/pzstd/test/Makefile
+++ b/contrib/pzstd/test/Makefile
@@ -24,10 +24,10 @@ GTEST_LIB ?= -L $(PZSTDDIR)/googletest/build/googlemock/gtest
 
 CPPFLAGS = -I$(PZSTDDIR) $(GTEST_INC) $(GTEST_LIB) -I$(ZSTDDIR)/common -I$(PROGDIR)
 
-CFLAGS  ?= -O3
-CFLAGS  += -std=c++11
-CFLAGS  += $(MOREFLAGS)
-FLAGS    = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
+CXXFLAGS  ?= -O3
+CXXFLAGS  += -std=c++11
+CXXFLAGS  += $(MOREFLAGS)
+FLAGS    = $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)
 
 datagen.o: $(PROGDIR)/datagen.*
 	$(CXX) $(FLAGS) $(PROGDIR)/datagen.c -c -o $@
diff --git a/contrib/pzstd/utils/Range.h b/contrib/pzstd/utils/Range.h
index 3df15976d..111e98f58 100644
--- a/contrib/pzstd/utils/Range.h
+++ b/contrib/pzstd/utils/Range.h
@@ -16,6 +16,7 @@
 #include "utils/Likely.h"
 
 #include <cstddef>
+#include <cstring>
 #include <stdexcept>
 #include <string>
 #include <type_traits>
diff --git a/contrib/pzstd/utils/test/Makefile b/contrib/pzstd/utils/test/Makefile
index 6f801c309..16b89804b 100644
--- a/contrib/pzstd/utils/test/Makefile
+++ b/contrib/pzstd/utils/test/Makefile
@@ -21,10 +21,10 @@ GTEST_INC ?= -isystem $(PZSTDDIR)/googletest/googletest/include
 GTEST_LIB ?= -L $(PZSTDDIR)/googletest/build/googlemock/gtest
 
 CPPFLAGS = -I$(PZSTDDIR) $(GTEST_INC) $(GTEST_LIB)
-CFLAGS  ?= -O3
-CFLAGS  += -std=c++11
+CXXFLAGS  ?= -O3
+CXXFLAGS  += -std=c++11
 CFLAGS  += $(MOREFLAGS)
-FLAGS    = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
+FLAGS    = $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)
 
 %: %.cpp
 	$(CXX) $(FLAGS) -lgtest -lgtest_main $^ -o $@$(EXT)

From 4738e221ca4fda20e61f0ff5d7edea021888a652 Mon Sep 17 00:00:00 2001
From: Nick Terrell <terrelln@fb.com>
Date: Thu, 1 Sep 2016 19:46:08 -0700
Subject: [PATCH 2/6] Update travis-ci g++ for pzstds job

---
 .travis.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index dc9d2fdee..c84edcd4b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,15 @@ matrix:
       env: PLATFORM="Ubuntu 12.04 container" CMD="make test && make clean && make travis-install"
     - os: linux
       sudo: false
+      install:
+        - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - gcc-4.8
+            - g++-4.8
       env: PLATFORM="Ubuntu 12.04 container" CMD="make -C tests test-zstd_nolegacy && make clean && make zlibwrapper && make clean && make cmaketest && make -C contrib/pzstd googletest && make -C contrib/pzstd test && make -C contrib/pzstd clean"
     - os: linux
       sudo: false

From 779c489a9c965275d707586654b8e543e3f2777e Mon Sep 17 00:00:00 2001
From: Nick Terrell <terrelln@fb.com>
Date: Thu, 1 Sep 2016 20:01:07 -0700
Subject: [PATCH 3/6] Remove if statement, make language cpp

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c84edcd4b..3b77dd94a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,8 +9,9 @@ matrix:
       env: PLATFORM="Ubuntu 12.04 container" CMD="make test && make clean && make travis-install"
     - os: linux
       sudo: false
+      language: cpp
       install:
-        - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
+        - export CXX="g++-4.8" CC="gcc-4.8"
       addons:
         apt:
           sources:

From 724e3d534f2561fe4d1a040b7a38ab0ee7761edf Mon Sep 17 00:00:00 2001
From: Nick Terrell <terrelln@fb.com>
Date: Thu, 1 Sep 2016 20:45:55 -0700
Subject: [PATCH 4/6] Put linker -l commands at the end

---
 contrib/pzstd/test/Makefile       | 2 +-
 contrib/pzstd/utils/test/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/pzstd/test/Makefile b/contrib/pzstd/test/Makefile
index 5f0e144e9..b7077e2fd 100644
--- a/contrib/pzstd/test/Makefile
+++ b/contrib/pzstd/test/Makefile
@@ -33,7 +33,7 @@ datagen.o: $(PROGDIR)/datagen.*
 	$(CXX) $(FLAGS) $(PROGDIR)/datagen.c -c -o $@
 
 %: %.cpp *.h datagen.o
-	$(CXX) $(FLAGS) -lgtest -lgtest_main $@.cpp datagen.o $(PZSTDDIR)/libzstd.a $(PZSTDDIR)/Pzstd.o $(PZSTDDIR)/SkippableFrame.o $(PZSTDDIR)/Options.o -o $@$(EXT)
+	$(CXX) $(FLAGS) $@.cpp datagen.o $(PZSTDDIR)/libzstd.a $(PZSTDDIR)/Pzstd.o $(PZSTDDIR)/SkippableFrame.o $(PZSTDDIR)/Options.o -o $@$(EXT) -lgtest -lgtest_main -lpthread
 
 .PHONY: test clean
 
diff --git a/contrib/pzstd/utils/test/Makefile b/contrib/pzstd/utils/test/Makefile
index 16b89804b..23f111e55 100644
--- a/contrib/pzstd/utils/test/Makefile
+++ b/contrib/pzstd/utils/test/Makefile
@@ -27,7 +27,7 @@ CFLAGS  += $(MOREFLAGS)
 FLAGS    = $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)
 
 %: %.cpp
-	$(CXX) $(FLAGS) -lgtest -lgtest_main $^ -o $@$(EXT)
+	$(CXX) $(FLAGS) $^ -o $@$(EXT) -lgtest -lgtest_main -lpthread
 
 .PHONY: test clean
 

From 7bf8c4d7ff4980c637c4c97041fa4e077d3143e5 Mon Sep 17 00:00:00 2001
From: Nick Terrell <terrelln@fb.com>
Date: Thu, 1 Sep 2016 20:53:34 -0700
Subject: [PATCH 5/6] Add zstd/lib in includes

---
 contrib/pzstd/test/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/pzstd/test/Makefile b/contrib/pzstd/test/Makefile
index b7077e2fd..730938041 100644
--- a/contrib/pzstd/test/Makefile
+++ b/contrib/pzstd/test/Makefile
@@ -22,7 +22,7 @@ ZSTDDIR = ../../../lib
 GTEST_INC ?= -isystem $(PZSTDDIR)/googletest/googletest/include
 GTEST_LIB ?= -L $(PZSTDDIR)/googletest/build/googlemock/gtest
 
-CPPFLAGS = -I$(PZSTDDIR) $(GTEST_INC) $(GTEST_LIB) -I$(ZSTDDIR)/common -I$(PROGDIR)
+CPPFLAGS = -I$(PZSTDDIR) $(GTEST_INC) $(GTEST_LIB) -I$(ZSTDDIR) -I$(ZSTDDIR)/common -I$(PROGDIR) -I.
 
 CXXFLAGS  ?= -O3
 CXXFLAGS  += -std=c++11

From 2ebe1cf7329107949f3a5b17a9e53f32accf13c1 Mon Sep 17 00:00:00 2001
From: Nick Terrell <terrelln@fb.com>
Date: Thu, 1 Sep 2016 21:12:39 -0700
Subject: [PATCH 6/6] Put libzstd last

---
 contrib/pzstd/Makefile      | 2 +-
 contrib/pzstd/test/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/pzstd/Makefile b/contrib/pzstd/Makefile
index 2ef10b6ef..6f9231b2a 100644
--- a/contrib/pzstd/Makefile
+++ b/contrib/pzstd/Makefile
@@ -54,7 +54,7 @@ Options.o: Options.h Options.cpp
 main.o: main.cpp *.h utils/*.h
 	$(CXX) $(FLAGS) -c main.cpp -o $@
 
-pzstd: libzstd.a Pzstd.o SkippableFrame.o Options.o main.o
+pzstd: Pzstd.o SkippableFrame.o Options.o main.o libzstd.a 
 	$(CXX) $(FLAGS) $^ -o $@$(EXT)
 
 googletest:
diff --git a/contrib/pzstd/test/Makefile b/contrib/pzstd/test/Makefile
index 730938041..5fd167d18 100644
--- a/contrib/pzstd/test/Makefile
+++ b/contrib/pzstd/test/Makefile
@@ -33,7 +33,7 @@ datagen.o: $(PROGDIR)/datagen.*
 	$(CXX) $(FLAGS) $(PROGDIR)/datagen.c -c -o $@
 
 %: %.cpp *.h datagen.o
-	$(CXX) $(FLAGS) $@.cpp datagen.o $(PZSTDDIR)/libzstd.a $(PZSTDDIR)/Pzstd.o $(PZSTDDIR)/SkippableFrame.o $(PZSTDDIR)/Options.o -o $@$(EXT) -lgtest -lgtest_main -lpthread
+	$(CXX) $(FLAGS) $@.cpp datagen.o $(PZSTDDIR)/Pzstd.o $(PZSTDDIR)/SkippableFrame.o $(PZSTDDIR)/Options.o $(PZSTDDIR)/libzstd.a -o $@$(EXT) -lgtest -lgtest_main -lpthread
 
 .PHONY: test clean