From f8a30757b0050c5dc3c4b9f49724a926adf00a05 Mon Sep 17 00:00:00 2001
From: sk-5 <sikofitt@gmail.com>
Date: Fri, 11 Mar 2016 11:01:58 -0800
Subject: [PATCH] Modifed makefiles to create single .o bcrypt file

---
 src/3rdparty/crypt/bcrypt/Makefile               |   8 ++++----
 src/3rdparty/crypt/bcrypt/bcrypt_test_static.c   |  12 ++++++++++++
 .../crypt/bcrypt/crypt_blowfish/Makefile         |   4 ++--
 .../crypt/bcrypt/crypt_blowfish/libbcrypt.so     | Bin 3424 -> 0 bytes
 4 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 src/3rdparty/crypt/bcrypt/bcrypt_test_static.c
 delete mode 100644 src/3rdparty/crypt/bcrypt/crypt_blowfish/libbcrypt.so

diff --git a/src/3rdparty/crypt/bcrypt/Makefile b/src/3rdparty/crypt/bcrypt/Makefile
index a8b9d07..aa5ef78 100644
--- a/src/3rdparty/crypt/bcrypt/Makefile
+++ b/src/3rdparty/crypt/bcrypt/Makefile
@@ -10,11 +10,11 @@ test: bcrypt.c crypt_blowfish
 
 bcrypt.a: bcrypt.o crypt_blowfish
 	ar r bcrypt.a bcrypt.o crypt_blowfish/*.o
-	ln -s bcrypt.o libbcrypt.so
-
+	ld -r bcrypt.o crypt_blowfish/*.o -o libbcrypt.o
+	        	
 bcrypt.o: bcrypt.c
-	$(CC) $(CFLAGS) -c bcrypt.c
-
+	$(CC) $(CFLAGS) -c -fPIC bcrypt.c
+ 
 crypt_blowfish:
 	$(MAKE) -C crypt_blowfish
 
diff --git a/src/3rdparty/crypt/bcrypt/bcrypt_test_static.c b/src/3rdparty/crypt/bcrypt/bcrypt_test_static.c
new file mode 100644
index 0000000..f3fdbf7
--- /dev/null
+++ b/src/3rdparty/crypt/bcrypt/bcrypt_test_static.c
@@ -0,0 +1,12 @@
+#include <stdio.h>
+#include "bcrypt.h"
+
+int main() {
+
+  char salt[22];
+  char hash[64];
+  bcrypt_gensalt(64, salt);
+  bcrypt_hashpw("Hashed", salt, hash);
+  printf("%s", hash);
+  
+}
\ No newline at end of file
diff --git a/src/3rdparty/crypt/bcrypt/crypt_blowfish/Makefile b/src/3rdparty/crypt/bcrypt/crypt_blowfish/Makefile
index c162adc..fe3da80 100644
--- a/src/3rdparty/crypt/bcrypt/crypt_blowfish/Makefile
+++ b/src/3rdparty/crypt/bcrypt/crypt_blowfish/Makefile
@@ -18,7 +18,7 @@ CC = gcc
 AS = $(CC)
 LD = $(CC)
 RM = rm -f
-CFLAGS = -W -Wall -Wbad-function-cast -Wcast-align -Wcast-qual -Wmissing-prototypes -Wstrict-prototypes -Wshadow -Wundef -Wpointer-arith -O2 -fomit-frame-pointer -funroll-loops
+CFLAGS = -fPIC -W -Wall -Wbad-function-cast -Wcast-align -Wcast-qual -Wmissing-prototypes -Wstrict-prototypes -Wshadow -Wundef -Wpointer-arith -O2 -fomit-frame-pointer -funroll-loops
 ASFLAGS = -c
 LDFLAGS = -s
 
@@ -68,7 +68,7 @@ crypt_gensalt.o: crypt_gensalt.h
 wrapper.o: crypt.h ow-crypt.h crypt_blowfish.h crypt_gensalt.h
 
 .c.o:
-	$(CC) -c $(CFLAGS) $*.c
+	$(CC) -shared -c $(CFLAGS) $*.c
 
 .S.o:
 	$(AS) $(ASFLAGS) $*.S
diff --git a/src/3rdparty/crypt/bcrypt/crypt_blowfish/libbcrypt.so b/src/3rdparty/crypt/bcrypt/crypt_blowfish/libbcrypt.so
deleted file mode 100644
index 4a80a729f2c276310843eccda2c5eca23349c41e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3424
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
G`u`U@`(b?m