From 33a6fc6f4cd66c4568f3ad9a0f65d5123fb539ca Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Fri, 5 Jun 2020 14:07:20 +1000
Subject: [PATCH] *zmq: remove stack protector workarounds

---
 src/cppzmq.mk | 1 -
 src/libzmq.mk | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/cppzmq.mk b/src/cppzmq.mk
index fff5fbf1..a31f2d03 100644
--- a/src/cppzmq.mk
+++ b/src/cppzmq.mk
@@ -18,7 +18,6 @@ define $(PKG)_BUILD
     cd '$(BUILD_DIR).test-cmake' && '$(TARGET)-cmake' \
         -DPKG=$(PKG) \
         -DPKG_VERSION=$($(PKG)_VERSION) \
-        -DCMAKE_CXX_FLAGS='-fstack-protector' \
         '$(PWD)/src/cmake/test'
     $(MAKE) -C '$(BUILD_DIR).test-cmake' -j 1 install
 endef
diff --git a/src/libzmq.mk b/src/libzmq.mk
index d04d948e..724e8274 100644
--- a/src/libzmq.mk
+++ b/src/libzmq.mk
@@ -13,7 +13,7 @@ define $(PKG)_BUILD
     # build and install the library
     cd '$(BUILD_DIR)' && $(TARGET)-cmake '$(SOURCE_DIR)' \
         -DBUILD_TESTS=OFF \
-        -DCMAKE_CXX_FLAGS='-D_WIN32_WINNT=0x0600 -fstack-protector' \
+        -DCMAKE_CXX_FLAGS='-D_WIN32_WINNT=0x0600' \
         -DWITH_DOC=OFF \
         -DWITH_LIBSODIUM=ON \
         -DWITH_PERF_TOOL=OFF
@@ -28,7 +28,7 @@ define $(PKG)_BUILD
      echo 'Requires: libsodium'; \
      echo 'Libs: -lzmq'; \
      echo 'Libs.private: -lws2_32 -lrpcrt4 -liphlpapi'; \
-     echo 'Cflags.private: -DZMQ_STATIC -fstack-protector';) \
+     echo 'Cflags.private: -DZMQ_STATIC';) \
      > '$(PREFIX)/$(TARGET)/lib/pkgconfig/$(PKG).pc'
 
     # test pkg-config
@@ -42,7 +42,6 @@ define $(PKG)_BUILD
     cd '$(BUILD_DIR).test-cmake' && '$(TARGET)-cmake' \
         -DPKG=$(PKG) \
         -DPKG_VERSION=$($(PKG)_VERSION) \
-        -DCMAKE_CXX_FLAGS='-fstack-protector' \
         '$(PWD)/src/cmake/test'
     $(MAKE) -C '$(BUILD_DIR).test-cmake' -j 1 install
 endef