zeromq: Update to 3.2.2

Removed older devel version and the build_fat hack needed before 3.2

Closes #16680.

Signed-off-by: Charlie Sharpsteen <source@sharpsteen.net>

1 files changed, 5 insertions, 48 deletions

diff --git a/Library/Formula/zeromq.rb b/Library/Formula/zeromq.rb
index a69a19e37..5932bb4ab 100644
--- a/Library/Formula/zeromq.rb
+++ b/Library/Formula/zeromq.rb
@@ -1,21 +1,12 @@
 require 'formula'
 
-def pgm_flags
-  build.include? 'with-pgm' ? '--with-system-pgm' : ''
-end
-
 class Zeromq < Formula
   homepage 'http://www.zeromq.org/'
-  url 'http://download.zeromq.org/zeromq-2.2.0.tar.gz'
-  sha1 'e4bc024c33d3e62f658640625e061ce4e8bd1ff1'
+  url 'http://download.zeromq.org/zeromq-3.2.2.tar.gz'
+  sha1 '0e8734c773b6a757b474c16fc3c517993ba47283'
 
   head 'https://github.com/zeromq/libzmq.git'
 
-  devel do
-    url 'http://download.zeromq.org/zeromq-3.2.1-rc2.tar.gz'
-    sha1 '71695b3de27ebf340452b7178c3ff8941c8354b8'
-  end
-
   depends_on 'pkg-config' => :build
   depends_on 'libpgm' if build.include? 'with-pgm'
 
@@ -24,9 +15,6 @@ class Zeromq < Formula
     depends_on :libtool
   end
 
-  # Remove along with build_fat hack at 3.2.0
-  env :std if build.universal?
-
   fails_with :llvm do
     build 2326
     cause "Segfault while linking"
@@ -35,26 +23,9 @@ class Zeromq < Formula
   option :universal
   option 'with-pgm', 'Build with PGM extension'
 
-  # This can be removed at stable >= 3.2.0 because ENV.universal_binary works.
-  def build_fat
-    # make 32-bit
-    system "CFLAGS=\"$CFLAGS -arch i386\" CXXFLAGS=\"$CXXFLAGS -arch i386\" ./configure --disable-dependency-tracking --prefix='#{prefix}' #{pgm_flags}"
-    system "make"
-    system "mv src/.libs src/libs-32"
-    system "make clean"
-
-    # make 64-bit
-    system "CFLAGS=\"$CFLAGS -arch x86_64\" CXXFLAGS=\"$CXXFLAGS -arch x86_64\" ./configure --disable-dependency-tracking --prefix='#{prefix}' #{pgm_flags}"
-    system "make"
-    system "mv src/.libs/libzmq.1.dylib src/.libs/libzmq.64.dylib"
-
-    # merge UB
-    system "lipo", "-create", "src/libs-32/libzmq.1.dylib",
-                              "src/.libs/libzmq.64.dylib",
-                   "-output", "src/.libs/libzmq.1.dylib"
-  end
+  def install
+    ENV.universal_binary if build.universal?
 
-  def do_config
     args = ["--disable-dependency-tracking", "--prefix=#{prefix}"]
     if build.include? 'with-pgm'
       # Use HB libpgm-5.2 because their internal 5.1 is b0rked.
@@ -62,23 +33,9 @@ class Zeromq < Formula
       ENV['OpenPGM_LIBS'] = %x[pkg-config --libs openpgm-5.2].chomp
       args << "--with-system-pgm"
     end
-    system "./configure", *args
-  end
 
-  def install
     system "./autogen.sh" if build.head?
-
-    if build.universal?
-      if build.devel? or build.head?
-        ENV.universal_binary
-        do_config
-      else
-        build_fat
-      end
-    else
-      do_config
-    end
-
+    system "./configure", *args
     system "make"
     system "make install"
   end