1
0
mirror of https://github.com/danog/MadelineProto.git synced 2024-11-30 07:38:58 +01:00

Fixup build

This commit is contained in:
Daniil Gentili 2023-12-29 16:06:11 +01:00
parent b81191c1d3
commit c25e3f9198
2 changed files with 31 additions and 1 deletions

View File

@ -81,6 +81,7 @@ RUN set -eux; \
apk del --no-network .fetch-deps
COPY tests/dockerfiles/docker-php-source /usr/local/bin/
COPY tests/dockerfiles/a.patch /a.patch
RUN set -eux; \
apk add --no-cache --virtual .build-deps \
@ -99,7 +100,7 @@ RUN set -eux; \
libffi-dev \
gmp-dev \
icu-dev \
libzip-dev \
libzip-dev patch compiler-rt \
; \
\
# make sure musl's iconv doesn't get used (https://www.php.net/manual/en/intro.iconv.php)
@ -112,6 +113,7 @@ RUN set -eux; \
; \
docker-php-source extract; \
cd /usr/src/php; \
patch -p1 < /a.patch; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
./configure \
--build="$gnuArch" \

28
tests/dockerfiles/a.patch Normal file
View File

@ -0,0 +1,28 @@
diff --git a/main/streams/cast.c b/main/streams/cast.c
index 3bad65fbac..05cab34658 100644
--- a/main/streams/cast.c
+++ b/main/streams/cast.c
@@ -102,8 +102,7 @@ static ssize_t stream_cookie_writer(void *cookie, const char *buffer, size_t siz
return php_stream_write(((php_stream *)cookie), (char *)buffer, size);
}
-# ifdef COOKIE_SEEKER_USES_OFF64_T
-static int stream_cookie_seeker(void *cookie, off64_t *position, int whence)
+static int stream_cookie_seeker(void *cookie, off_t *position, int whence)
{
*position = php_stream_seek((php_stream *)cookie, (zend_off_t)*position, whence);
@@ -113,13 +112,6 @@ static int stream_cookie_seeker(void *cookie, off64_t *position, int whence)
}
return 0;
}
-# else
-static int stream_cookie_seeker(void *cookie, zend_off_t position, int whence)
-{
-
- return php_stream_seek((php_stream *)cookie, position, whence);
-}
-# endif
static int stream_cookie_closer(void *cookie)
{