diff options
| author | Brett Koonce | 2013-11-11 11:09:48 -0600 |
|---|---|---|
| committer | Adam Vandenberg | 2013-11-13 08:00:38 -0800 |
| commit | 4c889a0471c467421aac0b6eddff9155bfcf4928 (patch) | |
| tree | eac7edac2a5e9e1cff4ab627f7fd407128d78d0a /Library/Formula/dub.rb | |
| parent | ff5dd197e9f2e681330915c7cc9a541078bcb2f9 (diff) | |
| download | homebrew-4c889a0471c467421aac0b6eddff9155bfcf4928.tar.bz2 | |
dub: use upstream patch
Closes #24180.
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Diffstat (limited to 'Library/Formula/dub.rb')
| -rw-r--r-- | Library/Formula/dub.rb | 31 |
1 files changed, 7 insertions, 24 deletions
diff --git a/Library/Formula/dub.rb b/Library/Formula/dub.rb index 89146dd30..103f8d749 100644 --- a/Library/Formula/dub.rb +++ b/Library/Formula/dub.rb @@ -10,7 +10,13 @@ class Dub < Formula depends_on 'pkg-config' => :build depends_on 'dmd' => :build - def patches; DATA; end + # patch is in upstream master + def patches + [ + "https://github.com/rejectedsoftware/dub/commit/0e91afd52babf96128be43120dfd5f9a38b4d202.patch", + "https://github.com/rejectedsoftware/dub/commit/b08454b6baa5c7e9e2d5a21c943c21cb986fff23.patch", + ] + end def install system "./build.sh" @@ -21,26 +27,3 @@ class Dub < Formula system "#{bin}/dub; true" end end - -__END__ -diff --git a/build.sh b/build.sh -index dce1766..eacc765 100755 ---- a/build.sh -+++ b/build.sh -@@ -16,11 +16,11 @@ fi - LIBS=`pkg-config --libs libcurl 2>/dev/null || echo "-lcurl"` - - # fix for modern GCC versions with --as-needed by default --if [ "$DC" = "dmd" ]; then -- LIBS="-l:libphobos2.a $LIBS" --elif [ "$DC" = "ldmd2" ]; then -- LIBS="-lphobos-ldc $LIBS" --fi -+# if [ "$DC" = "dmd" ]; then -+# LIBS="-l:libphobos2.a $LIBS" -+# elif [ "$DC" = "ldmd2" ]; then -+# LIBS="-lphobos-ldc $LIBS" -+# fi - - # adjust linker flags for dmd command line - LIBS=`echo "$LIBS" | sed 's/^-L/-L-L/; s/ -L/ -L-L/g; s/^-l/-L-l/; s/ -l/ -L-l/g'` |