58 lines
2.4 KiB
Plaintext
58 lines
2.4 KiB
Plaintext
$OpenBSD: patch-Makefile,v 1.3 2018/04/19 21:25:03 sthen Exp $
|
|
- respect ports CFLAGS
|
|
- use OpenBSD shared library naming
|
|
- sys.mk defines CFLAGS and LDFLAGS so don't use conditional value assignments
|
|
for those.
|
|
- we don't patch the install-osx target, because we don't use it
|
|
Index: Makefile
|
|
--- Makefile.orig
|
|
+++ Makefile
|
|
@@ -5,20 +5,19 @@ MAKE_DIR ?= install -d
|
|
INSTALL_DATA ?= install
|
|
|
|
CC?=gcc
|
|
-CFLAGS?=-O2 -Wall -g -D_FORTIFY_SOURCE=2 -fstack-protector -fPIC
|
|
-LDFLAGS?=-Wl,-z,now -Wl,-z,relro -Wl,-soname,libscrypt.so.0 -Wl,--version-script=libscrypt.version
|
|
+CFLAGS=-Wall -g -D_FORTIFY_SOURCE=2 -fstack-protector -fPIC ${PORTS_CFLAGS}
|
|
+LDFLAGS=-Wl,-z,now -Wl,-z,relro -Wl,--version-script=libscrypt.version
|
|
CFLAGS_EXTRA?=-Wl,-rpath=.
|
|
|
|
all: reference
|
|
|
|
OBJS= crypto_scrypt-nosse.o sha256.o crypto-mcf.o b64.o crypto-scrypt-saltgen.o crypto_scrypt-check.o crypto_scrypt-hash.o slowequals.o
|
|
|
|
-libscrypt.so.0: $(OBJS)
|
|
- $(CC) $(LDFLAGS) -shared -o libscrypt.so.0 $(OBJS) -lm -lc
|
|
+libscrypt.so.${LIBscrypt_VERSION}: $(OBJS)
|
|
+ $(CC) $(LDFLAGS) -shared -o libscrypt.so.${LIBscrypt_VERSION} $(OBJS) -lm -lc
|
|
ar rcs libscrypt.a $(OBJS)
|
|
|
|
-reference: libscrypt.so.0 main.o crypto_scrypt-hexconvert.o
|
|
- ln -s -f libscrypt.so.0 libscrypt.so
|
|
+reference: libscrypt.so.${LIBscrypt_VERSION} main.o crypto_scrypt-hexconvert.o
|
|
$(CC) -Wall -o reference main.o b64.o crypto_scrypt-hexconvert.o $(CFLAGS_EXTRA) -L. -lscrypt
|
|
|
|
clean:
|
|
@@ -40,11 +39,10 @@ asan: main.c
|
|
./asantest
|
|
rm -f asantest
|
|
|
|
-install: libscrypt.so.0
|
|
- $(MAKE_DIR) $(DESTDIR) $(DESTDIR)$(PREFIX) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(INCLUDEDIR)
|
|
- $(INSTALL_DATA) -pm 0755 libscrypt.so.0 $(DESTDIR)$(LIBDIR)
|
|
- cd $(DESTDIR)$(LIBDIR) && ln -s -f libscrypt.so.0 $(DESTDIR)$(LIBDIR)/libscrypt.so
|
|
- $(INSTALL_DATA) -pm 0644 libscrypt.h $(DESTDIR)$(INCLUDEDIR)
|
|
+install: libscrypt.so.${LIBscrypt_VERSION}
|
|
+ $(MAKE_DIR) $(LIBDIR) $(INCLUDEDIR)
|
|
+ $(INSTALL_DATA) -pm 0755 libscrypt.so.${LIBscrypt_VERSION} $(LIBDIR)
|
|
+ $(INSTALL_DATA) -pm 0644 libscrypt.h $(INCLUDEDIR)
|
|
|
|
install-osx: libscrypt.so.0
|
|
$(MAKE_DIR) $(DESTDIR) $(DESTDIR)$(PREFIX) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(INCLUDEDIR)
|
|
@@ -54,4 +52,4 @@ install-osx: libscrypt.so.0
|
|
$(INSTALL_DATA) -pm 0644 libscrypt.h $(DESTDIR)$(INCLUDEDIR)
|
|
|
|
install-static: libscrypt.a
|
|
- $(INSTALL_DATA) -pm 0644 libscrypt.a $(DESTDIR)$(LIBDIR)
|
|
+ $(INSTALL_DATA) -pm 0644 libscrypt.a $(LIBDIR)
|