commit 73d0f77430d989a572e84ac3022c970f5c076f11 Author: Jakub Bogusz <qbo...@pld-linux.org> Date: Tue Jun 20 20:01:51 2023 +0200
- added types patch and few other x32 fixes rpm-ostree-types.patch | 12 ++++++++++++ rpm-ostree.spec | 9 +++++++++ 2 files changed, 21 insertions(+) --- diff --git a/rpm-ostree.spec b/rpm-ostree.spec index d18b720..cb0859f 100644 --- a/rpm-ostree.spec +++ b/rpm-ostree.spec @@ -13,6 +13,7 @@ Group: Applications/System Source0: https://github.com/coreos/rpm-ostree/releases/download/v%{version}/%{name}-%{version}.tar.xz # Source0-md5: 13427adb6d6cfbe70c5d1849ca0e28f5 Patch0: libdnf-gpgme-pkgconfig.patch +Patch1: %{name}-types.patch URL: https://github.com/coreos/rpm-ostree BuildRequires: autoconf >= 2.63 BuildRequires: automake >= 1:1.11 @@ -119,12 +120,19 @@ Dokumentacja API biblioteki rpm-ostree. %prep %setup -q %patch0 -p1 -d libdnf +%patch1 -p1 # see autogen.sh %{__sed} -e 's,$(libglnx_srcpath),'$(pwd)/libglnx,g < libglnx/Makefile-libglnx.am >libglnx/Makefile-libglnx.am.inc ln -sf ../libglnx/libglnx.m4 buildutil/libglnx.m4 +%ifarch x32 +%{__sed} -i -e '/^cargo_build = / s/$/ --target x86_64-unknown-linux-gnux32/' Makefile-rpm-ostree.am +%{__sed} -i -e 's,^cargo_target_dir=,cargo_target_dir=x86_64-unknown-linux-gnux32/,' Makefile-rpm-ostree.am +%endif + %build +export PKG_CONFIG_ALLOW_CROSS=1 %{__gtkdocize} %{__libtoolize} %{__aclocal} -I m4 @@ -140,6 +148,7 @@ ln -sf ../libglnx/libglnx.m4 buildutil/libglnx.m4 %install rm -rf $RPM_BUILD_ROOT +export PKG_CONFIG_ALLOW_CROSS=1 %{__make} install \ DESTDIR=$RPM_BUILD_ROOT \ diff --git a/rpm-ostree-types.patch b/rpm-ostree-types.patch new file mode 100644 index 0000000..b5967da --- /dev/null +++ b/rpm-ostree-types.patch @@ -0,0 +1,12 @@ +Fix for 64-bit time_t on ILP32 archs (e.g. x32) +--- rpm-ostree-2023.4/src/daemon/rpmostree-sysroot-upgrader.cxx.orig 2023-05-18 18:15:37.000000000 +0200 ++++ rpm-ostree-2023.4/src/daemon/rpmostree-sysroot-upgrader.cxx 2023-05-21 17:50:56.885836075 +0200 +@@ -1255,7 +1255,7 @@ write_history (RpmOstreeSysrootUpgrader + if (!glnx_fstatat (ostree_sysroot_get_fd (self->sysroot), deployment_dirpath, &stbuf, 0, error)) + return FALSE; + +- g_autofree char *fn = g_strdup_printf ("%s/%ld", RPMOSTREE_HISTORY_DIR, stbuf.st_ctime); ++ g_autofree char *fn = g_strdup_printf ("%s/%lld", RPMOSTREE_HISTORY_DIR, (long long)stbuf.st_ctime); + if (!glnx_shutil_mkdir_p_at (AT_FDCWD, RPMOSTREE_HISTORY_DIR, 0775, cancellable, error)) + return FALSE; + ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/rpm-ostree.git/commitdiff/73d0f77430d989a572e84ac3022c970f5c076f11 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit