56 lines
1.6 KiB
Plaintext
56 lines
1.6 KiB
Plaintext
$OpenBSD: patch-Makefile,v 1.37 2013/03/13 11:58:16 benoit Exp $
|
|
--- Makefile.orig Fri Feb 8 01:00:07 2013
|
|
+++ Makefile Wed Mar 13 10:35:45 2013
|
|
@@ -1123,13 +1123,13 @@ ifeq ($(uname_S),FreeBSD)
|
|
HAVE_PATHS_H = YesPlease
|
|
endif
|
|
ifeq ($(uname_S),OpenBSD)
|
|
- NO_STRCASESTR = YesPlease
|
|
NO_MEMMEM = YesPlease
|
|
USE_ST_TIMESPEC = YesPlease
|
|
NEEDS_LIBICONV = YesPlease
|
|
- BASIC_CFLAGS += -I/usr/local/include
|
|
- BASIC_LDFLAGS += -L/usr/local/lib
|
|
+ BASIC_CFLAGS += -I${X11BASE}/include -I${LOCALBASE}/include
|
|
+ BASIC_LDFLAGS += -L${X11BASE}/lib -L${LOCALBASE}/lib
|
|
HAVE_PATHS_H = YesPlease
|
|
+ NO_PYTHON = YesPlease
|
|
endif
|
|
ifeq ($(uname_S),NetBSD)
|
|
ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
|
|
@@ -1601,7 +1601,7 @@ endif
|
|
EXTLIBS += -lz
|
|
|
|
ifndef NO_OPENSSL
|
|
- OPENSSL_LIBSSL = -lssl
|
|
+ OPENSSL_LIBSSL = -lssl -lcrypto
|
|
ifdef OPENSSLDIR
|
|
BASIC_CFLAGS += -I$(OPENSSLDIR)/include
|
|
OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib)
|
|
@@ -2487,13 +2487,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walk
|
|
$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
|
|
|
|
$(LIB_FILE): $(LIB_OBJS)
|
|
- $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(LIB_OBJS)
|
|
+ $(QUIET_AR)$(RM) $@ && $(AR) rc $@ $(LIB_OBJS) && ranlib $@
|
|
|
|
$(XDIFF_LIB): $(XDIFF_OBJS)
|
|
- $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(XDIFF_OBJS)
|
|
+ $(QUIET_AR)$(RM) $@ && $(AR) rc $@ $(XDIFF_OBJS) && ranlib $@
|
|
|
|
$(VCSSVN_LIB): $(VCSSVN_OBJS)
|
|
- $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(VCSSVN_OBJS)
|
|
+ $(QUIET_AR)$(RM) $@ && $(AR) rc $@ $(VCSSVN_OBJS) && ranlib $@
|
|
|
|
export DEFAULT_EDITOR DEFAULT_PAGER
|
|
|
|
@@ -2679,7 +2679,7 @@ export TEST_NO_MALLOC_CHECK
|
|
|
|
### Testing rules
|
|
|
|
-test: all
|
|
+test:
|
|
$(MAKE) -C t/ all
|
|
|
|
perf: all
|