mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove useless symbol from Makefile.global.

Browse Source 
I added HAVE_IPV6 to Makefile.global way back in commit 7703e55c3
so that we could transmit its value to the shell-script version of
initdb.  Since initdb was rewritten in C, it's been finding that
out from pg_config.h instead, so this is useless.  Keeping it here
just wastes configure and make cycles, plus it's a potential
two-sources-of-truth problem.
This commit is contained in:
Tom Lane 2018-11-06 10:57:51 -05:00
parent 9e12fb02b7
commit 8f623bedfb
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -650,7 +650,6 @@ PG_CRC32C_OBJS
CFLAGS_ARMV8_CRC32C CFLAGS_ARMV8_CRC32C
CFLAGS_SSE42 CFLAGS_SSE42
have_win32_dbghelp have_win32_dbghelp
HAVE_IPV6
LIBOBJS LIBOBJS
UUID_LIBS UUID_LIBS
LDAP_LIBS_BE LDAP_LIBS_BE
@ -15347,7 +15346,6 @@ cat >>confdefs.h <<_ACEOF
_ACEOF _ACEOF
HAVE_IPV6=no
ac_fn_c_check_type "$LINENO" "struct sockaddr_in6" "ac_cv_type_struct_sockaddr_in6" "$ac_includes_default ac_fn_c_check_type "$LINENO" "struct sockaddr_in6" "ac_cv_type_struct_sockaddr_in6" "$ac_includes_default
#include <netinet/in.h> #include <netinet/in.h>
" "
@ -15355,11 +15353,9 @@ if test "x$ac_cv_type_struct_sockaddr_in6" = xyes; then :
$as_echo "#define HAVE_IPV6 1" >>confdefs.h $as_echo "#define HAVE_IPV6 1" >>confdefs.h
HAVE_IPV6=yes
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PS_STRINGS" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PS_STRINGS" >&5
$as_echo_n "checking for PS_STRINGS... " >&6; } $as_echo_n "checking for PS_STRINGS... " >&6; }
if ${pgac_cv_var_PS_STRINGS+:} false; then : if ${pgac_cv_var_PS_STRINGS+:} false; then :

5
configure.in
View File

@ -1652,14 +1652,11 @@ AC_CHECK_DECLS(F_FULLFSYNC, [], [], [#include <fcntl.h>])
AC_CHECK_DECLS([RTLD_GLOBAL, RTLD_NOW], [], [], [#include <dlfcn.h>]) AC_CHECK_DECLS([RTLD_GLOBAL, RTLD_NOW], [], [], [#include <dlfcn.h>])
HAVE_IPV6=no
AC_CHECK_TYPE([struct sockaddr_in6], AC_CHECK_TYPE([struct sockaddr_in6],
[AC_DEFINE(HAVE_IPV6, 1, [Define to 1 if you have support for IPv6.]) [AC_DEFINE(HAVE_IPV6, 1, [Define to 1 if you have support for IPv6.])],
HAVE_IPV6=yes],
[], [],
[$ac_includes_default [$ac_includes_default
#include <netinet/in.h>]) #include <netinet/in.h>])
AC_SUBST(HAVE_IPV6)
AC_CACHE_CHECK([for PS_STRINGS], [pgac_cv_var_PS_STRINGS], AC_CACHE_CHECK([for PS_STRINGS], [pgac_cv_var_PS_STRINGS],
[AC_LINK_IFELSE([AC_LANG_PROGRAM( [AC_LINK_IFELSE([AC_LANG_PROGRAM(

3
src/Makefile.global.in
View File

@ -497,9 +497,6 @@ host_tuple = @host@
host_os = @host_os@ host_os = @host_os@
host_cpu = @host_cpu@ host_cpu = @host_cpu@
# Make HAVE_IPV6 available for initdb script creation
HAVE_IPV6= @HAVE_IPV6@
# This is mainly for use on FreeBSD, where we have both a.out and elf # This is mainly for use on FreeBSD, where we have both a.out and elf
# systems now. May be applicable to other systems to? # systems now. May be applicable to other systems to?
ELF_SYSTEM= @ELF_SYS@ ELF_SYSTEM= @ELF_SYS@