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

Commit45fbab2

Browse files
committed
Make thread flags CFLAGS, not CPPFLAGS.
1 parentae5bc8a commit45fbab2

File tree

7 files changed

+15
-16
lines changed

7 files changed

+15
-16
lines changed

‎configure

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13465,9 +13465,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
1346513465

1346613466
# set thread flags
1346713467

13468-
# ACX_PTHREAD sets PTHREAD_CFLAGS that should be used for linking too
13469-
PTHREAD_LIBS="$PTHREAD_CFLAGS $PTHREAD_LIBS"
13470-
1347113468
# At this point, we don't want to muck with the compiler name for threading.
1347213469
# Let's see who fails, perhaps AIX. 2004-04-23
1347313470
if test "$PTHREAD_CC" != "$CC"; then

‎configure.in

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl Process this file with autoconf to produce a configure script.
2-
dnl $PostgreSQL: pgsql/configure.in,v 1.326 2004/04/24 03:09:35 momjian Exp $
2+
dnl $PostgreSQL: pgsql/configure.in,v 1.327 2004/04/25 20:57:32 momjian Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -959,9 +959,6 @@ AC_FUNC_FSEEKO
959959
if test "$enable_thread_safety" = yes; then
960960
ACX_PTHREAD# set thread flags
961961

962-
# ACX_PTHREAD sets PTHREAD_CFLAGS that should be used for linking too
963-
PTHREAD_LIBS="$PTHREAD_CFLAGS $PTHREAD_LIBS"
964-
965962
# At this point, we don't want to muck with the compiler name for threading.
966963
# Let's see who fails, perhaps AIX. 2004-04-23
967964
if test "$PTHREAD_CC" != "$CC"; then

‎src/interfaces/ecpg/compatlib/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 1994, Regents of the University of California
66
#
7-
# $PostgreSQL: pgsql/src/interfaces/ecpg/compatlib/Makefile,v 1.15 2004/04/23 18:15:54 momjian Exp $
7+
# $PostgreSQL: pgsql/src/interfaces/ecpg/compatlib/Makefile,v 1.16 2004/04/25 20:57:32 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -16,7 +16,8 @@ NAME= ecpg_compat
1616
SO_MAJOR_VERSION= 1
1717
SO_MINOR_VERSION= 1
1818

19-
overrideCPPFLAGS := -I$(top_srcdir)/src/interfaces/ecpg/include -I$(libpq_srcdir) -I$(top_srcdir)/src/include/utils$(CPPFLAGS)$(PTHREAD_CFLAGS)
19+
overrideCPPFLAGS := -I$(top_srcdir)/src/interfaces/ecpg/include -I$(libpq_srcdir) -I$(top_srcdir)/src/include/utils$(CPPFLAGS)
20+
overrideCFLAGS +=$(PTHREAD_CFLAGS)
2021
SHLIB_LINK = -L../ecpglib -lecpg -L../pgtypeslib -lpgtypes$(libpq)\
2122
$(filter -lintl -lssl -lcrypto -lkrb5 -lcrypt -lm,$(LIBS))$(PTHREAD_LIBS)
2223

‎src/interfaces/ecpg/ecpglib/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 1994, Regents of the University of California
66
#
7-
# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.15 2004/04/23 18:15:54 momjian Exp $
7+
# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.16 2004/04/25 20:57:32 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -16,7 +16,8 @@ NAME= ecpg
1616
SO_MAJOR_VERSION= 4
1717
SO_MINOR_VERSION= 2
1818

19-
overrideCPPFLAGS := -I$(top_srcdir)/src/interfaces/ecpg/include -I$(libpq_srcdir)$(CPPFLAGS)$(PTHREAD_CFLAGS)
19+
overrideCPPFLAGS := -I$(top_srcdir)/src/interfaces/ecpg/include -I$(libpq_srcdir)$(CPPFLAGS)
20+
overrideCFLAGS +=$(PTHREAD_CFLAGS)
2021

2122
OBJS= execute.o typename.o descriptor.o data.o error.o prepare.o memory.o\
2223
connect.o misc.o

‎src/interfaces/ecpg/preproc/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/Makefile,v 1.100 2004/04/23 18:15:55 momjian Exp $
1+
# $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/Makefile,v 1.101 2004/04/25 20:57:32 momjian Exp $
22

33
subdir = src/interfaces/ecpg/preproc
44
top_builddir = ../../../..
@@ -8,7 +8,7 @@ MAJOR_VERSION=3
88
MINOR_VERSION=2
99
PATCHLEVEL=0
1010

11-
overrideCPPFLAGS := -I$(srcdir)/../include -I$(srcdir)$(CPPFLAGS)$(PTHREAD_CFLAGS)\
11+
overrideCPPFLAGS := -I$(srcdir)/../include -I$(srcdir)$(CPPFLAGS)\
1212
-DMAJOR_VERSION=$(MAJOR_VERSION)\
1313
-DMINOR_VERSION=$(MINOR_VERSION) -DPATCHLEVEL=$(PATCHLEVEL)\
1414
-DINCLUDEDIR=\"$(includedir)\"\
@@ -17,6 +17,7 @@ override CPPFLAGS := -I$(srcdir)/../include -I$(srcdir) $(CPPFLAGS) $(PTHREAD_CF
1717
ifeq ($(GCC), yes)
1818
overrideCFLAGS += -Wno-error
1919
endif
20+
overrideCFLAGS +=$(PTHREAD_CFLAGS)
2021

2122
OBJS=preproc.o type.o ecpg.o ecpg_keywords.o output.o\
2223
keywords.o c_keywords.o ../ecpglib/typename.o descriptor.o variable.o

‎src/interfaces/ecpg/test/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
# $PostgreSQL: pgsql/src/interfaces/ecpg/test/Makefile,v 1.45 2004/04/23 18:15:55 momjian Exp $
1+
# $PostgreSQL: pgsql/src/interfaces/ecpg/test/Makefile,v 1.46 2004/04/25 20:57:32 momjian Exp $
22

33
subdir = src/interfaces/ecpg/test
44
top_builddir = ../../../..
55
include$(top_builddir)/src/Makefile.global
66

7-
overrideCPPFLAGS := -I$(srcdir)/../include -I$(libpq_srcdir)$(CPPFLAGS)$(PTHREAD_CFLAGS)
7+
overrideCPPFLAGS := -I$(srcdir)/../include -I$(libpq_srcdir)$(CPPFLAGS)
8+
overrideCFLAGS +=$(PTHREAD_CFLAGS)
89

910
ECPG = ../preproc/ecpg -I$(srcdir)/../include
1011

‎src/interfaces/libpq/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 1994, Regents of the University of California
66
#
7-
# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.102 2004/04/23 18:15:55 momjian Exp $
7+
# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.103 2004/04/25 20:57:32 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -19,6 +19,7 @@ SO_MAJOR_VERSION= 3
1919
SO_MINOR_VERSION= 2
2020

2121
overrideCPPFLAGS := -I$(srcdir)$(CPPFLAGS)$(PTHREAD_CFLAGS) -DFRONTEND -DSYSCONFDIR='"$(sysconfdir)"'
22+
overrideCFLAGS +=$(PTHREAD_CFLAGS)
2223

2324
OBJS= fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o\
2425
fe-protocol2.o fe-protocol3.o pqexpbuffer.o pqsignal.o fe-secure.o\

0 commit comments

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