From 925cc07e88d064dc53dc25e9c40b6de5e9ee6c8f Mon Sep 17 00:00:00 2001 From: mreid-tt <943378+mreid-tt@users.noreply.github.com> Date: Sun, 19 Jan 2025 11:19:28 -0400 Subject: [PATCH] Patch pendulum for 32-bit arch --- cross/pendulum/Makefile | 23 +++++ cross/pendulum/digests | 3 + .../patches/001-fix-build-for-32bit.patch | 90 +++++++++++++++++++ spk/flexget/Makefile | 6 +- spk/flexget/src/requirements-crossenv.txt | 2 +- 5 files changed, 118 insertions(+), 6 deletions(-) create mode 100644 cross/pendulum/Makefile create mode 100644 cross/pendulum/digests create mode 100644 cross/pendulum/patches/001-fix-build-for-32bit.patch diff --git a/cross/pendulum/Makefile b/cross/pendulum/Makefile new file mode 100644 index 00000000000..1ae919f1249 --- /dev/null +++ b/cross/pendulum/Makefile @@ -0,0 +1,23 @@ +PKG_NAME = pendulum +PKG_VERS = 3.0.0 +PKG_EXT = tar.gz +PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) +PKG_DIST_SITE = https://files.pythonhosted.org/packages/b8/fe/27c7438c6ac8b8f8bef3c6e571855602ee784b85d072efddfff0ceb1cd77 +PKG_DIR = $(PKG_NAME)-$(PKG_VERS) + +DEPENDS = + +HOMEPAGE = https://pendulum.eustace.io +COMMENT = Python datetimes made easy +LICENSE = MIT + +# toolchains lacking atomic support +UNSUPPORTED_ARCHS = $(PPC_ARCHS) $(ARMv5_ARCHS) $(ARMv7L_ARCHS) + +include ../../mk/spksrc.common.mk + +ifeq ($(call version_le, $(TC_GCC), 5),1) +ADDITIONAL_CFLAGS = -std=c99 +endif + +include ../../mk/spksrc.python-wheel.mk diff --git a/cross/pendulum/digests b/cross/pendulum/digests new file mode 100644 index 00000000000..cf11460159c --- /dev/null +++ b/cross/pendulum/digests @@ -0,0 +1,3 @@ +pendulum-3.0.0.tar.gz SHA1 ea64f64ccbe4ec6bc05c63c28da6910fb5ac0842 +pendulum-3.0.0.tar.gz SHA256 5d034998dea404ec31fae27af6b22cff1708f830a1ed7353be4d1019bb9f584e +pendulum-3.0.0.tar.gz MD5 3beb45818d19839157e57a2f81b40ebb diff --git a/cross/pendulum/patches/001-fix-build-for-32bit.patch b/cross/pendulum/patches/001-fix-build-for-32bit.patch new file mode 100644 index 00000000000..a80b3703acf --- /dev/null +++ b/cross/pendulum/patches/001-fix-build-for-32bit.patch @@ -0,0 +1,90 @@ +--- rust/src/helpers-orig.rs 2023-12-16 17:04:29 ++++ rust/src/helpers.rs 2025-01-19 08:51:27 +@@ -49,57 +49,57 @@ + microsecond: usize, + ) -> (usize, usize, usize, usize, usize, usize, usize) { + let mut year: usize = EPOCH_YEAR as usize; +- let mut seconds: isize = unix_time.floor() as isize; ++ let mut seconds: i64 = unix_time.floor() as i64; + + // Shift to a base year that is 400-year aligned. + if seconds >= 0 { +- seconds -= (10957 * SECS_PER_DAY as usize) as isize; ++ seconds -= 10957 * SECS_PER_DAY as i64; + year += 30; // == 2000 + } else { +- seconds += ((146_097 - 10957) * SECS_PER_DAY as usize) as isize; ++ seconds += (146_097 - 10957) * SECS_PER_DAY as i64; + year -= 370; // == 1600 + } + +- seconds += utc_offset; ++ seconds += utc_offset as i64; + + // Handle years in chunks of 400/100/4/1 +- year += 400 * (seconds / SECS_PER_400_YEARS as isize) as usize; +- seconds %= SECS_PER_400_YEARS as isize; ++ year += 400 * (seconds / SECS_PER_400_YEARS as i64) as usize; ++ seconds %= SECS_PER_400_YEARS as i64; + if seconds < 0 { +- seconds += SECS_PER_400_YEARS as isize; ++ seconds += SECS_PER_400_YEARS as i64; + year -= 400; + } + + let mut leap_year = 1; // 4-century aligned +- let mut sec_per_100years = SECS_PER_100_YEARS[leap_year] as isize; ++ let mut sec_per_100years = SECS_PER_100_YEARS[leap_year].try_into().unwrap(); + + while seconds >= sec_per_100years { + seconds -= sec_per_100years; + year += 100; + leap_year = 0; // 1-century, non 4-century aligned +- sec_per_100years = SECS_PER_100_YEARS[leap_year] as isize; ++ sec_per_100years = SECS_PER_100_YEARS[leap_year].try_into().unwrap(); + } + +- let mut sec_per_4years = SECS_PER_4_YEARS[leap_year] as isize; ++ let mut sec_per_4years = SECS_PER_4_YEARS[leap_year].into(); + while seconds >= sec_per_4years { + seconds -= sec_per_4years; + year += 4; + leap_year = 1; // 4-year, non century aligned +- sec_per_4years = SECS_PER_4_YEARS[leap_year] as isize; ++ sec_per_4years = SECS_PER_4_YEARS[leap_year].into(); + } + +- let mut sec_per_year = SECS_PER_YEAR[leap_year] as isize; ++ let mut sec_per_year = SECS_PER_YEAR[leap_year].into(); + while seconds >= sec_per_year { + seconds -= sec_per_year; + year += 1; + leap_year = 0; // non 4-year aligned +- sec_per_year = SECS_PER_YEAR[leap_year] as isize; ++ sec_per_year = SECS_PER_YEAR[leap_year].into(); + } + + // Handle months and days + let mut month = TM_DECEMBER + 1; +- let mut day: usize = (seconds / (SECS_PER_DAY as isize) + 1) as usize; +- seconds %= SECS_PER_DAY as isize; ++ let mut day: usize = (seconds / (SECS_PER_DAY as i64) + 1) as usize; ++ seconds %= SECS_PER_DAY as i64; + + let mut month_offset: usize; + while month != (TM_JANUARY + 1) { +@@ -113,10 +113,10 @@ + } + + // Handle hours, minutes and seconds +- let hour: usize = (seconds / SECS_PER_HOUR as isize) as usize; +- seconds %= SECS_PER_HOUR as isize; +- let minute: usize = (seconds / SECS_PER_MIN as isize) as usize; +- let second: usize = (seconds % SECS_PER_MIN as isize) as usize; ++ let hour: usize = (seconds / SECS_PER_HOUR as i64) as usize; ++ seconds %= SECS_PER_HOUR as i64; ++ let minute: usize = (seconds / SECS_PER_MIN as i64) as usize; ++ let second: usize = (seconds % SECS_PER_MIN as i64) as usize; + + (year, month, day, hour, minute, second, microsecond) + } diff --git a/spk/flexget/Makefile b/spk/flexget/Makefile index 7b849c33f7c..9ac73dd9a43 100644 --- a/spk/flexget/Makefile +++ b/spk/flexget/Makefile @@ -45,11 +45,7 @@ WHEELS += src/requirements-crossenv-greenlet-v1.txt endif # [pendulum] -ifeq ($(call version_ge, $(TC_GCC), 4.9),1) -WHEELS_CFLAGS += [pendulum] -std=c11 -else -WHEELS_CFLAGS += [pendulum] -std=c99 -endif +BUILD_DEPENDS += cross/pendulum .PHONY: flexget_extra_install flexget_extra_install: diff --git a/spk/flexget/src/requirements-crossenv.txt b/spk/flexget/src/requirements-crossenv.txt index ba24fcd0a28..fdd7b99930a 100644 --- a/spk/flexget/src/requirements-crossenv.txt +++ b/spk/flexget/src/requirements-crossenv.txt @@ -4,7 +4,7 @@ Brotli==1.1.0 charset-normalizer==3.4.1 #greenlet==3.1.1 => supported version depends on gcc version MarkupSafe==3.0.2 -pendulum==3.0.0 +#pendulum==3.0.0 => cross/pendulum psutil==6.1.1 PyYAML==6.0.2 rpds-py==0.22.3