Disable pthread usage since it seems to break some stuff.

Found the hard way by Simon Kuhnle, thanks!
This commit is contained in:
bernd 2009-01-26 08:58:43 +00:00
parent b74376975b
commit 363248410c
2 changed files with 8 additions and 6 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.39 2009/01/24 14:31:28 bernd Exp $
# $OpenBSD: Makefile,v 1.40 2009/01/26 08:58:43 bernd Exp $
COMMENT-main= GIT - Tree History Storage Tool
COMMENT-svn= GIT - subversion interoperability tools
@ -6,7 +6,7 @@ COMMENT-x11= GIT - graphical tools
V= 1.6.1
DISTNAME= git-${V}
PKGNAME-main= ${DISTNAME}
PKGNAME-main= ${DISTNAME}p0
PKGNAME-svn= git-svn-${V}
PKGNAME-x11= git-x11-${V}
CATEGORIES= devel
@ -39,7 +39,7 @@ BUILD_DEPENDS= ::archivers/gtar \
MULTI_PACKAGES= -main -svn -x11
WANTLIB-main= c expat crypto pthread ssl z
WANTLIB-main= c expat crypto ssl z
RUN_DEPENDS-main= ::net/rsync \
::devel/p5-Error \
${MODLIBICONV_RUN_DEPENDS}

View File

@ -1,5 +1,5 @@
--- Makefile.orig Thu Dec 25 06:33:25 2008
+++ Makefile Sat Jan 24 15:30:26 2009
+++ Makefile Mon Jan 26 09:09:19 2009
@@ -170,7 +170,7 @@ uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo
# CFLAGS and LDFLAGS are for the users to override from the command line.
@ -54,7 +54,7 @@
export TCL_PATH TCLTK_PATH
@@ -703,11 +703,10 @@ ifeq ($(uname_S),FreeBSD)
@@ -703,12 +703,11 @@ ifeq ($(uname_S),FreeBSD)
endif
endif
ifeq ($(uname_S),OpenBSD)
@ -63,11 +63,13 @@
NEEDS_LIBICONV = YesPlease
- BASIC_CFLAGS += -I/usr/local/include
- BASIC_LDFLAGS += -L/usr/local/lib
- THREADED_DELTA_SEARCH = YesPlease
+ BASIC_CFLAGS += -I${X11BASE}/include -I${LOCALBASE}/include
+ BASIC_LDFLAGS += -L${X11BASE}/lib -L${LOCALBASE}/lib
THREADED_DELTA_SEARCH = YesPlease
+ NO_PTHREADS = YesPlease
endif
ifeq ($(uname_S),NetBSD)
ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
@@ -793,7 +792,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))
COMPAT_OBJS += compat/mingw.o compat/fnmatch/fnmatch.o compat/regex/regex.o compat/winansi.o
EXTLIBS += -lws2_32