From c3df30837ec2439d18c5515906072dc3306c0795 Mon Sep 17 00:00:00 2001 From: Evan Miller Date: Thu, 30 Sep 2021 09:53:04 -0400 Subject: [PATCH] Fix appveyor build --- appveyor.yml | 5 +++-- configure.ac | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 0ce80f3..e12ed4f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,8 +17,10 @@ clone_folder: c:\projects\mdbtools skip_tags: true +# Installing packages leads to the error: +# Can't locate threads.pm in @INC (you may need to install the threads module) +# So disable the SQL tests on this platform for now build_script: - - C:\cygwin64\setup-x86_64.exe -q -P bison -P flex -P libiconv-devel - C:\cygwin64\bin\sh -lc "cd /cygdrive/c/projects/mdbtools && git clone https://github.com/mdbtools/mdbtestdata.git test" - C:\cygwin64\bin\sh -lc "cd /cygdrive/c/projects/mdbtools && autoreconf -i -f" - C:\cygwin64\bin\sh -lc "cd /cygdrive/c/projects/mdbtools && ./configure --disable-man --disable-silent-rules" @@ -26,4 +28,3 @@ build_script: test_script: - C:\cygwin64\bin\sh -lc "cd /cygdrive/c/projects/mdbtools && ./test_script.sh" - - C:\cygwin64\bin\sh -lc "cd /cygdrive/c/projects/mdbtools && ./test_sql.sh" diff --git a/configure.ac b/configure.ac index 85996c0..c75345d 100644 --- a/configure.ac +++ b/configure.ac @@ -86,7 +86,7 @@ AC_SUBST(LFLAGS) CFLAGS="$CFLAGS -Wall -Werror" LOCALE_T=locale_t AS_CASE([$host], - [*mingw*|*cygwin*], [LDFLAGS="$LDFLAGS -no-undefined" LOCALE_T=_locale_t], []) + [*mingw*], [LDFLAGS="$LDFLAGS -no-undefined" LOCALE_T=_locale_t], []) AC_SUBST(LOCALE_T) dnl See if iconv is present and wanted