-
Notifications
You must be signed in to change notification settings - Fork 7.7k
[libpq] mingw support #16740
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
nicole mazzuca (strega-nil)
merged 10 commits into
microsoft:master
from
longnguyen2004:libpq-mingw
Apr 20, 2021
Merged
[libpq] mingw support #16740
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
1067db2
[libpq] mingw support
longnguyen2004 8ae0119
[libpq] Let libpq decides whether to build _shlib or not
longnguyen2004 6b5efd6
[libpq] Always run install-lib-static on mingw
longnguyen2004 87c1639
[libpq] Rename .a to .dll.a and move .dll to correct folder
longnguyen2004 85f9533
[libpq] Create bin folder for mingw
longnguyen2004 67b63b8
[vcpkg baseline] Update libpq
longnguyen2004 698c577
[libpq] Link with crypt32 on mingw
longnguyen2004 970251f
[vcpkg baseline] Update libpq
longnguyen2004 ccdd933
[libpq] Fix release/debug only build
longnguyen2004 1745392
[vcpkg baseline] Update libpq
longnguyen2004 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,186 @@ | ||
| diff --git a/configure b/configure | ||
| index c22d3de..75210f0 100755 | ||
| --- a/configure | ||
| +++ b/configure | ||
| @@ -11777,13 +11789,13 @@ Use --without-readline to disable readline support." "$LINENO" 5 | ||
| fi | ||
|
|
||
| if test "$with_zlib" = yes; then | ||
| - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflate in -lz" >&5 | ||
| -$as_echo_n "checking for inflate in -lz... " >&6; } | ||
| -if ${ac_cv_lib_z_inflate+:} false; then : | ||
| + if test "$enable_debug" = yes; then | ||
| + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inflate" >&5 | ||
| +$as_echo_n "checking for library containing inflate... " >&6; } | ||
| +if ${ac_cv_search_inflate+:} false; then : | ||
| $as_echo_n "(cached) " >&6 | ||
| else | ||
| - ac_check_lib_save_LIBS=$LIBS | ||
| -LIBS="-lz $LIBS" | ||
| + ac_func_search_save_LIBS=$LIBS | ||
| cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
| /* end confdefs.h. */ | ||
|
|
||
| @@ -11802,23 +11814,101 @@ return inflate (); | ||
| return 0; | ||
| } | ||
| _ACEOF | ||
| -if ac_fn_c_try_link "$LINENO"; then : | ||
| - ac_cv_lib_z_inflate=yes | ||
| -else | ||
| - ac_cv_lib_z_inflate=no | ||
| +for ac_lib in '' zd zlibd zlib1d z zlib zlib1; do | ||
| + if test -z "$ac_lib"; then | ||
| + ac_res="none required" | ||
| + else | ||
| + ac_res=-l$ac_lib | ||
| + LIBS="-l$ac_lib $ac_func_search_save_LIBS" | ||
| + fi | ||
| + if ac_fn_c_try_link "$LINENO"; then : | ||
| + ac_cv_search_inflate=$ac_res | ||
| fi | ||
| rm -f core conftest.err conftest.$ac_objext \ | ||
| - conftest$ac_exeext conftest.$ac_ext | ||
| -LIBS=$ac_check_lib_save_LIBS | ||
| + conftest$ac_exeext | ||
| + if ${ac_cv_search_inflate+:} false; then : | ||
| + break | ||
| fi | ||
| -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflate" >&5 | ||
| -$as_echo "$ac_cv_lib_z_inflate" >&6; } | ||
| -if test "x$ac_cv_lib_z_inflate" = xyes; then : | ||
| - cat >>confdefs.h <<_ACEOF | ||
| -#define HAVE_LIBZ 1 | ||
| +done | ||
| +if ${ac_cv_search_inflate+:} false; then : | ||
| + | ||
| +else | ||
| + ac_cv_search_inflate=no | ||
| +fi | ||
| +rm conftest.$ac_ext | ||
| +LIBS=$ac_func_search_save_LIBS | ||
| +fi | ||
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inflate" >&5 | ||
| +$as_echo "$ac_cv_search_inflate" >&6; } | ||
| +ac_res=$ac_cv_search_inflate | ||
| +if test "$ac_res" != no; then : | ||
| + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" | ||
| + | ||
| +$as_echo "#define HAVE_LIBZ 1" >>confdefs.h | ||
| + | ||
| +else | ||
| + as_fn_error $? "zlib library not found | ||
| +If you have zlib already installed, see config.log for details on the | ||
| +failure. It is possible the compiler isn't looking in the proper directory. | ||
| +Use --without-zlib to disable zlib support." "$LINENO" 5 | ||
| +fi | ||
| + | ||
| + else | ||
| + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inflate" >&5 | ||
| +$as_echo_n "checking for library containing inflate... " >&6; } | ||
| +if ${ac_cv_search_inflate+:} false; then : | ||
| + $as_echo_n "(cached) " >&6 | ||
| +else | ||
| + ac_func_search_save_LIBS=$LIBS | ||
| +cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
| +/* end confdefs.h. */ | ||
| + | ||
| +/* Override any GCC internal prototype to avoid an error. | ||
| + Use char because int might match the return type of a GCC | ||
| + builtin and then its argument prototype would still apply. */ | ||
| +#ifdef __cplusplus | ||
| +extern "C" | ||
| +#endif | ||
| +char inflate (); | ||
| +int | ||
| +main () | ||
| +{ | ||
| +return inflate (); | ||
| + ; | ||
| + return 0; | ||
| +} | ||
| _ACEOF | ||
| +for ac_lib in '' z zlib zlib1; do | ||
| + if test -z "$ac_lib"; then | ||
| + ac_res="none required" | ||
| + else | ||
| + ac_res=-l$ac_lib | ||
| + LIBS="-l$ac_lib $ac_func_search_save_LIBS" | ||
| + fi | ||
| + if ac_fn_c_try_link "$LINENO"; then : | ||
| + ac_cv_search_inflate=$ac_res | ||
| +fi | ||
| +rm -f core conftest.err conftest.$ac_objext \ | ||
| + conftest$ac_exeext | ||
| + if ${ac_cv_search_inflate+:} false; then : | ||
| + break | ||
| +fi | ||
| +done | ||
| +if ${ac_cv_search_inflate+:} false; then : | ||
|
|
||
| - LIBS="-lz $LIBS" | ||
| +else | ||
| + ac_cv_search_inflate=no | ||
| +fi | ||
| +rm conftest.$ac_ext | ||
| +LIBS=$ac_func_search_save_LIBS | ||
| +fi | ||
| +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inflate" >&5 | ||
| +$as_echo "$ac_cv_search_inflate" >&6; } | ||
| +ac_res=$ac_cv_search_inflate | ||
| +if test "$ac_res" != no; then : | ||
| + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" | ||
| + | ||
| +$as_echo "#define HAVE_LIBZ 1" >>confdefs.h | ||
|
|
||
| else | ||
| as_fn_error $? "zlib library not found | ||
| @@ -11827,6 +11917,7 @@ failure. It is possible the compiler isn't looking in the proper directory. | ||
| Use --without-zlib to disable zlib support." "$LINENO" 5 | ||
| fi | ||
|
|
||
| + fi | ||
| fi | ||
|
|
||
| if test "$enable_spinlocks" = yes; then | ||
| diff --git a/configure.in b/configure.in | ||
| index 976f90d..e3cd80b 100644 | ||
| --- a/configure.in | ||
| +++ b/configure.in | ||
| @@ -1170,11 +1170,21 @@ Use --without-readline to disable readline support.]) | ||
| fi | ||
|
|
||
| if test "$with_zlib" = yes; then | ||
| - AC_CHECK_LIB(z, inflate, [], | ||
| - [AC_MSG_ERROR([zlib library not found | ||
| + if test "$enable_debug" = yes; then | ||
| + AC_SEARCH_LIBS(inflate, [zd zlibd zlib1d z zlib zlib1], | ||
| + [AC_DEFINE([HAVE_LIBZ], [1], [Define to 1 if you have the `z' library.])], | ||
| + [AC_MSG_ERROR([zlib library not found | ||
| If you have zlib already installed, see config.log for details on the | ||
| failure. It is possible the compiler isn't looking in the proper directory. | ||
| Use --without-zlib to disable zlib support.])]) | ||
| + else | ||
| + AC_SEARCH_LIBS(inflate, [z zlib zlib1], | ||
| + [AC_DEFINE([HAVE_LIBZ], [1], [Define to 1 if you have the `z' library.])], | ||
| + [AC_MSG_ERROR([zlib library not found | ||
| +If you have zlib already installed, see config.log for details on the | ||
| +failure. It is possible the compiler isn't looking in the proper directory. | ||
| +Use --without-zlib to disable zlib support.])]) | ||
| + fi | ||
| fi | ||
|
|
||
| if test "$enable_spinlocks" = yes; then | ||
| diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in | ||
| index 244886a..29dd35b 100644 | ||
| --- a/src/include/pg_config.h.in | ||
| +++ b/src/include/pg_config.h.in | ||
| @@ -374,7 +374,7 @@ | ||
| /* Define to 1 if you have the `xslt' library (-lxslt). */ | ||
| #undef HAVE_LIBXSLT | ||
|
|
||
| -/* Define to 1 if you have the `z' library (-lz). */ | ||
| +/* Define to 1 if you have the `z' library. */ | ||
| #undef HAVE_LIBZ | ||
|
|
||
| /* Define to 1 if the system has the type `locale_t'. */ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.