aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorJack Nagel2014-04-02 19:19:39 -0500
committerJack Nagel2014-04-02 19:19:39 -0500
commita1c106ad2ef7ee86c833e62ea54a5d1aeaae0aa4 (patch)
tree64ff271dcec02a45cdde63d3dde266bf9a772474 /Library
parent6a544280109fd04dd475c7ed94cf08841528ebe9 (diff)
downloadhomebrew-a1c106ad2ef7ee86c833e62ea54a5d1aeaae0aa4.tar.bz2
libunistring: remove questionable patch
Diffstat (limited to 'Library')
-rw-r--r--Library/Formula/libunistring.rb29
1 files changed, 3 insertions, 26 deletions
diff --git a/Library/Formula/libunistring.rb b/Library/Formula/libunistring.rb
index 938c85100..76c5fa091 100644
--- a/Library/Formula/libunistring.rb
+++ b/Library/Formula/libunistring.rb
@@ -6,35 +6,12 @@ class Libunistring < Formula
mirror 'http://ftp.gnu.org/gnu/libunistring/libunistring-0.9.3.tar.gz'
sha1 'e1ea13c24a30bc93932d19eb5ad0704a618506dd'
- # Submitted upstream: https://savannah.gnu.org/bugs/?37751
- # I am not 100% sure if this is the right patch because libunistring
- # provides its own stdint.h (and stdint.mini.h) which wraps the system's
- # version of these files (in a complicated manner). This is fragile.
- patch :DATA unless MacOS::CLT.installed?
-
def install
system "./configure", "--disable-dependency-tracking",
+ "--disable-silent-rules",
"--prefix=#{prefix}"
system "make"
- # system "make check" # Maintainers, you might want to do the check
- system "make install"
+ system "make", "check"
+ system "make", "install"
end
end
-
-__END__
-diff --git a/lib/stdint.mini.h b/lib/stdint.mini.h
-index d6f2cb0..3c0acc8 100644
---- a/lib/stdint.mini.h
-+++ b/lib/stdint.mini.h
-@@ -118,11 +118,6 @@ typedef unsigned int unistring_uint32_t;
- #define int32_t unistring_int32_t
- #define uint32_t unistring_uint32_t
-
--/* Avoid collision with Solaris 2.5.1 <pthread.h> etc. */
--#define _UINT8_T
--#define _UINT32_T
--#define _UINT64_T
--
-
- #endif /* _UNISTRING_STDINT_H */
- #endif /* !defined _UNISTRING_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */