diff options
| author | Jack Nagel | 2011-09-28 21:37:56 -0500 |
|---|---|---|
| committer | Jack Nagel | 2011-09-28 21:40:01 -0500 |
| commit | 1ecb1311d5d5cd7abd0a821ffe276ed2c4f05602 (patch) | |
| tree | dd6ef5b67f2cd7321ee50634d68f6b542dd70ea5 /Library/Formula | |
| parent | e6e3f01f8344ebed229ce3cc9c510b4798bae7cc (diff) | |
| download | homebrew-1ecb1311d5d5cd7abd0a821ffe276ed2c4f05602.tar.bz2 | |
gengetopt 2.22.5
This versions resolves the permissions issue in ./build-aux/, but
introduces an (apparently OS X-specific) bug involving the order of
include directives and struct definitions, which I've corrected with a
patch. An upstream issue has been filed.
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/gengetopt.rb | 63 |
1 files changed, 57 insertions, 6 deletions
diff --git a/Library/Formula/gengetopt.rb b/Library/Formula/gengetopt.rb index 0ee190f09..fa842ce53 100644 --- a/Library/Formula/gengetopt.rb +++ b/Library/Formula/gengetopt.rb @@ -1,18 +1,69 @@ require 'formula' class Gengetopt < Formula - url 'http://ftpmirror.gnu.org/gengetopt/gengetopt-2.22.4.tar.gz' + url 'http://ftpmirror.gnu.org/gengetopt/gengetopt-2.22.5.tar.gz' homepage 'http://www.gnu.org/software/gengetopt/' - md5 'e69d1b051784eb3a1c9fae36cb8b25ea' + md5 'a2168a480e49456451af83aa4618a529' + + def patches + # patches to fix conflicting struct definitions + # upstream issue: http://savannah.gnu.org/bugs/index.php?34430 + DATA + end def install system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}", "--mandir=#{man}" - system "make" - # Bug in gengetopt's build system; permissions not set on some - # scripts required for installation - chmod_R 0755, 'build-aux/' + + ENV.deparallelize system "make install" end end + +__END__ +diff --git a/doc/main1.cc b/doc/main1.cc +index e6e727e..838d2ae 100644 +--- a/doc/main1.cc ++++ b/doc/main1.cc +@@ -2,6 +2,10 @@ + /* we try to use gengetopt generated file in a C++ program */ + /* we don't use autoconf and automake vars */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <iostream> + #include "stdlib.h" + +diff --git a/src/acceptedvalues.cpp b/src/acceptedvalues.cpp +index 792908b..1ecb10f 100644 +--- a/src/acceptedvalues.cpp ++++ b/src/acceptedvalues.cpp +@@ -10,6 +10,10 @@ + // + // + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sstream> + + #include "acceptedvalues.h" +diff --git a/src/fileutils.cpp b/src/fileutils.cpp +index d97782c..33eecde 100644 +--- a/src/fileutils.cpp ++++ b/src/fileutils.cpp +@@ -10,6 +10,10 @@ + // + // + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <cstdio> + #include <cstdlib> + #include <cstring> |