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

Add support for MSYS2

Browse Source 
It's basically a variant of Cygwin, so use that template.

Discussion: https://www.postgresql.org/message-id/flat/6b467edc-4018-521f-ab18-171f098557ca%402ndquadrant.com
This commit is contained in:
Peter Eisentraut 2019-12-19 08:28:37 +01:00
parent 9aafc4529f
commit e975c1a602
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure vendored
View File

@ -2946,7 +2946,7 @@ else
case $host_os in case $host_os in
aix*) template=aix ;; aix*) template=aix ;;
cygwin*) template=cygwin ;; cygwin*|msys*) template=cygwin ;;
darwin*) template=darwin ;; darwin*) template=darwin ;;
dragonfly*) template=netbsd ;; dragonfly*) template=netbsd ;;
freebsd*) template=freebsd ;; freebsd*) template=freebsd ;;
@ -15856,24 +15856,22 @@ fi
case $host_os in if test "$PORTNAME" = "win32" -o "$PORTNAME" = "cygwin"; then
# Cygwin and (apparently, based on test results) Mingw both # Cygwin and (apparently, based on test results) Mingw both
# have a broken strtof(), so substitute the same replacement # have a broken strtof(), so substitute the same replacement
# code we use with VS2013. That's not a perfect fix, since # code we use with VS2013. That's not a perfect fix, since
# (unlike with VS2013) it doesn't avoid double-rounding, but # (unlike with VS2013) it doesn't avoid double-rounding, but
# we have no better options. To get that, though, we have to # we have no better options. To get that, though, we have to
# force the file to be compiled despite HAVE_STRTOF. # force the file to be compiled despite HAVE_STRTOF.
mingw*|cygwin*) case " $LIBOBJS " in
case " $LIBOBJS " in
*" strtof.$ac_objext "* ) ;; *" strtof.$ac_objext "* ) ;;
*) LIBOBJS="$LIBOBJS strtof.$ac_objext" *) LIBOBJS="$LIBOBJS strtof.$ac_objext"
;; ;;
esac esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: On $host_os we will use our strtof wrapper." >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: On $host_os we will use our strtof wrapper." >&5
$as_echo "$as_me: On $host_os we will use our strtof wrapper." >&6;} $as_echo "$as_me: On $host_os we will use our strtof wrapper." >&6;}
;; fi
esac
case $host_os in case $host_os in
# Windows uses a specialised env handler # Windows uses a specialised env handler

12
configure.in
View File

@ -59,7 +59,7 @@ PGAC_ARG_REQ(with, template, [NAME], [override operating system template],
case $host_os in case $host_os in
aix*) template=aix ;; aix*) template=aix ;;
cygwin*) template=cygwin ;; cygwin*|msys*) template=cygwin ;;
darwin*) template=darwin ;; darwin*) template=darwin ;;
dragonfly*) template=netbsd ;; dragonfly*) template=netbsd ;;
freebsd*) template=freebsd ;; freebsd*) template=freebsd ;;
@ -1744,18 +1744,16 @@ AC_REPLACE_FUNCS(m4_normalize([
strtof strtof
])) ]))
case $host_os in if test "$PORTNAME" = "win32" -o "$PORTNAME" = "cygwin"; then
# Cygwin and (apparently, based on test results) Mingw both # Cygwin and (apparently, based on test results) Mingw both
# have a broken strtof(), so substitute the same replacement # have a broken strtof(), so substitute the same replacement
# code we use with VS2013. That's not a perfect fix, since # code we use with VS2013. That's not a perfect fix, since
# (unlike with VS2013) it doesn't avoid double-rounding, but # (unlike with VS2013) it doesn't avoid double-rounding, but
# we have no better options. To get that, though, we have to # we have no better options. To get that, though, we have to
# force the file to be compiled despite HAVE_STRTOF. # force the file to be compiled despite HAVE_STRTOF.
mingw*|cygwin*) AC_LIBOBJ([strtof])
AC_LIBOBJ([strtof]) AC_MSG_NOTICE([On $host_os we will use our strtof wrapper.])
AC_MSG_NOTICE([On $host_os we will use our strtof wrapper.]) fi
;;
esac
case $host_os in case $host_os in
# Windows uses a specialised env handler # Windows uses a specialised env handler