From 8fcfdeef149c8c93eb1e55eac012f650becc124b Mon Sep 17 00:00:00 2001
From: Charlie Sharpsteen
Date: Wed, 23 May 2012 17:21:56 -0700
Subject: ncview: Patch rpath settings out of configure

The configure script tries to be clever with figuring out rpath flags for the
compilers. It fails epically.

Also, use `ENV.x11` which removes the need for a couple of configure arguments
and allows libpng to be found.
---
 Library/Formula/ncview.rb | 49 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 47 insertions(+), 2 deletions(-)

(limited to 'Library/Formula')

diff --git a/Library/Formula/ncview.rb b/Library/Formula/ncview.rb
index fb2425f01..1e4dd9af9 100644
--- a/Library/Formula/ncview.rb
+++ b/Library/Formula/ncview.rb
@@ -7,10 +7,55 @@ class Ncview < Formula
 
   depends_on "netcdf"
 
+  # Disable a block in configure that tries to pass an RPATH to the compiler.
+  # The code guesses wrong which causes the linking step to fail.
+  def patches
+    DATA
+  end
+
   def install
+    ENV.x11 # For GUI and libpng.
+
     system "./configure", "--prefix=#{prefix}",
-                          "--x-libraries=/usr/X11/lib",
-                          "--x-includes=/usr/X11/include"
+                          "--disable-dependency-tracking"
     system "make install"
   end
 end
+
+__END__
+Don't try to mess with the compiler rpath. Just not a good idea.
+
+diff --git a/configure b/configure
+index b80ae96..a650f6f 100755
+--- a/configure
++++ b/configure
+@@ -8672,29 +8672,6 @@ if test x$CC_TEST_SAME != x$NETCDF_CC_TEST_SAME; then
+ 	exit -1
+ fi
+ 
+-#----------------------------------------------------------------------------------
+-# Construct our RPATH flags.  Idea here is that we have LDFLAGS that might look,
+-# for example, something like this:
+-#	LIBS="-L/usr/local/lib -lnetcdf -L/home/pierce/lib -ludunits"
+-# We want to convert this to -rpath flags suitable for the compiler, which would
+-# have this format:
+-#	"-Wl,-rpath,/usr/local/lib -Wl,-rpath,/home/pierce/lib"
+-#
+-# As a safety check, I only do this for the GNU compiler, as I don't know if this
+-# is anything like correct syntax for other compilers.  Note that this *does* work
+-# for the Intel icc compiler, but also that the icc compiler sets $ac_compiler_gnu
+-# to "yes".  Go figure.
+-#----------------------------------------------------------------------------------
+-if test x$ac_compiler_gnu = xyes; then
+-	RPATH_FLAGS=""
+-	for word in $UDUNITS2_LDFLAGS $NETCDF_LDFLAGS; do
+-		if test `expr $word : -L/` -eq 3; then
+-			RPDIR=`expr substr $word 3 999`;
+-			RPATH_FLAGS="$RPATH_FLAGS -Wl,-rpath,$RPDIR"
+-		fi
+-	done
+-
+-fi
+ 
+ 
+ ac_config_files="$ac_config_files Makefile src/Makefile"
-- 
cgit v1.2.3