Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix Windows cross-compilation in newer environments #1728

Merged
merged 2 commits into from
Jun 12, 2020
Merged

Fix Windows cross-compilation in newer environments #1728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1d2cf6
Fix detection for MinGW gmtime_* functions
cyrossignol Jun 12, 2020
8dd8363
Fix depends bzip2 recipe for MinGW cross-compilation
cyrossignol Jun 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 21 additions & 5 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ AC_ARG_ENABLE([lcov],
[enable lcov testing (default is no)])],
[use_lcov=yes],
[use_lcov=no])

AC_ARG_ENABLE([lcov-branch-coverage],
[AS_HELP_STRING([--enable-lcov-branch-coverage],
[enable lcov testing branch coverage (default is no)])],
Expand Down Expand Up @@ -741,6 +741,22 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([
]
)

dnl check for gmtime_r(), fallback to gmtime_s() if that is unavailable
dnl fail if neither are available.
AC_MSG_CHECKING(for gmtime_r)
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <ctime>]],
[[ gmtime_r((const time_t *) nullptr, (struct tm *) nullptr); ]])],
[ AC_MSG_RESULT(yes); AC_DEFINE(HAVE_GMTIME_R, 1, [Define this symbol if gmtime_r is available]) ],
[ AC_MSG_RESULT(no);
AC_MSG_CHECKING(for gmtime_s);
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <ctime>]],
[[ gmtime_s((struct tm *) nullptr, (const time_t *) nullptr); ]])],
[ AC_MSG_RESULT(yes)],
[ AC_MSG_RESULT(no); AC_MSG_ERROR(Both gmtime_r and gmtime_s are unavailable) ]
)
]
)

# Check for different ways of gathering OS randomness
AC_MSG_CHECKING(for Linux getrandom syscall)
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>
Expand Down Expand Up @@ -1228,7 +1244,7 @@ AC_SUBST(MINIUPNPC_CPPFLAGS)
AC_SUBST(MINIUPNPC_LIBS)
AC_SUBST(CRYPTO_LIBS)
AC_SUBST(SSL_LIBS)
AC_SUBST(CURL_LIBS)
AC_SUBST(CURL_LIBS)
AC_SUBST(LIBZIP_LIBS)
AC_SUBST(EVENT_LIBS)
AC_SUBST(EVENT_PTHREADS_LIBS)
Expand Down Expand Up @@ -1286,7 +1302,7 @@ case ${OS} in
;;
esac

echo
echo
echo "Options used to compile and link:"
echo " with wallet = $enable_wallet"
echo " with gui / qt = $bitcoin_enable_qt"
Expand All @@ -1300,7 +1316,7 @@ echo " with bench = $use_bench"
echo " with upnp = $use_upnp"
echo " debug enabled = $enable_debug"
echo " werror = $enable_werror"
echo
echo
echo " target os = $TARGET_OS"
echo " build os = $BUILD_OS"
echo
Expand All @@ -1312,4 +1328,4 @@ echo " CXXFLAGS = $CXXFLAGS"
echo " LDFLAGS = $LDFLAGS"
echo " AS = $CCAS"
echo " ASFLAGS = $CCASFLAGS"
echo
echo
8 changes: 5 additions & 3 deletions depends/packages/bzip2.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,12 @@ define $(package)_config_cmds
endef

define $(package)_build_cmds
$($(package)_build_opts) $(MAKE) install PREFIX=local_build
$($(package)_build_opts) $(MAKE) libbz2.a
endef

define $(package)_stage_cmds
cp -a local_build/. $($(package)_staging_dir)/$(host_prefix)
mkdir $($(package)_staging_prefix_dir)/include && \
cp -f bzlib.h $($(package)_staging_prefix_dir)/include && \
mkdir $($(package)_staging_prefix_dir)/lib && \
cp -f libbz2.a $($(package)_staging_prefix_dir)/lib
endef

13 changes: 2 additions & 11 deletions depends/patches/bzip2/Makefile.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
+++ Makefile 2019-10-28 13:31:36.918640240 -0400
@@ -15,10 +15,10 @@
SHELL=/bin/sh

# To assist in cross-compiling
-CC=gcc
-AR=ar
Expand All @@ -12,15 +12,6 @@
+# AR=ar
+# RANLIB=ranlib
+# LDFLAGS=

BIGFILES=-D_FILE_OFFSET_BITS=64
CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
@@ -35,7 +35,7 @@
decompress.o \
bzlib.o

-all: libbz2.a bzip2 bzip2recover test
+all: libbz2.a bzip2 bzip2recover

bzip2: libbz2.a bzip2.o
$(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2
16 changes: 10 additions & 6 deletions src/util/time.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,22 +101,26 @@ void MilliSleep(int64_t n)
std::string FormatISO8601DateTime(int64_t nTime) {
struct tm ts;
time_t time_val = nTime;
#ifdef _MSC_VER
gmtime_s(&ts, &time_val);
#ifdef HAVE_GMTIME_R
if (gmtime_r(&time_val, &ts) == nullptr) {
#else
gmtime_r(&time_val, &ts);
if (gmtime_s(&ts, &time_val) != 0) {
#endif
return {};
}
return strprintf("%04i-%02i-%02iT%02i:%02i:%02iZ", ts.tm_year + 1900, ts.tm_mon + 1, ts.tm_mday, ts.tm_hour, ts.tm_min, ts.tm_sec);
}

std::string FormatISO8601Date(int64_t nTime) {
struct tm ts;
time_t time_val = nTime;
#ifdef _MSC_VER
gmtime_s(&ts, &time_val);
#ifdef HAVE_GMTIME_R
if (gmtime_r(&time_val, &ts) == nullptr) {
#else
gmtime_r(&time_val, &ts);
if (gmtime_s(&ts, &time_val) != 0) {
#endif
return {};
}
return strprintf("%04i-%02i-%02i", ts.tm_year + 1900, ts.tm_mon + 1, ts.tm_mday);
}

Expand Down