diff --git a/multilib-32.patch b/multilib-32.patch new file mode 100644 index 0000000..ae99a59 --- /dev/null +++ b/multilib-32.patch @@ -0,0 +1,29 @@ +--- ./a/zzip/_config.h 2021-07-21 14:18:09.000000000 +0200 ++++ ./b/zzip/_config.h 2021-07-21 14:46:24.037432969 +0200 +@@ -138,9 +138,12 @@ + + /* whether the system defaults to 32bit off_t but can do 64bit when requested + */ ++#if __WORDSIZE == 32 + #ifndef ZZIP_LARGEFILE_SENSITIVE + #define ZZIP_LARGEFILE_SENSITIVE 1 + #endif ++#endif ++/* #undef LARGEFILE_SENSITIVE */ + + /* Define to the sub-directory where libtool stores uninstalled libraries. */ + #ifndef ZZIP_LT_OBJDIR +@@ -227,9 +230,13 @@ + #endif + + /* Number of bits in a file offset, on hosts where this is settable. */ ++#if __WORDSIZE == 32 + #ifndef ZZIP__FILE_OFFSET_BITS + #define ZZIP__FILE_OFFSET_BITS 64 + #endif ++#endif ++/* #undef _FILE_OFFSET_BITS */ ++ + + /* Define for large files, on AIX-style hosts. */ + /* #undef _LARGE_FILES */ diff --git a/multilib-64.patch b/multilib-64.patch new file mode 100644 index 0000000..5285e3a --- /dev/null +++ b/multilib-64.patch @@ -0,0 +1,29 @@ +--- ./a/zzip/_config.h 2021-07-21 14:18:14.000000000 +0200 ++++ ./b/zzip/_config.h 2021-07-21 14:46:24.037432969 +0200 +@@ -138,6 +138,11 @@ + + /* whether the system defaults to 32bit off_t but can do 64bit when requested + */ ++#if __WORDSIZE == 32 ++#ifndef ZZIP_LARGEFILE_SENSITIVE ++#define ZZIP_LARGEFILE_SENSITIVE 1 ++#endif ++#endif + /* #undef LARGEFILE_SENSITIVE */ + + /* Define to the sub-directory where libtool stores uninstalled libraries. */ +@@ -225,8 +230,14 @@ + #endif + + /* Number of bits in a file offset, on hosts where this is settable. */ ++#if __WORDSIZE == 32 ++#ifndef ZZIP__FILE_OFFSET_BITS ++#define ZZIP__FILE_OFFSET_BITS 64 ++#endif ++#endif + /* #undef _FILE_OFFSET_BITS */ + ++ + /* Define for large files, on AIX-style hosts. */ + /* #undef _LARGE_FILES */ + diff --git a/zziplib-0.13.69-multilib.patch b/zziplib-0.13.69-multilib.patch deleted file mode 100644 index 24cf64b..0000000 --- a/zziplib-0.13.69-multilib.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -up ./_builddir/zzip/_config.h.orig ./_builddir/zzip/_config.h ---- ./_builddir/zzip/_config.h.orig 2018-07-23 09:11:59.971840954 +0300 -+++ ./_builddir/zzip/_config.h 2018-07-23 09:12:07.438731527 +0300 -@@ -139,6 +139,11 @@ - /* whether the system defaults to 32bit off_t but can do 64bit when requested - */ - /* #undef LARGEFILE_SENSITIVE */ -+#if __WORDSIZE == 32 -+#ifndef ZZIP_LARGEFILE_SENSITIVE -+#define ZZIP_LARGEFILE_SENSITIVE 1 -+#endif -+#endif - - /* Define to the sub-directory where libtool stores uninstalled libraries. */ - #ifndef ZZIP_LT_OBJDIR -@@ -197,6 +202,15 @@ - /* The number of bytes in type short */ - /* #undef SIZEOF_SHORT */ - -+/* The number of bytes in type long */ -+#ifndef ZZIP_SIZEOF_LONG -+#if __WORDSIZE == 32 -+#define ZZIP_SIZEOF_LONG 4 -+#elif __WORDSIZE == 64 -+#define ZZIP_SIZEOF_LONG 8 -+#endif -+#endif -+ - /* Define to 1 if you have the ANSI C header files. */ - #ifndef ZZIP_STDC_HEADERS - #define ZZIP_STDC_HEADERS 1