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

Commite975c1a

Browse files
committed
Add support for MSYS2
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
1 parent9aafc45 commite975c1a

File tree

2 files changed

+10
-14
lines changed

2 files changed

+10
-14
lines changed

‎configure

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2946,7 +2946,7 @@ else
29462946

29472947
case $host_os in
29482948
aix*) template=aix ;;
2949-
cygwin*) template=cygwin ;;
2949+
cygwin*|msys*) template=cygwin ;;
29502950
darwin*) template=darwin ;;
29512951
dragonfly*) template=netbsd ;;
29522952
freebsd*) template=freebsd ;;
@@ -15856,24 +15856,22 @@ fi
1585615856

1585715857

1585815858

15859-
case $host_os in
15859+
if test "$PORTNAME" = "win32" -o "$PORTNAME" = "cygwin"; then
1586015860
# Cygwin and (apparently, based on test results) Mingw both
1586115861
# have a broken strtof(), so substitute the same replacement
1586215862
# code we use with VS2013. That's not a perfect fix, since
1586315863
# (unlike with VS2013) it doesn't avoid double-rounding, but
1586415864
# we have no better options. To get that, though, we have to
1586515865
# force the file to be compiled despite HAVE_STRTOF.
15866-
mingw*|cygwin*)
15867-
case " $LIBOBJS " in
15866+
case " $LIBOBJS " in
1586815867
*" strtof.$ac_objext "* ) ;;
1586915868
*) LIBOBJS="$LIBOBJS strtof.$ac_objext"
1587015869
;;
1587115870
esac
1587215871

15873-
{ $as_echo "$as_me:${as_lineno-$LINENO}: On $host_os we will use our strtof wrapper." >&5
15872+
{ $as_echo "$as_me:${as_lineno-$LINENO}: On $host_os we will use our strtof wrapper." >&5
1587415873
$as_echo "$as_me: On $host_os we will use our strtof wrapper." >&6;}
15875-
;;
15876-
esac
15874+
fi
1587715875

1587815876
case $host_os in
1587915877
# Windows uses a specialised env handler

‎configure.in

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ PGAC_ARG_REQ(with, template, [NAME], [override operating system template],
5959

6060
case $host_os in
6161
aix*) template=aix ;;
62-
cygwin*) template=cygwin ;;
62+
cygwin*|msys*) template=cygwin ;;
6363
darwin*) template=darwin ;;
6464
dragonfly*) template=netbsd ;;
6565
freebsd*) template=freebsd ;;
@@ -1744,18 +1744,16 @@ AC_REPLACE_FUNCS(m4_normalize([
17441744
strtof
17451745
]))
17461746

1747-
case $host_os in
1747+
if test "$PORTNAME" = "win32" -o "$PORTNAME" = "cygwin"; then
17481748
# Cygwin and (apparently, based on test results) Mingw both
17491749
# have a broken strtof(), so substitute the same replacement
17501750
# code we use with VS2013. That's not a perfect fix, since
17511751
# (unlike with VS2013) it doesn't avoid double-rounding, but
17521752
# we have no better options. To get that, though, we have to
17531753
# force the file to be compiled despite HAVE_STRTOF.
1754-
mingw*|cygwin*)
1755-
AC_LIBOBJ([strtof])
1756-
AC_MSG_NOTICE([On $host_os we will use our strtof wrapper.])
1757-
;;
1758-
esac
1754+
AC_LIBOBJ([strtof])
1755+
AC_MSG_NOTICE([On $host_os we will use our strtof wrapper.])
1756+
fi
17591757

17601758
case $host_os in
17611759
# Windows uses a specialised env handler

0 commit comments

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