2006-11-13 16:02:26 -05:00
|
|
|
$OpenBSD: patch-Makefile,v 1.2 2006/11/13 21:02:26 matthieu Exp $
|
|
|
|
|
--- Makefile.orig Sun Nov 12 06:03:32 2006
|
|
|
|
|
+++ Makefile Mon Nov 13 21:59:36 2006
|
2006-11-12 10:59:05 -05:00
|
|
|
@@ -106,13 +106,13 @@ uname_P := $(shell sh -c 'uname -p 2>/de
|
|
|
|
|
|
|
|
|
|
# CFLAGS and LDFLAGS are for the users to override from the command line.
|
|
|
|
|
|
|
|
|
|
-CFLAGS = -g -O2 -Wall
|
|
|
|
|
+CFLAGS ?= -g -O2 -Wall
|
|
|
|
|
LDFLAGS =
|
|
|
|
|
ALL_CFLAGS = $(CFLAGS)
|
|
|
|
|
ALL_LDFLAGS = $(LDFLAGS)
|
|
|
|
|
STRIP ?= strip
|
|
|
|
|
|
|
|
|
|
-prefix = $(HOME)
|
|
|
|
|
+#prefix = $(HOME)
|
|
|
|
|
bindir = $(prefix)/bin
|
|
|
|
|
gitexecdir = $(bindir)
|
|
|
|
|
template_dir = $(prefix)/share/git-core/templates/
|
|
|
|
|
@@ -135,7 +135,7 @@ GITWEB_FAVICON = git-favicon.png
|
|
|
|
|
|
|
|
|
|
export prefix bindir gitexecdir template_dir GIT_PYTHON_DIR
|
|
|
|
|
|
|
|
|
|
-CC = gcc
|
|
|
|
|
+CC ?= gcc
|
|
|
|
|
AR = ar
|
|
|
|
|
TAR = tar
|
|
|
|
|
INSTALL = install
|
2006-11-13 16:02:26 -05:00
|
|
|
@@ -379,7 +379,6 @@ ifeq ($(uname_S),FreeBSD)
|
2006-11-12 10:59:05 -05:00
|
|
|
BASIC_LDFLAGS += -L/usr/local/lib
|
|
|
|
|
endif
|
|
|
|
|
ifeq ($(uname_S),OpenBSD)
|
|
|
|
|
- NO_STRCASESTR = YesPlease
|
|
|
|
|
NEEDS_LIBICONV = YesPlease
|
|
|
|
|
BASIC_CFLAGS += -I/usr/local/include
|
|
|
|
|
BASIC_LDFLAGS += -L/usr/local/lib
|
2006-11-13 16:02:26 -05:00
|
|
|
@@ -446,7 +445,7 @@ ifndef NO_CURL
|
2006-11-12 10:59:05 -05:00
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
ifndef NO_OPENSSL
|
|
|
|
|
- OPENSSL_LIBSSL = -lssl
|
|
|
|
|
+ OPENSSL_LIBSSL = -lssl -lcrypto
|
|
|
|
|
ifdef OPENSSLDIR
|
|
|
|
|
# Again this may be problematic -- gcc does not always want -R.
|
|
|
|
|
BASIC_CFLAGS += -I$(OPENSSLDIR)/include
|
