diff --git a/config/patches/libzmq/zeromq-4.0.5_configure-pedantic_centos_5.patch b/config/patches/libzmq/zeromq-4.0.5_configure-pedantic_centos_5.patch deleted file mode 100644 index eee52e65e..000000000 --- a/config/patches/libzmq/zeromq-4.0.5_configure-pedantic_centos_5.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/configure.ac.orig 2015-05-05 23:00:30.000000000 +0000 -+++ b/configure.ac 2015-05-05 23:01:58.000000000 +0000 -@@ -103,10 +103,10 @@ - fi - - # Set pedantic --libzmq_pedantic="yes" -+libzmq_pedantic="no" - - # By default compiling with -Werror except OSX. --libzmq_werror="yes" -+libzmq_werror="no" - - # By default use DSO visibility - libzmq_dso_visibility="yes" - diff --git a/config/software/libzmq.rb b/config/software/libzmq.rb index aeacf72ef..a7366fed2 100644 --- a/config/software/libzmq.rb +++ b/config/software/libzmq.rb @@ -82,19 +82,11 @@ # and newer versions of libzmq use this as the default. env["CPPFLAGS"] = "#{env["CPPFLAGS"]} -DFD_SETSIZE=1024" if windows? - # centos 5 has an old version of gcc (4.2.1) that has trouble with - # long long and c++ in pedantic mode - # This patch is specific to zeromq4 - if version.satisfies?(">= 4") - patch source: "zeromq-4.0.5_configure-pedantic_centos_5.patch", env: env if el? - end - # Some test files use inet_pton which is not readily available on windows. if version.satisfies?(">= 4") && version.satisfies?("< 4.1") && windows? patch source: "zeromq-4.0.11_mingw_inet_pton.patch", env: env end - command("./autogen.sh", env: env, in_msys_bash: true) config_command = [ "--with-libsodium", "--without-documentation",