42 lines
1.2 KiB
Plaintext
42 lines
1.2 KiB
Plaintext
$OpenBSD: patch-Makerules,v 1.23 2020/06/13 15:53:36 sthen Exp $
|
|
|
|
Index: Makerules
|
|
--- Makerules.orig
|
|
+++ Makerules
|
|
@@ -26,8 +26,8 @@ ifeq ($(build),debug)
|
|
CFLAGS += -pipe -g
|
|
LDFLAGS += -g
|
|
else ifeq ($(build),release)
|
|
- CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer
|
|
- LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s
|
|
+ CFLAGS += -DNDEBUG
|
|
+ LDFLAGS += $(LDREMOVEUNREACH)
|
|
else ifeq ($(build),small)
|
|
CFLAGS += -pipe -Os -DNDEBUG -fomit-frame-pointer
|
|
LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s
|
|
@@ -91,8 +91,8 @@ else ifeq ($(OS),MACOS)
|
|
LD = xcrun ld
|
|
RANLIB = xcrun ranlib
|
|
|
|
-else ifeq ($(OS),Linux)
|
|
- HAVE_OBJCOPY := yes
|
|
+else
|
|
+ HAVE_OBJCOPY ?= yes
|
|
|
|
ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
|
|
SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
|
|
@@ -137,10 +137,10 @@ else ifeq ($(OS),Linux)
|
|
X11_LIBS := $(shell pkg-config --libs x11 xext)
|
|
endif
|
|
|
|
- HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)
|
|
+ HAVE_LIBCRYPTO := yes
|
|
ifeq ($(HAVE_LIBCRYPTO),yes)
|
|
- LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO
|
|
- LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
|
|
+ LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO
|
|
+ LIBCRYPTO_LIBS := -lcrypto
|
|
endif
|
|
|
|
HAVE_PTHREAD := yes
|