aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Formula/bdw-gc.rb
diff options
context:
space:
mode:
authorJack Nagel2012-02-15 09:32:24 -0600
committerJack Nagel2012-02-15 09:32:24 -0600
commit1f22e244a35e92c133288c22da560933935b0b05 (patch)
treea1f44d90354b61b4d00d3a8c9e0a8d81886f581a /Library/Formula/bdw-gc.rb
parentfba3d905eecbebabf1740824bb9d556b00b33c13 (diff)
downloadhomebrew-1f22e244a35e92c133288c22da560933935b0b05.tar.bz2
bdw-gc: apply patch to fix Makefile issue
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library/Formula/bdw-gc.rb')
-rw-r--r--Library/Formula/bdw-gc.rb27
1 files changed, 26 insertions, 1 deletions
diff --git a/Library/Formula/bdw-gc.rb b/Library/Formula/bdw-gc.rb
index 9561d30c5..fd6607355 100644
--- a/Library/Formula/bdw-gc.rb
+++ b/Library/Formula/bdw-gc.rb
@@ -8,7 +8,10 @@ class BdwGc < Formula
version '7.2alpha6'
def patches
- DATA # fix inline asm errors with LLVM, present in upstream SVN
+ # fix inline ASM issues with LLVM
+ # fix Makefile double-install
+ # both fixes already upstream
+ DATA
end
def install
@@ -49,3 +52,25 @@ index 0f68c1e..b3b57f9 100644
return (AO_TS_VAL_t)oldval;
}
#define AO_HAVE_test_and_set_full
+
+diff --git a/Makefile.in b/Makefile.in
+index 09dea13..1f4356e 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -108,7 +108,6 @@ check_PROGRAMS = gctest$(EXEEXT) leaktest$(EXEEXT) middletest$(EXEEXT) \
+ # C++ Interface
+ # -------------
+ @CPLUSPLUS_TRUE@am__append_5 = libgccpp.la
+-@CPLUSPLUS_TRUE@am__append_6 = include/gc_cpp.h include/gc_allocator.h
+ DIST_COMMON = $(am__configure_deps) $(am__pkginclude_HEADERS_DIST) \
+ $(dist_noinst_HEADERS) $(dist_noinst_SCRIPTS) \
+ $(dist_pkgdata_DATA) $(include_HEADERS) $(srcdir)/Makefile.am \
+@@ -579,7 +578,7 @@ include_HEADERS = include/extra/gc.h include/extra/gc_cpp.h
+
+ # installed headers
+ #
+-pkginclude_HEADERS = $(am__append_6) include/gc.h include/gc_typed.h \
++pkginclude_HEADERS = include/gc.h include/gc_typed.h \
+ include/gc_inline.h include/gc_mark.h include/gc_cpp.h \
+ include/weakpointer.h include/new_gc_alloc.h \
+ include/gc_allocator.h include/gc_backptr.h include/gc_gcj.h \