From eb6f847f6eda3f0f2b90732770b69cc894a457e6 Mon Sep 17 00:00:00 2001 From: Brad Murray Date: Fri, 10 May 2013 18:09:57 -0700 Subject: openocd 0.7.0 Also get rid of the patch that no longer applies cleanly. It used to do two things. 1) Remove the -gstabs compiler argument because it wasn't supported on clang. This has been changed upstream to first check whether the argument is supported or not. 2) Remove the ccache wrapper. There's an environment variable to control this behaviour, so use this instead of patching. Closes #19727. Signed-off-by: Adam Vandenberg --- Library/Formula/open-ocd.rb | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'Library') diff --git a/Library/Formula/open-ocd.rb b/Library/Formula/open-ocd.rb index 494e0fa12..4ba68b4e7 100644 --- a/Library/Formula/open-ocd.rb +++ b/Library/Formula/open-ocd.rb @@ -2,8 +2,8 @@ require 'formula' class OpenOcd < Formula homepage 'http://sourceforge.net/projects/openocd/' - url 'http://downloads.sourceforge.net/project/openocd/openocd/0.6.1/openocd-0.6.1.tar.bz2' - sha1 'b286dd9c0c6ca5cc7a76d25e404ad99a488e2c61' + url 'http://downloads.sourceforge.net/project/openocd/openocd/0.7.0/openocd-0.7.0.tar.bz2' + sha1 '40fa518af4fae273f24478249fc03aa6fcce9176' option 'enable-ft2232_libftdi', 'Enable building support for FT2232 based devices with libftdi driver' option 'enable-ft2232_ftd2xx', 'Enable building support for FT2232 based devices with FTD2XX driver' @@ -11,13 +11,6 @@ class OpenOcd < Formula depends_on 'libusb-compat' depends_on 'libftdi' if build.include? 'enable-ft2232_libftdi' - # Per MacPorts, remove -gstabs, which is not supported by clang. - def patches - {:p0 => [ - "https://trac.macports.org/export/105669/trunk/dports/cross/openocd/files/patch-jimctl-configure.diff" - ]} - end - def install # default options that don't imply additional dependencies args = %W[ @@ -48,6 +41,8 @@ class OpenOcd < Formula args << "--enable-presto_ftd2xx" end + ENV['CCACHE'] = 'none' + system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}", *args -- cgit v1.2.3