diff options
| author | Sven Grunewaldt | 2014-04-21 10:38:06 +0200 |
|---|---|---|
| committer | Jack Nagel | 2014-05-13 21:07:05 -0500 |
| commit | f58374f9a1249ac84f17af205a81bd0dc7e6f1ac (patch) | |
| tree | 6c8db46bb4981a622dfc3adf7a70e607a12b0de5 /Library/Formula | |
| parent | e220f28f205dc43fc308d230cde5901c10b10a8f (diff) | |
| download | homebrew-f58374f9a1249ac84f17af205a81bd0dc7e6f1ac.tar.bz2 | |
rhash: install static and dynamic libs
Closes #28567.
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/rhash.rb | 34 |
1 files changed, 31 insertions, 3 deletions
diff --git a/Library/Formula/rhash.rb b/Library/Formula/rhash.rb index 10d1721d9..ff50209fe 100644 --- a/Library/Formula/rhash.rb +++ b/Library/Formula/rhash.rb @@ -5,12 +5,40 @@ class Rhash < Formula url 'https://downloads.sourceforge.net/project/rhash/rhash/1.3.1/rhash-1.3.1-src.tar.gz' sha1 '3ecba2786909cc0d8bff253d94b0f313cbf2a6b1' + # Upstream issue: https://github.com/rhash/RHash/pull/7 + patch :DATA + def install # install target isn't parallel-safe ENV.j1 - system 'make', 'install', "PREFIX=", - "DESTDIR=#{prefix}", - "CC=#{ENV.cc}" + system "make", "lib-static", "lib-shared", "all", "CC=#{ENV.cc}" + + system "make", "install-lib-static", "install-lib-shared", "install", "PREFIX=", + "DESTDIR=#{prefix}", "CC=#{ENV.cc}" end end + +__END__ +--- a/librhash/Makefile 2014-04-20 14:20:22.000000000 +0200 ++++ b/librhash/Makefile 2014-04-20 14:40:02.000000000 +0200 +@@ -26,8 +26,8 @@ + INCDIR = $(PREFIX)/include + LIBDIR = $(PREFIX)/lib + LIBRARY = librhash.a +-SONAME = librhash.so.0 +-SOLINK = librhash.so ++SONAME = librhash.0.dylib ++SOLINK = librhash.dylib + TEST_TARGET = test_hashes + TEST_SHARED = test_shared + # Set variables according to GNU coding standard +@@ -176,8 +176,7 @@ + + # shared and static libraries + $(SONAME): $(SOURCES) +- sed -n '1s/.*/{ global:/p; s/^RHASH_API.* \([a-z0-9_]\+\)(.*/ \1;/p; $$s/.*/local: *; };/p' $(LIB_HEADERS) > exports.sym +- $(CC) -fpic $(ALLCFLAGS) -shared $(SOURCES) -Wl,--version-script,exports.sym,-soname,$(SONAME) $(LIBLDFLAGS) -o $@ ++ $(CC) -fpic $(ALLCFLAGS) -dynamiclib $(SOURCES) $(LIBLDFLAGS) -Wl,-install_name,$(PREFIX)/lib/$@ -o $@ + ln -s $(SONAME) $(SOLINK) + # use 'nm -Cg --defined-only $@' to view exported symbols |