diff --git a/.gitlab/before_script/linux/alpine/install_deps.sh b/.gitlab/before_script/linux/alpine/install_deps.sh index 54c71f0..84ee22b 100755 --- a/.gitlab/before_script/linux/alpine/install_deps.sh +++ b/.gitlab/before_script/linux/alpine/install_deps.sh @@ -21,9 +21,9 @@ apk add --no-cache \ ln -s libncurses.so /usr/lib/libtinfo.so ln -s libncursesw.so.6 /usr/lib/libtinfow.so.6 if [ "${BIT}" = "32" ] ; then - curl -sSfL https://downloads.haskell.org/~ghcup/0.1.4/i386-linux-ghcup-0.1.4 > ./ghcup-bin + curl -sSfL https://downloads.haskell.org/~ghcup/0.1.5/i386-linux-ghcup-0.1.5 > ./ghcup-bin else - curl -sSfL https://downloads.haskell.org/~ghcup/0.1.4/x86_64-linux-ghcup-0.1.4 > ./ghcup-bin + curl -sSfL https://downloads.haskell.org/~ghcup/0.1.5/x86_64-linux-ghcup-0.1.5 > ./ghcup-bin fi chmod +x ghcup-bin ./ghcup-bin upgrade @@ -57,7 +57,8 @@ apk add --no-cache \ openssl-dev \ openssl-libs-static \ xz \ - xz-dev - + xz-dev \ + ncurses-static +ln -s libncursesw.a /usr/lib/libtinfow.a diff --git a/3rdparty/libarchive/c/autoconf-linux/config.h b/3rdparty/libarchive/c/autoconf-linux/config.h index 1c58dfb..8441ce1 100644 --- a/3rdparty/libarchive/c/autoconf-linux/config.h +++ b/3rdparty/libarchive/c/autoconf-linux/config.h @@ -260,7 +260,7 @@ /* #undef HAVE_ACL_IS_TRIVIAL_NP */ /* Define to 1 if you have the header file. */ -#define HAVE_ACL_LIBACL_H 1 +/* #undef HAVE_ACL_LIBACL_H */ /* Define to 1 if the system has the type `acl_permset_t'. */ /* #undef HAVE_ACL_PERMSET_T */ @@ -453,6 +453,7 @@ /* #undef HAVE_EXPAT_H */ /* Define to 1 if you have the header file. */ +/* #undef HAVE_EXT2FS_EXT2_FS_H */ /* Define to 1 if you have the `extattr_get_fd' function. */ /* #undef HAVE_EXTATTR_GET_FD */ @@ -605,7 +606,7 @@ /* #undef HAVE_LCHFLAGS */ /* Define to 1 if you have the `lchmod' function. */ -/* #undef HAVE_LCHMOD */ +#define HAVE_LCHMOD 1 /* Define to 1 if you have the `lchown' function. */ #define HAVE_LCHOWN 1 @@ -1030,7 +1031,7 @@ #define HAVE_STRUCT_TM_TM_GMTOFF 1 /* Define to 1 if `__tm_gmtoff' is a member of `struct tm'. */ -/* #undef HAVE_STRUCT_TM___TM_GMTOFF */ +#define HAVE_STRUCT_TM___TM_GMTOFF 1 /* Define to 1 if the system has the type `struct vfsconf'. */ /* #undef HAVE_STRUCT_VFSCONF */ @@ -1042,9 +1043,10 @@ #define HAVE_SYMLINK 1 /* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_ACL_H */ /* Define to 1 if you have the header file. */ -#define HAVE_SYS_CDEFS_H 1 +/* #undef HAVE_SYS_CDEFS_H */ /* Define to 1 if you have the header file, and it defines `DIR'. */ @@ -1202,7 +1204,7 @@ #define HAVE_WMEMMOVE 1 /* Define to 1 if you have a working EXT2_IOC_GETFLAGS */ -#define HAVE_WORKING_EXT2_IOC_GETFLAGS 1 +/* #undef HAVE_WORKING_EXT2_IOC_GETFLAGS */ /* Define to 1 if you have a working FS_IOC_GETFLAGS */ #define HAVE_WORKING_FS_IOC_GETFLAGS 1 @@ -1289,7 +1291,7 @@ #define STDC_HEADERS 1 /* Define to 1 if strerror_r returns char *. */ -#define STRERROR_R_CHAR_P 1 +/* #undef STRERROR_R_CHAR_P */ /* Define to 1 if you can safely include both and . */ #define TIME_WITH_SYS_TIME 1