From 0720e1da14c23f9a6635aceaaae1fa1615b27c3b Mon Sep 17 00:00:00 2001 From: Brett Koonce Date: Sat, 12 Oct 2013 04:53:22 -0500 Subject: [PATCH] trafficserver 4.0.1 Closes Homebrew/homebrew#23220. Signed-off-by: Adam Vandenberg --- Formula/trafficserver.rb | 124 +++++++++++++++++++++++++++++++++++---- 1 file changed, 113 insertions(+), 11 deletions(-) diff --git a/Formula/trafficserver.rb b/Formula/trafficserver.rb index 354644b1da0..17094e8748e 100644 --- a/Formula/trafficserver.rb +++ b/Formula/trafficserver.rb @@ -2,21 +2,15 @@ require 'formula' class Trafficserver < Formula homepage 'http://trafficserver.apache.org/' - url 'http://www.apache.org/dyn/closer.cgi?path=trafficserver/trafficserver-3.2.0.tar.bz2' - sha1 '0d7461f0711387b1049e50522e61281be6f5cf38' - - head do - url 'http://svn.apache.org/repos/asf/trafficserver/traffic/trunk/' - - depends_on :automake - depends_on :libtool - end + url 'http://www.apache.org/dyn/closer.cgi?path=trafficserver/trafficserver-4.0.1.tar.bz2' + sha1 '0f924d830541f0d31c89be12054a1b983d07435f' depends_on 'pcre' - def install - system "autoreconf -i" if build.head? + #remove some amd64 compiler options that fail on Snow Leopard + def patches; DATA; end if MacOS.version == :snow_leopard + def install # Needed for correct ./configure detections. ENV.enable_warnings # Needed for OpenSSL headers on Lion. @@ -32,3 +26,111 @@ class Trafficserver < Formula system "#{bin}/trafficserver", "status" end end + +__END__ +diff --git a/configure b/configure +index 49add2a..e478b34 100755 +--- a/configure ++++ b/configure +@@ -24109,48 +24109,6 @@ $as_echo "yes" >&6; } + + else + +- +- if test "x$CXXFLAGS" = "x"; then +- test "x$verbose" = "xyes" && echo " setting CXXFLAGS to \"-mcx16\"" +- CXXFLAGS="-mcx16" +- else +- ats_addto_bugger="-mcx16" +- for i in $ats_addto_bugger; do +- ats_addto_duplicate="0" +- for j in $CXXFLAGS; do +- if test "x$i" = "x$j"; then +- ats_addto_duplicate="1" +- break +- fi +- done +- if test $ats_addto_duplicate = "0"; then +- test "x$verbose" = "xyes" && echo " adding \"$i\" to CXXFLAGS" +- CXXFLAGS="$CXXFLAGS $i" +- fi +- done +- fi +- +- +- if test "x$CFLAGS" = "x"; then +- test "x$verbose" = "xyes" && echo " setting CFLAGS to \"-mcx16\"" +- CFLAGS="-mcx16" +- else +- ats_addto_bugger="-mcx16" +- for i in $ats_addto_bugger; do +- ats_addto_duplicate="0" +- for j in $CFLAGS; do +- if test "x$i" = "x$j"; then +- ats_addto_duplicate="1" +- break +- fi +- done +- if test $ats_addto_duplicate = "0"; then +- test "x$verbose" = "xyes" && echo " adding \"$i\" to CFLAGS" +- CFLAGS="$CFLAGS $i" +- fi +- done +- fi +- + ats_save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $CFLAGS_WARN" + if test "$ac_cv_c_compiler_gnu" = "yes"; then +@@ -24204,52 +24162,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +-if test "x$has_128bit_cas" = "x1"; then : +- +- +- if test "x$CFLAGS" = "x"; then +- test "x$verbose" = "xyes" && echo " setting CFLAGS to \"-mcx16\"" +- CFLAGS="-mcx16" +- else +- ats_addto_bugger="-mcx16" +- for i in $ats_addto_bugger; do +- ats_addto_duplicate="0" +- for j in $CFLAGS; do +- if test "x$i" = "x$j"; then +- ats_addto_duplicate="1" +- break +- fi +- done +- if test $ats_addto_duplicate = "0"; then +- test "x$verbose" = "xyes" && echo " adding \"$i\" to CFLAGS" +- CFLAGS="$CFLAGS $i" +- fi +- done +- fi +- +- +- if test "x$CXXFLAGS" = "x"; then +- test "x$verbose" = "xyes" && echo " setting CXXFLAGS to \"-mcx16\"" +- CXXFLAGS="-mcx16" +- else +- ats_addto_bugger="-mcx16" +- for i in $ats_addto_bugger; do +- ats_addto_duplicate="0" +- for j in $CXXFLAGS; do +- if test "x$i" = "x$j"; then +- ats_addto_duplicate="1" +- break +- fi +- done +- if test $ats_addto_duplicate = "0"; then +- test "x$verbose" = "xyes" && echo " adding \"$i\" to CXXFLAGS" +- CXXFLAGS="$CXXFLAGS $i" +- fi +- done +- fi +- +- +-fi + + # Check for POSIX capabilities library. + # If we don't find it, disable checking for header.