diff options
| author | Caleb Land | 2009-10-16 10:43:31 -0400 |
|---|---|---|
| committer | Max Howell | 2009-10-19 04:02:32 +0100 |
| commit | 571d853309bdf81c656bcfd71f61033b7a03eaf5 (patch) | |
| tree | 5eb72dfa693b8c0b82fc767bab487b8bda0dbfb0 /Library/Formula | |
| parent | ba10442a1f720a906672c5fd7b37887fbc07cfbc (diff) | |
| download | homebrew-571d853309bdf81c656bcfd71f61033b7a03eaf5.tar.bz2 | |
Correctly set the -install_name of libjs.dylib
Remove the workaround for the wrong dylib ID from couchdb and set it correctly
at the source.
Fixes #95
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/couchdb.rb | 1 | ||||
| -rw-r--r-- | Library/Formula/spidermonkey.rb | 13 |
2 files changed, 12 insertions, 2 deletions
diff --git a/Library/Formula/couchdb.rb b/Library/Formula/couchdb.rb index 1b40d163e..1f2f3a264 100644 --- a/Library/Formula/couchdb.rb +++ b/Library/Formula/couchdb.rb @@ -19,7 +19,6 @@ class Couchdb <Formula couchjs = "#{prefix}/lib/couchdb/bin/couchjs" system "chmod 755 #{couchjs}" - system "install_name_tool -change Darwin_DBG.OBJ/libjs.dylib #{HOMEBREW_PREFIX}/lib/libjs.dylib #{couchjs}" (var+'lib'+'couchdb').mkpath (var+'log'+'couchdb').mkpath diff --git a/Library/Formula/spidermonkey.rb b/Library/Formula/spidermonkey.rb index fcacd03ad..20468d714 100644 --- a/Library/Formula/spidermonkey.rb +++ b/Library/Formula/spidermonkey.rb @@ -25,7 +25,7 @@ class Spidermonkey <Formula ENV['CFLAGS'] = ENV['CFLAGS'].gsub(/-msse[^\s]+/, '') Dir.chdir "src" do - system "make DEFINES=-DJS_C_STRINGS_ARE_UTF8 -f Makefile.ref" + system "make JS_DIST='#{prefix}' DEFINES=-DJS_C_STRINGS_ARE_UTF8 -f Makefile.ref" system "make JS_DIST='#{prefix}' -f Makefile.ref export" system "ranlib #{lib}/libjs.a" end @@ -45,3 +45,14 @@ __END__ #elif defined(HAVE_VA_LIST_AS_ARRAY) #define VARARGS_ASSIGN(foo, bar) foo[0] = bar[0] #else + +--- a/src/rules.mk 2006-07-06 22:12:02.000000000 -0400 ++++ b/src/rules.mk 2009-10-16 00:12:09.000000000 -0400 +@@ -115,7 +115,7 @@ + $(RANLIB) $@ + + $(SHARED_LIBRARY): $(LIB_OBJS) +- $(MKSHLIB) -o $@ $(LIB_OBJS) $(LDFLAGS) $(OTHER_LIBS) ++ $(MKSHLIB) -o $@ $(LIB_OBJS) $(LDFLAGS) $(OTHER_LIBS) -install_name $(JS_DIST)/lib/$(notdir $@) + endif + endif |