From: wanchao-xu Date: Fri, 12 Jan 2024 02:49:18 +0000 (+0800) Subject: Fix the build error on opensuse42.1 X-Git-Tag: accepted/tools/devbase/tools/legacy/20250527.042552~1^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e021b4728ed2aea486975a63a342ece1d2178b18;p=tools%2Fqemu-arm-static.git Fix the build error on opensuse42.1 * glib2-devel version is 2.44 on opensuse. Change-Id: I390ae0a0c42f4b187f7e7929ee437172f3bf834c --- diff --git a/configure b/configure index c68e37877..bd6afa82c 100755 --- a/configure +++ b/configure @@ -3688,7 +3688,7 @@ fi ########################################## # glib support probe -glib_req_ver=2.48 +glib_req_ver=2.44 glib_modules=gthread-2.0 if test "$modules" = yes; then glib_modules="$glib_modules gmodule-export-2.0" diff --git a/include/glib-compat.h b/include/glib-compat.h index 0b0ec7629..ddd328d21 100644 --- a/include/glib-compat.h +++ b/include/glib-compat.h @@ -19,12 +19,12 @@ /* Ask for warnings for anything that was marked deprecated in * the defined version, or before. It is a candidate for rewrite. */ -#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_48 +#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_44 /* Ask for warnings if code tries to use function that did not * exist in the defined version. These risk breaking builds */ -#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_48 +#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_44 #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" diff --git a/packaging/qemu-arm-static.spec b/packaging/qemu-arm-static.spec index f113e71f2..9ce4e724d 100644 --- a/packaging/qemu-arm-static.spec +++ b/packaging/qemu-arm-static.spec @@ -43,7 +43,7 @@ BuildRequires: glibc-devel-static BuildRequires: makeinfo BuildRequires: ninja BuildRequires: pcre-devel-static -BuildRequires: python2-base >= 2.7 +BuildRequires: python >= 2.7 BuildRequires: zlib-devel-static Provides: qemu:%_bindir/qemu-arm-static