Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 404e9a1

Browse files
bmomjianbmomjian
committed
Move libc replacement files from src/backend/port to src/port.
1 parent 7f43165 commit 404e9a1

19 files changed

+221
-48
lines changed

‎configure

+15-15
Original file line numberDiff line numberDiff line change
@@ -10745,7 +10745,7 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then
1074510745
_ACEOF
1074610746
1074710747
else
10748-
SNPRINTF='$(top_builddir)/src/backend/port/snprintf.o'
10748+
SNPRINTF='$(top_builddir)/src/port/snprintf.o'
1074910749
fi
1075010750
done
1075110751
@@ -10823,7 +10823,7 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then
1082310823
_ACEOF
1082410824
1082510825
else
10826-
SNPRINTF='$(top_builddir)/src/backend/port/snprintf.o'
10826+
SNPRINTF='$(top_builddir)/src/port/snprintf.o'
1082710827
fi
1082810828
done
1082910829
@@ -11178,7 +11178,7 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then
1117811178
_ACEOF
1117911179
1118011180
else
11181-
GETRUSAGE='$(top_builddir)/src/backend/port/getrusage.o'
11181+
GETRUSAGE='$(top_builddir)/src/port/getrusage.o'
1118211182
fi
1118311183
done
1118411184
@@ -11257,7 +11257,7 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then
1125711257
_ACEOF
1125811258
1125911259
else
11260-
SRANDOM='$(top_builddir)/src/backend/port/srandom.o'
11260+
SRANDOM='$(top_builddir)/src/port/srandom.o'
1126111261
fi
1126211262
done
1126311263
@@ -11336,7 +11336,7 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then
1133611336
_ACEOF
1133711337
1133811338
else
11339-
GETHOSTNAME='$(top_builddir)/src/backend/port/gethostname.o'
11339+
GETHOSTNAME='$(top_builddir)/src/port/gethostname.o'
1134011340
fi
1134111341
done
1134211342
@@ -11415,7 +11415,7 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then
1141511415
_ACEOF
1141611416
1141711417
else
11418-
MISSING_RANDOM='$(top_builddir)/src/backend/port/random.o'
11418+
MISSING_RANDOM='$(top_builddir)/src/port/random.o'
1141911419
fi
1142011420
done
1142111421
@@ -11494,7 +11494,7 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then
1149411494
_ACEOF
1149511495
1149611496
else
11497-
INET_ATON='$(top_builddir)/src/backend/port/inet_aton.o'
11497+
INET_ATON='$(top_builddir)/src/port/inet_aton.o'
1149811498
fi
1149911499
done
1150011500
@@ -11573,7 +11573,7 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then
1157311573
_ACEOF
1157411574
1157511575
else
11576-
STRERROR='$(top_builddir)/src/backend/port/strerror.o'
11576+
STRERROR='$(top_builddir)/src/port/strerror.o'
1157711577
fi
1157811578
done
1157911579
@@ -11652,7 +11652,7 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then
1165211652
_ACEOF
1165311653
1165411654
else
11655-
STRDUP='$(top_builddir)/src/backend/port/strdup.o'
11655+
STRDUP='$(top_builddir)/src/port/strdup.o'
1165611656
fi
1165711657
done
1165811658
@@ -11731,7 +11731,7 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then
1173111731
_ACEOF
1173211732
1173311733
else
11734-
STRTOL='$(top_builddir)/src/backend/port/strtol.o'
11734+
STRTOL='$(top_builddir)/src/port/strtol.o'
1173511735
fi
1173611736
done
1173711737
@@ -11810,7 +11810,7 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then
1181011810
_ACEOF
1181111811
1181211812
else
11813-
STRTOUL='$(top_builddir)/src/backend/port/strtoul.o'
11813+
STRTOUL='$(top_builddir)/src/port/strtoul.o'
1181411814
fi
1181511815
done
1181611816
@@ -11889,7 +11889,7 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then
1188911889
_ACEOF
1189011890
1189111891
else
11892-
STRCASECMP='$(top_builddir)/src/backend/port/strcasecmp.o'
11892+
STRCASECMP='$(top_builddir)/src/port/strcasecmp.o'
1189311893
fi
1189411894
done
1189511895
@@ -12772,7 +12772,7 @@ echo $ECHO_N "checking whether snprintf handles 'long long int' as %lld... $ECHO
1277212772
echo "$as_me:$LINENO: result: assuming not on target machine" >&5
1277312773
echo "${ECHO_T}assuming not on target machine" >&6
1277412774
# Force usage of our own snprintf, since we cannot test foreign snprintf
12775-
SNPRINTF='$(top_builddir)/src/backend/port/snprintf.o'
12775+
SNPRINTF='$(top_builddir)/src/port/snprintf.o'
1277612776
INT64_FORMAT='"%lld"'
1277712777
1277812778
else
@@ -12832,7 +12832,7 @@ echo $ECHO_N "checking whether snprintf handles 'long long int' as %qd... $ECHO_
1283212832
echo "$as_me:$LINENO: result: assuming not on target machine" >&5
1283312833
echo "${ECHO_T}assuming not on target machine" >&6
1283412834
# Force usage of our own snprintf, since we cannot test foreign snprintf
12835-
SNPRINTF='$(top_builddir)/src/backend/port/snprintf.o'
12835+
SNPRINTF='$(top_builddir)/src/port/snprintf.o'
1283612836
INT64_FORMAT='"%lld"'
1283712837
1283812838
else
@@ -12887,7 +12887,7 @@ cat conftest.$ac_ext >&5
1288712887
echo "$as_me:$LINENO: result: no" >&5
1288812888
echo "${ECHO_T}no" >&6
1288912889
# Force usage of our own snprintf, since system snprintf is broken
12890-
SNPRINTF='$(top_builddir)/src/backend/port/snprintf.o'
12890+
SNPRINTF='$(top_builddir)/src/port/snprintf.o'
1289112891
INT64_FORMAT='"%lld"'
1289212892
1289312893
fi

‎configure.in

+16-16
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.191 2002/07/17 02:54:01 momjian Exp $
2+
dnl $Header: /cvsroot/pgsql/configure.in,v 1.192 2002/07/18 04:13:59 momjian Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -871,8 +871,8 @@ fi
871871
# have working "long long int" support -- see below.
872872

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

878878

@@ -904,25 +904,25 @@ fi
904904
AC_SUBST(ISINF)
905905

906906

907-
AC_CHECK_FUNCS(getrusage, [], GETRUSAGE='$(top_builddir)/src/backend/port/getrusage.o')
907+
AC_CHECK_FUNCS(getrusage, [], GETRUSAGE='$(top_builddir)/src/port/getrusage.o')
908908
AC_SUBST(GETRUSAGE)
909-
AC_CHECK_FUNCS(srandom, [], SRANDOM='$(top_builddir)/src/backend/port/srandom.o')
909+
AC_CHECK_FUNCS(srandom, [], SRANDOM='$(top_builddir)/src/port/srandom.o')
910910
AC_SUBST(SRANDOM)
911-
AC_CHECK_FUNCS(gethostname, [], GETHOSTNAME='$(top_builddir)/src/backend/port/gethostname.o')
911+
AC_CHECK_FUNCS(gethostname, [], GETHOSTNAME='$(top_builddir)/src/port/gethostname.o')
912912
AC_SUBST(GETHOSTNAME)
913-
AC_CHECK_FUNCS(random, [], MISSING_RANDOM='$(top_builddir)/src/backend/port/random.o')
913+
AC_CHECK_FUNCS(random, [], MISSING_RANDOM='$(top_builddir)/src/port/random.o')
914914
AC_SUBST(MISSING_RANDOM)
915-
AC_CHECK_FUNCS(inet_aton, [], INET_ATON='$(top_builddir)/src/backend/port/inet_aton.o')
915+
AC_CHECK_FUNCS(inet_aton, [], INET_ATON='$(top_builddir)/src/port/inet_aton.o')
916916
AC_SUBST(INET_ATON)
917-
AC_CHECK_FUNCS(strerror, [], STRERROR='$(top_builddir)/src/backend/port/strerror.o')
917+
AC_CHECK_FUNCS(strerror, [], STRERROR='$(top_builddir)/src/port/strerror.o')
918918
AC_SUBST(STRERROR)
919-
AC_CHECK_FUNCS(strdup, [], STRDUP='$(top_builddir)/src/backend/port/strdup.o')
919+
AC_CHECK_FUNCS(strdup, [], STRDUP='$(top_builddir)/src/port/strdup.o')
920920
AC_SUBST(STRDUP)
921-
AC_CHECK_FUNCS(strtol, [], STRTOL='$(top_builddir)/src/backend/port/strtol.o')
921+
AC_CHECK_FUNCS(strtol, [], STRTOL='$(top_builddir)/src/port/strtol.o')
922922
AC_SUBST(STRTOL)
923-
AC_CHECK_FUNCS(strtoul, [], STRTOUL='$(top_builddir)/src/backend/port/strtoul.o')
923+
AC_CHECK_FUNCS(strtoul, [], STRTOUL='$(top_builddir)/src/port/strtoul.o')
924924
AC_SUBST(STRTOUL)
925-
AC_CHECK_FUNCS(strcasecmp, [], STRCASECMP='$(top_builddir)/src/backend/port/strcasecmp.o')
925+
AC_CHECK_FUNCS(strcasecmp, [], STRCASECMP='$(top_builddir)/src/port/strcasecmp.o')
926926
AC_SUBST(STRCASECMP)
927927

928928
# Set path of dllinit.c for cygwin
@@ -1101,17 +1101,17 @@ main() {
11011101
],
11021102
[ AC_MSG_RESULT(no)
11031103
# Force usage of our own snprintf, since system snprintf is broken
1104-
SNPRINTF='$(top_builddir)/src/backend/port/snprintf.o'
1104+
SNPRINTF='$(top_builddir)/src/port/snprintf.o'
11051105
INT64_FORMAT='"%lld"'
11061106
],
11071107
[ AC_MSG_RESULT(assuming not on target machine)
11081108
# Force usage of our own snprintf, since we cannot test foreign snprintf
1109-
SNPRINTF='$(top_builddir)/src/backend/port/snprintf.o'
1109+
SNPRINTF='$(top_builddir)/src/port/snprintf.o'
11101110
INT64_FORMAT='"%lld"'
11111111
]) ],
11121112
[ AC_MSG_RESULT(assuming not on target machine)
11131113
# Force usage of our own snprintf, since we cannot test foreign snprintf
1114-
SNPRINTF='$(top_builddir)/src/backend/port/snprintf.o'
1114+
SNPRINTF='$(top_builddir)/src/port/snprintf.o'
11151115
INT64_FORMAT='"%lld"'
11161116
])
11171117
else

‎src/backend/port/Makefile

+2-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# be converted to Method 2.
1414
#
1515
# IDENTIFICATION
16-
# $Header: /cvsroot/pgsql/src/backend/port/Makefile,v 1.15 2002/07/16 05:49:38 momjian Exp $
16+
# $Header: /cvsroot/pgsql/src/backend/port/Makefile,v 1.16 2002/07/18 04:13:59 momjian Exp $
1717
#
1818
#-------------------------------------------------------------------------
1919

@@ -23,9 +23,7 @@ include $(top_builddir)/src/Makefile.global
2323

2424
OBJS=dynloader.o pg_sema.o pg_shmem.o
2525

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

3028
OBJS+=$(TAS)
3129

‎src/backend/port/inet_aton.h

-3
This file was deleted.

‎src/port/Makefile

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#-------------------------------------------------------------------------
2+
#
3+
# Makefile--
4+
# Makefile for the port-specific subsystem of the backend
5+
#
6+
# These files are used in other directories for portability on systems
7+
# with broken/missing library files.
8+
9+
# IDENTIFICATION
10+
# $Header: /cvsroot/pgsql/src/port/Makefile,v 1.1 2002/07/18 04:13:59 momjian Exp $
11+
#
12+
#-------------------------------------------------------------------------
13+
14+
subdir = src/port
15+
top_builddir = ../..
16+
include $(top_builddir)/src/Makefile.global
17+
18+
OBJS=$(GETHOSTNAME) $(GETRUSAGE) $(INET_ATON) $(ISINF) $(MEMCMP) \
19+
$(MISSING_RANDOM) $(SNPRINTF) $(SRANDOM) $(STRCASECMP) $(STRDUP) \
20+
$(STRERROR) $(STRTOL) $(STRTOUL)
21+
22+
distclean clean:
23+
rm -f $(OBJS)

‎src/backend/port/gethostname.c renamed to ‎src/port/gethostname.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: gethostname.c,v 1.5 2001/08/24 14:07:49 petere Exp $ */
1+
/* $Id: gethostname.c,v 1.1 2002/07/18 04:13:59 momjian Exp $ */
22

33
#include "c.h"
44

‎src/backend/port/getrusage.c renamed to ‎src/port/getrusage.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: getrusage.c,v 1.11 1998/12/12 19:57:51 momjian Exp $ */
1+
/* $Id: getrusage.c,v 1.1 2002/07/18 04:13:59 momjian Exp $ */
22

33
#include <stdio.h>
44
#include <errno.h>

0 commit comments

Comments
 (0)