Merge pull request #1127 from chef/lcg/doing-some-debugging

remove centos5 support from libzmq
chef · Nov 21, 2019 · 06c78cc · 06c78cc
2 parents 4a53f96 + 5675cab
commit 06c78cc
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 24 deletions.
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
diff --git 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",