Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1a6fe83

Browse files
committed
Allow Win32 libpq will use it's minimal pthread implementation, and ecpg
will use pthreadGC2.Dave Page
1 parent2d03390 commit1a6fe83

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

‎config/acx_pthread.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ fi
4343
# which indicates that we try without any flags at all, and "pthread-config"
4444
# which is a program returning the flags for the Pth emulation library.
4545
46-
acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
46+
acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config pthreadGC2"
4747
4848
# The ordering *is* (sometimes) important. Some notes on the
4949
# individual items follow:

‎configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16248,7 +16248,7 @@ fi
1624816248
# which indicates that we try without any flags at all, and "pthread-config"
1624916249
# which is a program returning the flags for the Pth emulation library.
1625016250

16251-
acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
16251+
acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config pthreadGC2"
1625216252

1625316253
# The ordering *is* (sometimes) important. Some notes on the
1625416254
# individual items follow:

‎src/interfaces/libpq/Makefile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
66
# Portions Copyright (c) 1994, Regents of the University of California
77
#
8-
# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.137 2005/08/23 21:02:03 momjian Exp $
8+
# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.138 2005/08/29 00:47:35 momjian Exp $
99
#
1010
#-------------------------------------------------------------------------
1111

@@ -21,7 +21,9 @@ SO_MINOR_VERSION= 1
2121
DLTYPE= library
2222

2323
overrideCPPFLAGS := -DFRONTEND -I$(srcdir)$(CPPFLAGS) -I$(top_builddir)/src/port
24+
ifneq ($(PORTNAME), win32)
2425
overrideCFLAGS +=$(PTHREAD_CFLAGS)
26+
endif
2527

2628
# Need to recomple any libpgport object files
2729
LIBS :=$(patsubst -lpgport,,$(LIBS))
@@ -51,7 +53,11 @@ endif
5153
# Add libraries that libpq depends (or might depend) on into the
5254
# shared library link. (The order in which you list them here doesn't
5355
# matter.)
56+
ifneq ($(PORTNAME), win32)
5457
SHLIB_LINK +=$(filter -lcrypt -ldes -lcom_err -lcrypto -lk5crypto -lkrb5 -lssl -lsocket -lnsl -lresolv -lintl,$(LIBS))$(PTHREAD_LIBS)
58+
else
59+
SHLIB_LINK +=$(filter -lcrypt -ldes -lcom_err -lcrypto -lk5crypto -lkrb5 -lssl -lsocket -lnsl -lresolv -lintl$(PTHREAD_LIBS),$(LIBS))
60+
endif
5561
ifeq ($(PORTNAME), win32)
5662
SHLIB_LINK += -lshfolder -lwsock32 -lws2_32$(filter -leay32 -lssleay32 -lcomerr32 -lkrb5_32,$(LIBS))
5763
endif

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp