[PATCH] Windows: Remove dependency on pthreadGC2.dll

Michael Lukashov· Jan 24, 2010, 10:10 UTC · lore

Commit 44626dc7 (MSVC: Windows-native implementation for subset of threads API, 2010-01-15) introduces builtin replacement of pthreadGC2.dll functionality, thus we can completely drop dependency on this dll.

Signed-off-by: Michael Lukashov <michael.lukashov@gmail.com>
---
 Makefile |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

Show changes to Makefile +3 −1

diff --git a/Makefile b/Makefile
index c0dbee2..af08c8f 100644
--- a/Makefile
+++ b/Makefile
@@ -994,6 +994,7 @@ ifeq ($(uname_S),Windows)
 	COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DNOGDI -DHAVE_STRING_H -DHAVE_ALLOCA_H -Icompat -Icompat/fnmatch -Icompat/regex -Icompat/fnmatch -Icompat/win32 -DSTRIP_EXTENSION=\".exe\"
 	BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -SUBSYSTEM:CONSOLE -NODEFAULTLIB:MSVCRT.lib
 	EXTLIBS = advapi32.lib shell32.lib wininet.lib ws2_32.lib
+	PTHREAD_LIBS =
 	lib =
 ifndef DEBUG
 	BASIC_CFLAGS += -GL -Os -MT
@@ -1036,11 +1037,12 @@ ifneq (,$(findstring MINGW,$(uname_S)))
 	NO_PYTHON = YesPlease
 	BLK_SHA1 = YesPlease
 	THREADED_DELTA_SEARCH = YesPlease
-	COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat -Icompat/fnmatch
+	COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat -Icompat/fnmatch -Icompat/win32
 	COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
 	COMPAT_OBJS += compat/mingw.o compat/fnmatch/fnmatch.o compat/winansi.o \
 		compat/win32/pthread.o
 	EXTLIBS += -lws2_32
+	PTHREAD_LIBS =
 	X = .exe
 ifneq (,$(wildcard ../THIS_IS_MSYSGIT))
 	htmldir=doc/git/html/

-- 
1.6.6.1599.gaed1a

Johannes Sixt· Jan 24, 2010, 19:03 UTC · re: Michael Lukashov · lore

Re: [PATCH] Windows: Remove dependency on pthreadGC2.dll

On Sonntag, 24. Januar 2010, Michael Lukashov wrote:

> Commit 44626dc7 (MSVC: Windows-native implementation for subset
> of threads API, 2010-01-15) introduces builtin replacement of
> pthreadGC2.dll functionality, thus we can completely drop
> dependency on this dll.

Duh! This means that when I tested above-mentioned patch, I actually was using pthread.h from msysgit instead of compat/win32/pthread.h, and didn't test it at all (note: MinGW version; MSVC was fine because it had the right includes all the time). This patch passes the test suite and a 'git gc --aggressive':

Acked-by: Johannes Sixt <j6t@kdbg.org>

-- Hannes

patchWindows: Remove dependency on pthreadGC2.dll