You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
62 lines
2.0 KiB
62 lines
2.0 KiB
Index: Makefile |
|
--- Makefile.orig 2015-06-30 20:37:18.000000000 +0200 |
|
+++ Makefile 2015-06-30 21:15:58.432542891 +0200 |
|
@@ -18,7 +18,6 @@ |
|
OBJS=$(SRCS:.c=.o) |
|
|
|
all: bin |
|
- make -C tests |
|
|
|
include s2n.mk |
|
|
|
Index: bin/Makefile |
|
--- bin/Makefile.orig 2015-06-30 20:37:18.000000000 +0200 |
|
+++ bin/Makefile 2015-06-30 21:14:59.792395400 +0200 |
|
@@ -16,10 +16,10 @@ |
|
all: s2nc s2nd |
|
include ../s2n.mk |
|
|
|
-ifeq ($(shell uname),Darwin) |
|
- LIBS = |
|
+ifeq ($(shell uname),Linux) |
|
+ LIBS = -lcrypto -ldl -lrt -lpthread |
|
else |
|
- LIBS = -ldl -lrt -lpthread |
|
+ LIBS = -lcrypto |
|
endif |
|
|
|
LDFLAGS += -L../lib/ -ls2n ${LIBS} |
|
Index: lib/Makefile |
|
--- lib/Makefile.orig 2015-06-30 20:37:18.000000000 +0200 |
|
+++ lib/Makefile 2015-06-30 21:14:59.792395400 +0200 |
|
@@ -13,14 +13,14 @@ |
|
# permissions and limitations under the License. |
|
# |
|
|
|
-ifeq ($(shell uname),Darwin) |
|
- LIBS = -lc -lpthread |
|
-else |
|
+ifeq ($(shell uname),Linux) |
|
LIBS = -lc -lpthread -lrt |
|
+else |
|
+ LIBS = -lc -lpthread |
|
endif |
|
|
|
OBJS = $(wildcard ../utils/*.o ../stuffer/*.o ../tls/*.o ../iana/*.o ../crypto/*.o ../error/*.o ../libcrypto-root/lib/libcrypto.a) |
|
-all: libs2n.a libs2n.so libs2n.dylib |
|
+all: libs2n.a libs2n.dylib |
|
|
|
include ../s2n.mk |
|
|
|
Index: s2n.mk |
|
--- s2n.mk.orig 2015-06-30 20:37:18.000000000 +0200 |
|
+++ s2n.mk 2015-06-30 21:14:59.792395400 +0200 |
|
@@ -17,7 +17,7 @@ |
|
CRUFT = $(wildcard *.c~ *.h~ *.c.BAK *.h.BAK *.o *.a *.so *.dylib) |
|
INDENT = $(shell (if indent --version 2>&1 | grep GNU > /dev/null; then echo indent ; elif gindent --version 2>&1 | grep GNU > /dev/null; then echo gindent; else echo true ; fi )) |
|
|
|
-CFLAGS = -pedantic -Wall -Werror -Wimplicit -Wunused -Wcomment -Wchar-subscripts -Wuninitialized \ |
|
+CFLAGS = $(CPPFLAGS) -Wformat -Wimplicit -Wunused -Wcomment -Wchar-subscripts -Wuninitialized \ |
|
-Wshadow -Wcast-qual -Wcast-align -Wwrite-strings -Wstack-protector -fPIC \ |
|
-std=c99 -D_POSIX_C_SOURCE=200112L -fstack-protector-all -O2 -I../libcrypto-root/include/ \ |
|
-I../api/ -I../ -Wno-deprecated-declarations -Wno-unknown-pragmas -Wformat-security \
|
|
|