nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-29 16:24:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

rhash: fix darwin build

Browse Source 
Fixes cmake update to 3.8.2, d74d871f52
This commit is contained in:
Daiderd Jordan 2017-06-13 21:37:24 +02:00
parent 9079f94df7
commit 30412f9930
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pkgs/tools/security/rhash/darwin.patch Normal file
View File

@ -0,0 +1,38 @@
diff --git a/Makefile b/Makefile
index e40dbc3..e198b93 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ ALLCFLAGS = -pipe $(CFLAGS) $(ADDCFLAGS) \
-Wbad-function-cast -Wmissing-prototypes -Wmissing-declarations
LDLIBRHASH = -Llibrhash -lrhash
ALLLDFLAGS = $(LDLIBRHASH) $(LDFLAGS) $(ADDLDFLAGS)
-SHAREDLIB = librhash/librhash.so.0
+SHAREDLIB = librhash/librhash.0.dylib
SHRDLFLAGS = $(LDFLAGS) $(ADDLDFLAGS)
HEADERS = calc_sums.h hash_print.h common_func.h hash_update.h file_mask.h file_set.h find_file.h hash_check.h output.h parse_cmdline.h rhash_main.h win_utils.h version.h
SOURCES = calc_sums.c hash_print.c common_func.c hash_update.c file_mask.c file_set.c find_file.c hash_check.c output.c parse_cmdline.c rhash_main.c win_utils.c
diff --git a/librhash/Makefile b/librhash/Makefile
index 2f9bcc9..0c5aaad 100644
--- a/librhash/Makefile
+++ b/librhash/Makefile
@@ -28,8 +28,8 @@ PREFIX = /usr/local
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
@@ -182,8 +182,7 @@ test-dll: $(DLLNAME) test_hashes.o
# shared and static libraries
$(SONAME): $(SOURCES)
- sed -n '1s/.*/{ global:/p; s/^RHASH_API.* \([a-z0-9_]\+\)(.*/ \1;/p; $$s/.*/local: *; };/p' $(SO_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

4
pkgs/tools/security/rhash/default.nix
View File

@ -10,13 +10,15 @@ stdenv.mkDerivation rec {
sha256 = "0nii6p4m2x8rkaf8r6smgfwb1q4hpf117kkg64yr6gyqgdchnljv";
};
patches = stdenv.lib.optional stdenv.isDarwin ./darwin.patch;
installFlags = [ "DESTDIR=$(out)" "PREFIX=/" ];
# we build the static library because of two makefile bugs
# * .h files installed for static library target only
# * .so.0 -> .so link only created in the static library install target
buildPhase = ''
make lib-shared lib-static build-shared
make lib-shared lib-static build-shared CC=cc PREFIX=$out
'';
# we don't actually want the static library, so we remove it after it