commit 10c6b03

hovercats  ·  2024-12-27 23:39:56 +0000 UTC
parent bc2488e 
xz: revert to 5.4.6, as it did not build on my desktop. ill be looking into why later
5 files changed,  +25, -24
M pkg/xz/config.h
M pkg/xz/gen.lua
M pkg/xz/src
M pkg/xz/ver
A probe/HAVE__MM_CLMULEPI64_SI128
M pkg/xz/config.h
+15, -20 
  1@@ -1,12 +1,11 @@
  2 /* #undef AC_APPLE_UNIVERSAL_BUILD */
  3 #define ASSUME_RAM 128
  4 /* #undef ENABLE_NLS */
  5-/* #undef HAVE_ARM64_CRC32 */
  6 /* #undef HAVE_BSWAP_16 */
  7 /* #undef HAVE_BSWAP_32 */
  8 /* #undef HAVE_BSWAP_64 */
  9 /* #undef HAVE_BYTESWAP_H */
 10-/* #undef HAVE_CAP_RIGHTS_LIMIT */
 11+/* #undef HAVE_CAPSICUM */
 12 /* #undef HAVE_CC_SHA256_CTX */
 13 /* #undef HAVE_CC_SHA256_INIT */
 14 /* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */
 15@@ -28,11 +27,9 @@
 16 #define HAVE_DECODER_LZMA1 1
 17 #define HAVE_DECODER_LZMA2 1
 18 #define HAVE_DECODER_POWERPC 1
 19-#define HAVE_DECODER_RISCV 1
 20 #define HAVE_DECODER_SPARC 1
 21 #define HAVE_DECODER_X86 1
 22 #define HAVE_DLFCN_H 1
 23-/* #undef HAVE_ELF_AUX_INFO */
 24 #define HAVE_ENCODERS 1
 25 #define HAVE_ENCODER_ARM 1
 26 #define HAVE_ENCODER_ARM64 1
 27@@ -42,21 +39,20 @@
 28 #define HAVE_ENCODER_LZMA1 1
 29 #define HAVE_ENCODER_LZMA2 1
 30 #define HAVE_ENCODER_POWERPC 1
 31-#define HAVE_ENCODER_RISCV 1
 32 #define HAVE_ENCODER_SPARC 1
 33 #define HAVE_ENCODER_X86 1
 34+#define HAVE_FCNTL_H 1
 35 #define HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR 1
 36 #define HAVE_FUTIMENS 1
 37 /* #undef HAVE_FUTIMES */
 38 /* #undef HAVE_FUTIMESAT */
 39-/* #undef HAVE_GETAUXVAL */
 40 #define HAVE_GETOPT_H 1
 41 #define HAVE_GETOPT_LONG 1
 42 /* #undef HAVE_GETTEXT */
 43 /* #undef HAVE_ICONV */
 44 /* probe HAVE_IMMINTRIN_H */
 45 #define HAVE_INTTYPES_H 1
 46-#define HAVE_LINUX_LANDLOCK 1
 47+#define HAVE_LIMITS_H 1
 48 #define HAVE_LZIP_DECODER 1
 49 #define HAVE_MBRTOWC 1
 50 #define HAVE_MF_BT2 1
 51@@ -90,16 +86,18 @@
 52 #define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 1
 53 /* #undef HAVE_STRUCT_STAT_ST_UATIME */
 54 /* #undef HAVE_SYMBOL_VERSIONS_LINUX */
 55-/* #undef HAVE_SYSCTLBYNAME */
 56 /* #undef HAVE_SYS_BYTEORDER_H */
 57-/* #undef HAVE_SYS_CDEFS_H */
 58+/* #undef HAVE_SYS_CAPSICUM_H */
 59 /* #undef HAVE_SYS_ENDIAN_H */
 60 #define HAVE_SYS_PARAM_H 1
 61 #define HAVE_SYS_STAT_H 1
 62+#define HAVE_SYS_TIME_H 1
 63 #define HAVE_SYS_TYPES_H 1
 64 #define HAVE_UINTPTR_T 1
 65 #define HAVE_UNISTD_H 1
 66-#define HAVE_USABLE_CLMUL 1
 67+#ifdef HAVE__MM_CLMULEPI64_SI128 /* probe */
 68+# define HAVE_USABLE_CLMUL 1
 69+#endif
 70 /* #undef HAVE_UTIME */
 71 /* #undef HAVE_UTIMES */
 72 #define HAVE_VISIBILITY 1
 73@@ -109,7 +107,9 @@
 74 /* #undef HAVE__FUTIME */
 75 /* probe HAVE__MM_MOVEMASK_EPI8 */
 76 /* probe HAVE___BUILTIN_ASSUME_ALIGNED */
 77-/* probe HAVE___BUILTIN_BSWAPXX */
 78+#ifdef HAVE___BUILTIN_BSWAP16 /* probe */
 79+# define HAVE___BUILTIN_BSWAPXX 1
 80+#endif
 81 #define LT_OBJDIR ".libs/"
 82 #define MYTHREAD_POSIX 1
 83 /* #undef MYTHREAD_VISTA */
 84@@ -118,10 +118,10 @@
 85 #define PACKAGE "xz"
 86 #define PACKAGE_BUGREPORT "xz@tukaani.org"
 87 #define PACKAGE_NAME "XZ Utils"
 88-#define PACKAGE_STRING "XZ Utils 5.6.2"
 89+#define PACKAGE_STRING "XZ Utils 5.4.6"
 90 #define PACKAGE_TARNAME "xz"
 91-#define PACKAGE_URL "https://tukaani.org/xz/"
 92-#define PACKAGE_VERSION "5.6.2"
 93+#define PACKAGE_URL "https://xz.tukaani.org/xz-utils/"
 94+#define PACKAGE_VERSION "5.4.6"
 95 /* #undef PTHREAD_CREATE_JOINABLE */
 96 /* probe SIZEOF_SIZE_T */
 97 #define STDC_HEADERS 1
 98@@ -181,9 +181,6 @@
 99 #ifndef __STDC_WANT_IEC_60559_DFP_EXT__
100 # define __STDC_WANT_IEC_60559_DFP_EXT__ 1
101 #endif
102-#ifndef __STDC_WANT_IEC_60559_EXT__
103-# define __STDC_WANT_IEC_60559_EXT__ 1
104-#endif
105 #ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__
106 # define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1
107 #endif
108@@ -202,7 +199,7 @@
109 #ifndef _XOPEN_SOURCE
110 /* # undef _XOPEN_SOURCE */
111 #endif
112-#define VERSION "5.6.2"
113+#define VERSION "5.4.6"
114 #if defined AC_APPLE_UNIVERSAL_BUILD
115 # if defined __BIG_ENDIAN__
116 #  define WORDS_BIGENDIAN 1
117@@ -214,12 +211,10 @@
118 #endif
119 /* #undef _FILE_OFFSET_BITS */
120 /* #undef _LARGE_FILES */
121-/* #undef _TIME_BITS */
122 /* #undef _UINT32_T */
123 /* #undef _UINT64_T */
124 /* #undef _UINT8_T */
125 /* #undef __GETOPT_PREFIX */
126-/* #undef __MINGW_USE_VC2005_COMPAT */
127 /* #undef int32_t */
128 /* #undef int64_t */
129 /* #undef uint16_t */
M pkg/xz/gen.lua
+1, -2 
 1@@ -14,6 +14,7 @@ cflags{
 2 
 3 build('cat', '$outdir/config.h', {
 4 	'$builddir/probe/HAVE_IMMINTRIN_H',
 5+	'$builddir/probe/HAVE__MM_CLMULEPI64_SI128',
 6 	'$builddir/probe/HAVE__MM_MOVEMASK_EPI8',
 7 	'$builddir/probe/HAVE___BUILTIN_ASSUME_ALIGNED',
 8 	'$builddir/probe/HAVE___BUILTIN_BSWAP16',
 9@@ -120,7 +121,6 @@ lib('liblzma.a', [[src/(
10 			armthumb.c
11 			arm64.c
12 			sparc.c
13-			riscv.c
14 		)
15 	)
16 )]])
17@@ -135,7 +135,6 @@ exe('xz', [[src/(
18 		message.c
19 		mytime.c
20 		options.c
21-		sandbox.c
22 		signals.c
23 		suffix.c
24 		util.c
M pkg/xz/src
+1, -1 
1@@ -1 +1 @@
2-Subproject commit 3ec664d3f652133136587a51d4505b1abe1acdd7
3+Subproject commit 6e8732c5a317a349986a4078718f1d95b67072c5
M pkg/xz/ver
+1, -1 
1@@ -1 +1 @@
2-5.6.2 r0
3+5.4.6 r0
A probe/HAVE__MM_CLMULEPI64_SI128
+7, -0 
1@@ -0,0 +1,7 @@
2+#include <immintrin.h>
3+static __m128i x, y;
4+__attribute__((__target__("pclmul")))
5+int main(void) {
6+	_mm_clmulepi64_si128(x, y, 0);
7+	return 0;
8+}