zip: always assume large file support

fixes #5504
This commit is contained in:
Lucy Phipps 2020-07-10 17:36:02 +01:00 committed by Henrik Grimler
parent 2ae0a8b8c8
commit ac9e4723c3
2 changed files with 114 additions and 4 deletions

View File

@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://sourceforge.net/projects/infozip/
TERMUX_PKG_DESCRIPTION="Tools for working with zip files"
TERMUX_PKG_LICENSE="BSD"
TERMUX_PKG_VERSION=3.0
TERMUX_PKG_REVISION=4
TERMUX_PKG_REVISION=5
TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/infozip/zip30.tar.gz
TERMUX_PKG_SHA256=f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369
TERMUX_PKG_DEPENDS="libandroid-support, libbz2"

View File

@ -1,7 +1,117 @@
diff -u -r ../zip30/unix/configure ./unix/configure
--- ../zip30/unix/configure 2008-06-20 05:32:20.000000000 +0200
+++ ./unix/configure 2017-07-07 08:53:36.218772657 +0200
@@ -509,83 +509,6 @@
--- ../zip30/unix/configure 2008-06-20 04:32:20.000000000 +0100
+++ ./unix/configure 2020-07-12 06:48:24.521323595 +0100
@@ -348,55 +348,10 @@
echo " tests if this OS uses 16-bit UIDs/GIDs and so if the old 16-bit storage"
echo " should also be used for backward compatibility.)"
# Added 2008-04-15 CS
-cat > conftest.c << _EOF_
-# define _LARGEFILE_SOURCE /* some OSes need this for fseeko */
-# define _LARGEFILE64_SOURCE
-# define _FILE_OFFSET_BITS 64 /* select default interface as 64 bit */
-# define _LARGE_FILES /* some OSes need this for 64-bit off_t */
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <stdio.h>
-int main()
-{
- struct stat s;
-
- printf(" s.st_uid is %u bytes\n", sizeof(s.st_uid));
- printf(" s.st_gid is %u bytes\n", sizeof(s.st_gid));
-
- /* see if have 16-bit UID */
- if (sizeof(s.st_uid) != 2) {
- return 1;
- }
- /* see if have 16-bit GID */
- if (sizeof(s.st_gid) != 2) {
- return 2;
- }
- return 3;
-}
-_EOF_
-# compile it
-$CC -o conftest conftest.c >/dev/null 2>/dev/null
-if [ $? -ne 0 ]; then
- echo -- UID/GID test failed on compile - disabling old 16-bit UID/GID support
- CFLAGS="${CFLAGS} -DUIDGID_NOT_16BIT"
-else
-# run it
- ./conftest
- r=$?
- if [ $r -eq 1 ]; then
+echo ' s.st_uid is 4 bytes'
+echo ' s.st_gid is 4 bytes'
echo -- UID not 2 bytes - disabling old 16-bit UID/GID support
CFLAGS="${CFLAGS} -DUIDGID_NOT_16BIT"
- elif [ $r -eq 2 ]; then
- echo -- GID not 2 bytes - disabling old 16-bit UID/GID support
- CFLAGS="${CFLAGS} -DUIDGID_NOT_16BIT"
- elif [ $r -eq 3 ]; then
- echo -- 16-bit UIDs and GIDs - keeping old 16-bit UID/GID support
- else
- echo -- test failed - conftest returned $r - disabling old 16-bit UID/GID support
- CFLAGS="${CFLAGS} -DUIDGID_NOT_16BIT"
- fi
-fi
# Now we set the 64-bit file environment and check the size of off_t
@@ -404,50 +359,9 @@
# Revised 8/12/2004 EG
echo Check for Large File Support
-cat > conftest.c << _EOF_
-# define _LARGEFILE_SOURCE /* some OSes need this for fseeko */
-# define _LARGEFILE64_SOURCE
-# define _FILE_OFFSET_BITS 64 /* select default interface as 64 bit */
-# define _LARGE_FILES /* some OSes need this for 64-bit off_t */
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <stdio.h>
-int main()
-{
- off_t offset;
- struct stat s;
- /* see if have 64-bit off_t */
- if (sizeof(offset) < 8)
- return 1;
- printf(" off_t is %d bytes\n", sizeof(off_t));
- /* see if have 64-bit stat */
- if (sizeof(s.st_size) < 8) {
- printf(" s.st_size is %d bytes\n", sizeof(s.st_size));
- return 2;
- }
- return 3;
-}
-_EOF_
-# compile it
-$CC -o conftest conftest.c >/dev/null 2>/dev/null
-if [ $? -ne 0 ]; then
- echo -- no Large File Support
-else
-# run it
- ./conftest
- r=$?
- if [ $r -eq 1 ]; then
- echo -- no Large File Support - no 64-bit off_t
- elif [ $r -eq 2 ]; then
- echo -- no Large File Support - no 64-bit stat
- elif [ $r -eq 3 ]; then
+echo ' off_t is 8 bytes'
echo -- yes we have Large File Support!
CFLAGS="${CFLAGS} -DLARGE_FILE_SUPPORT"
- else
- echo -- no Large File Support - conftest returned $r
- fi
-fi
# Check for wide char for Unicode support
@@ -509,83 +423,6 @@
# Check for missing functions
# add NO_'function_name' to flags if missing