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

Commitb9104e3

Browse files
committed
Remove certain Makefile dependencies by using full pathnames in
configure.in.
1 parent7bd631b commitb9104e3

File tree

9 files changed

+52
-112
lines changed

9 files changed

+52
-112
lines changed

‎configure

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10637,7 +10637,7 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then
1063710637
_ACEOF
1063810638
1063910639
else
10640-
SNPRINTF='snprintf.o'
10640+
SNPRINTF='$(top_builddir)/src/backend/port/snprintf.o'
1064110641
fi
1064210642
done
1064310643
@@ -10715,7 +10715,7 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then
1071510715
_ACEOF
1071610716
1071710717
else
10718-
SNPRINTF='snprintf.o'
10718+
SNPRINTF='$(top_builddir)/src/backend/port/snprintf.o'
1071910719
fi
1072010720
done
1072110721
@@ -11465,7 +11465,7 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then
1146511465
_ACEOF
1146611466
1146711467
else
11468-
STRERROR='strerror.o'
11468+
STRERROR='$(top_builddir)/src/backend/port/strerror.o'
1146911469
fi
1147011470
done
1147111471
@@ -11544,7 +11544,7 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then
1154411544
_ACEOF
1154511545
1154611546
else
11547-
STRDUP='../../utils/strdup.o'
11547+
STRDUP='$(top_builddir)/src/utils/strdup.o'
1154811548
fi
1154911549
done
1155011550
@@ -12657,7 +12657,7 @@ echo $ECHO_N "checking whether snprintf handles 'long long int' as %lld... $ECHO
1265712657
echo"$as_me:$LINENO: result: assuming not on target machine">&5
1265812658
echo"${ECHO_T}assuming not on target machine">&6
1265912659
# Force usage of our own snprintf, since we cannot test foreign snprintf
12660-
SNPRINTF='snprintf.o'
12660+
SNPRINTF='$(top_builddir)/src/backend/port/snprintf.o'
1266112661
INT64_FORMAT='"%lld"'
1266212662
1266312663
else
@@ -12717,7 +12717,7 @@ echo $ECHO_N "checking whether snprintf handles 'long long int' as %qd... $ECHO_
1271712717
echo"$as_me:$LINENO: result: assuming not on target machine">&5
1271812718
echo"${ECHO_T}assuming not on target machine">&6
1271912719
# Force usage of our own snprintf, since we cannot test foreign snprintf
12720-
SNPRINTF='snprintf.o'
12720+
SNPRINTF='$(top_builddir)/src/backend/port/snprintf.o'
1272112721
INT64_FORMAT='"%lld"'
1272212722
1272312723
else
@@ -12772,7 +12772,7 @@ cat conftest.$ac_ext >&5
1277212772
echo"$as_me:$LINENO: result: no">&5
1277312773
echo"${ECHO_T}no">&6
1277412774
# Force usage of our own snprintf, since system snprintf is broken
12775-
SNPRINTF='snprintf.o'
12775+
SNPRINTF='$(top_builddir)/src/backend/port/snprintf.o'
1277612776
INT64_FORMAT='"%lld"'
1277712777
1277812778
fi

‎configure.in

Lines changed: 8 additions & 8 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 $Header: /cvsroot/pgsql/configure.in,v 1.187 2002/07/07 20:28:24 momjian Exp $
2+
dnl $Header: /cvsroot/pgsql/configure.in,v 1.188 2002/07/15 21:34:04 momjian Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -870,8 +870,8 @@ fi
870870
# have working "long long int" support -- see below.
871871

872872
SNPRINTF=''
873-
AC_CHECK_FUNCS(snprintf, [], SNPRINTF='snprintf.o')
874-
AC_CHECK_FUNCS(vsnprintf, [], SNPRINTF='snprintf.o')
873+
AC_CHECK_FUNCS(snprintf, [], SNPRINTF='$(top_builddir)/src/backend/port/snprintf.o')
874+
AC_CHECK_FUNCS(vsnprintf, [], SNPRINTF='$(top_builddir)/src/backend/port/snprintf.o')
875875
AC_SUBST(SNPRINTF)
876876

877877

@@ -913,9 +913,9 @@ AC_CHECK_FUNCS(random, [], MISSING_RANDOM='random.o')
913913
AC_SUBST(MISSING_RANDOM)
914914
AC_CHECK_FUNCS(inet_aton, [], INET_ATON='inet_aton.o')
915915
AC_SUBST(INET_ATON)
916-
AC_CHECK_FUNCS(strerror, [], STRERROR='strerror.o')
916+
AC_CHECK_FUNCS(strerror, [], STRERROR='$(top_builddir)/src/backend/port/strerror.o')
917917
AC_SUBST(STRERROR)
918-
AC_CHECK_FUNCS(strdup, [], STRDUP='../../utils/strdup.o')
918+
AC_CHECK_FUNCS(strdup, [], STRDUP='$(top_builddir)/src/utils/strdup.o')
919919
AC_SUBST(STRDUP)
920920
AC_CHECK_FUNCS(strtol, [], STRTOL='strtol.o')
921921
AC_SUBST(STRTOL)
@@ -1093,17 +1093,17 @@ main() {
10931093
],
10941094
[ AC_MSG_RESULT(no)
10951095
# Force usage of our own snprintf, since system snprintf is broken
1096-
SNPRINTF='snprintf.o'
1096+
SNPRINTF='$(top_builddir)/src/backend/port/snprintf.o'
10971097
INT64_FORMAT='"%lld"'
10981098
],
10991099
[ AC_MSG_RESULT(assuming not on target machine)
11001100
# Force usage of our own snprintf, since we cannot test foreign snprintf
1101-
SNPRINTF='snprintf.o'
1101+
SNPRINTF='$(top_builddir)/src/backend/port/snprintf.o'
11021102
INT64_FORMAT='"%lld"'
11031103
]) ],
11041104
[ AC_MSG_RESULT(assuming not on target machine)
11051105
# Force usage of our own snprintf, since we cannot test foreign snprintf
1106-
SNPRINTF='snprintf.o'
1106+
SNPRINTF='$(top_builddir)/src/backend/port/snprintf.o'
11071107
INT64_FORMAT='"%lld"'
11081108
])
11091109
else

‎doc/FAQ_Solaris

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Frequently Asked Questions (FAQ) for PostgreSQL 7.2
33
Sun Solaris specific
44
to be read in conjunction with the installation instructions
55
============================================================
6-
last updated: $Date: 2002/03/04 17:47:11 $
6+
last updated: $Date: 2002/07/15 21:34:04 $
77

88
current maintainer: Peter Eisentraut <peter_e@gmx.net>
99

@@ -94,7 +94,7 @@ produced by configure:
9494
(1) In src/Makefile.global, change the line
9595
SNPRINTF =
9696
to read
97-
SNPRINTF =snprintf.o
97+
SNPRINTF =$(top_builddir)/src/backend/port/snprint.o
9898

9999
(2) In src/backend/port/Makefile, add "snprintf.o" to OBJS. (Skip this
100100
step if you see "$(SNPRINTF)" already listed in OBJS.)

‎src/backend/libpq/be-secure.c

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*
1212
*
1313
* IDENTIFICATION
14-
* $Header: /cvsroot/pgsql/src/backend/libpq/be-secure.c,v 1.10 2002/06/20 20:29:28 momjian Exp $
14+
* $Header: /cvsroot/pgsql/src/backend/libpq/be-secure.c,v 1.11 2002/07/15 21:34:04 momjian Exp $
1515
*
1616
* Since the server static private key ($DataDir/server.key)
1717
* will normally be stored unencrypted so that the database
@@ -41,7 +41,7 @@
4141
*
4242
* ...
4343
*
44-
* Because the risk of cryptanalysis increases as large
44+
* Because the risk of cryptanalysis increases as large
4545
* amounts of data are sent with the same session key, the
4646
* session keys are periodically renegotiated.
4747
*
@@ -50,7 +50,7 @@
5050
* [*] existing SSL code pulled out of existing files.
5151
* [*] SSL_get_error() after SSL_read() and SSL_write(),
5252
* SSL_shutdown(), default to TLSv1.
53-
*
53+
*
5454
* milestone 2: provide endpoint authentication (server)
5555
* [*] client verifies server cert
5656
* [*] client verifies server hostname
@@ -100,7 +100,6 @@
100100
#include<arpa/inet.h>
101101
#endif
102102

103-
104103
#ifndefHAVE_STRDUP
105104
#include"strdup.h"
106105
#endif
@@ -153,20 +152,20 @@ static SSL_CTX *SSL_context = NULL;
153152
*As discussed above, EDH protects the confidentiality of
154153
*sessions even if the static private key is compromised,
155154
*so we are *highly* motivated to ensure that we can use
156-
*EDH even if the DBA... or an attacker... deletes the
155+
*EDH even if the DBA... or an attacker... deletes the
157156
*$DataDir/dh*.pem files.
158157
*
159158
*We could refuse SSL connections unless a good DH parameter
160159
*file exists, but some clients may quietly renegotiate an
161160
*unsecured connection without fully informing the user.
162-
*Very uncool.
161+
*Very uncool.
163162
*
164163
*Alternately, the backend could attempt to load these files
165164
*on startup if SSL is enabled - and refuse to start if any
166165
*do not exist - but this would tend to piss off DBAs.
167166
*
168167
*If you want to create your own hardcoded DH parameters
169-
*for fun and profit, review "Assigned Number for SKIP
168+
*for fun and profit, review "Assigned Number for SKIP
170169
*Protocols" (http://www.skip-vpn.org/spec/numbers.html)
171170
*for suggestions.
172171
*/
@@ -241,7 +240,7 @@ secure_destroy (void)
241240
/*
242241
*Attempt to negotiate secure session.
243242
*/
244-
int
243+
int
245244
secure_open_server (Port*port)
246245
{
247246
intr=0;
@@ -373,7 +372,7 @@ secure_write (Port *port, const void *ptr, size_t len)
373372
*Load precomputed DH parameters.
374373
*
375374
*To prevent "downgrade" attacks, we perform a number of checks
376-
*to verify that the DBA-generated DH parameters file contains
375+
*to verify that the DBA-generated DH parameters file contains
377376
*what we expect it to contain.
378377
*/
379378
staticDH*
@@ -415,7 +414,7 @@ load_dh_file (int keylength)
415414
elog(LOG,"DH error (%s): p is not prime",fnbuf);
416415
returnNULL;
417416
}
418-
if ((codes&DH_NOT_SUITABLE_GENERATOR)&&
417+
if ((codes&DH_NOT_SUITABLE_GENERATOR)&&
419418
(codes&DH_CHECK_P_NOT_SAFE_PRIME))
420419
{
421420
elog(LOG,
@@ -520,7 +519,7 @@ tmp_dh_cb (SSL *s, int is_export, int keylength)
520519
elog(DEBUG1,"DH: generating parameters (%d bits)....",keylength);
521520
r=DH_generate_parameters(keylength,DH_GENERATOR_2,NULL,NULL);
522521
}
523-
522+
524523
returnr;
525524
}
526525

@@ -585,7 +584,7 @@ initialize_SSL (void)
585584
{
586585
charfnbuf[2048];
587586
structstatbuf;
588-
587+
589588
if (!SSL_context)
590589
{
591590
SSL_library_init();
@@ -648,7 +647,7 @@ initialize_SSL (void)
648647
fnbuf,SSLerrmessage());
649648
ExitPostmaster(1);
650649
}
651-
SSL_CTX_set_verify(SSL_context,
650+
SSL_CTX_set_verify(SSL_context,
652651
SSL_VERIFY_PEER |SSL_VERIFY_CLIENT_ONCE,verify_cb);
653652

654653
return0;

‎src/backend/port/Makefile

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,43 +13,37 @@
1313
# be converted to Method 2.
1414
#
1515
# IDENTIFICATION
16-
# $Header: /cvsroot/pgsql/src/backend/port/Makefile,v 1.13 2002/05/05 16:02:37 tgl Exp $
16+
# $Header: /cvsroot/pgsql/src/backend/port/Makefile,v 1.14 2002/07/15 21:34:04 momjian Exp $
1717
#
1818
#-------------------------------------------------------------------------
1919

2020
subdir = src/backend/port
2121
top_builddir = ../../..
2222
include$(top_builddir)/src/Makefile.global
2323

24-
OBJS =dynloader.o pg_sema.o pg_shmem.o
24+
OBJS=dynloader.o pg_sema.o pg_shmem.o
2525

26-
OBJS +=$(GETHOSTNAME)$(GETRUSAGE)$(INET_ATON)$(ISINF)$(MEMCMP)\
27-
$(MISSING_RANDOM)$(SNPRINTF)$(SRANDOM)$(STRCASECMP)$(STRERROR)\
28-
$(STRTOL)$(STRTOUL)
26+
OBJS+=$(GETHOSTNAME)$(GETRUSAGE)$(INET_ATON)$(ISINF)$(MEMCMP)\
27+
$(MISSING_RANDOM)$(SNPRINTF)$(SRANDOM)$(STRCASECMP)$(STRDUP)\
28+
$(STRERROR)$(STRTOL)$(STRTOUL)
2929

30-
OBJS +=$(TAS)
30+
OBJS+=$(TAS)
3131

32-
ifdefSTRDUP
33-
OBJS +=$(top_builddir)/src/utils/strdup.o
34-
endif
3532
ifeq ($(PORTNAME), qnx4)
36-
OBJS +=getrusage.o qnx4/SUBSYS.o
33+
OBJS+=getrusage.o qnx4/SUBSYS.o
3734
endif
3835
ifeq ($(PORTNAME), beos)
39-
OBJS +=beos/SUBSYS.o
36+
OBJS+=beos/SUBSYS.o
4037
endif
4138
ifeq ($(PORTNAME), darwin)
42-
OBJS +=darwin/SUBSYS.o
39+
OBJS+=darwin/SUBSYS.o
4340
endif
4441

4542
all: SUBSYS.o
4643

4744
SUBSYS.o:$(OBJS)
4845
$(LD)$(LDREL)$(LDOUT)$@$^
4946

50-
$(top_builddir)/src/utils/strdup.o:
51-
$(MAKE) -C$(top_builddir)/src/utils strdup.o
52-
5347
qnx4/SUBSYS.o: qnx4.dir
5448

5549
qnx4.dir:

‎src/bin/pg_dump/Makefile

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
66
# Portions Copyright (c) 1994, Regents of the University of California
77
#
8-
# $Header: /cvsroot/pgsql/src/bin/pg_dump/Makefile,v 1.34 2002/07/06 20:12:30 momjian Exp $
8+
# $Header: /cvsroot/pgsql/src/bin/pg_dump/Makefile,v 1.35 2002/07/15 21:34:05 momjian Exp $
99
#
1010
#-------------------------------------------------------------------------
1111

@@ -14,21 +14,8 @@ top_builddir = ../../..
1414
include$(top_builddir)/src/Makefile.global
1515

1616
OBJS= pg_backup_archiver.o pg_backup_db.o pg_backup_custom.o\
17-
pg_backup_files.o pg_backup_null.o pg_backup_tar.o sprompt.o
18-
19-
ifdefSTRDUP
20-
OBJS+=$(top_builddir)/src/utils/strdup.o
21-
22-
$(top_builddir)/src/utils/strdup.o:
23-
$(MAKE) -C$(top_builddir)/src/utils strdup.o
24-
endif
25-
26-
ifdefSTRTOUL
27-
OBJS+=$(top_builddir)/src/backend/port/strtoul.o
28-
29-
$(top_builddir)/src/backend/port/strtoul.o:
30-
$(MAKE) -C$(top_builddir)/src/backend/port strtoul.o
31-
endif
17+
pg_backup_files.o pg_backup_null.o pg_backup_tar.o sprompt.o\
18+
$(STRDUP)$(STRTOUL)
3219

3320
overrideCPPFLAGS := -I$(libpq_srcdir)$(CPPFLAGS)
3421

‎src/bin/psql/Makefile

Lines changed: 5 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
66
# Portions Copyright (c) 1994, Regents of the University of California
77
#
8-
# $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.33 2002/07/06 20:12:30 momjian Exp $
8+
# $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.34 2002/07/15 21:34:05 momjian Exp $
99
#
1010
#-------------------------------------------------------------------------
1111

@@ -17,42 +17,13 @@ REFDOCDIR= $(top_srcdir)/doc/src/sgml/ref
1717

1818
overrideCPPFLAGS := -I$(libpq_srcdir)$(CPPFLAGS)
1919

20-
OBJS=command.o common.o help.o input.o stringutils.o mainloop.o\
21-
copy.o startup.o prompt.o variables.o large_obj.o print.o describe.o\
22-
sprompt.o tab-complete.o mbprint.o
20+
OBJS=command.o common.o help.o input.o stringutils.o mainloop.o copy.o\
21+
startup.o prompt.o variables.o large_obj.o print.o describe.o\
22+
sprompt.o tab-complete.o mbprint.o$(SNPRINTF)$(STRDUP)\
23+
$(STRERROR)$(STRTOUL)
2324

2425
all: submake psql
2526

26-
ifdefSTRDUP
27-
OBJS+=$(top_builddir)/src/utils/strdup.o
28-
29-
$(top_builddir)/src/utils/strdup.o:
30-
$(MAKE) -C$(top_builddir)/src/utils strdup.o
31-
endif
32-
33-
# Move these to the utils directory?
34-
35-
ifdefSTRERROR
36-
OBJS+=$(top_builddir)/src/backend/port/strerror.o
37-
38-
$(top_builddir)/src/backend/port/strerror.o:
39-
$(MAKE) -C$(top_builddir)/src/backend/port strerror.o
40-
endif
41-
42-
ifdefSNPRINTF
43-
OBJS+=$(top_builddir)/src/backend/port/snprintf.o
44-
45-
$(top_builddir)/src/backend/port/snprintf.o:
46-
$(MAKE) -C$(top_builddir)/src/backend/port snprintf.o
47-
endif
48-
49-
ifdefSTRTOUL
50-
OBJS+=$(top_builddir)/src/backend/port/strtoul.o
51-
52-
$(top_builddir)/src/backend/port/strtoul.o:
53-
$(MAKE) -C$(top_builddir)/src/backend/port strtoul.o
54-
endif
55-
5627
# End of hacks for picking up backend 'port' modules
5728

5829
psql:$(OBJS)$(libpq_builddir)/libpq.a

0 commit comments

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