Changes: tools/configure.ac: add version check for glib2 tools/m4: add AC_LANG_SOURCE to fix autoconf warnings tools/configure.ac: fill PACKAGE_TARNAME in AC_INIT tools/configure.ac | 4 ++-- tools/m4/pthread.m4 | 4 ++-- tools/m4/ptyfuncs.m4 | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
Olaf Hering
2012-Jun-13 08:01 UTC
[PATCH 1 of 3] tools/configure.ac: add version check for glib2
# HG changeset patch # User Olaf Hering <olaf@aepfle.de> # Date 1339572293 -7200 # Node ID ea554d05821b95a7e96e4a25cbf953c5abe35aeb # Parent a70b35deb2b5592cc1b2363860f21bb2c7049885 tools/configure.ac: add version check for glib2 xen-unstable fails to build in a SLES10SP4 environment since a long time because the included version of glib is slightly older than the required glib version. According to the docs glib version 2.12 includes base64 support, but SLES10 is shipped with glib 2.8.6: qemu-timer-common.o: In function `init_get_clock'': /usr/src/packages/BUILD/xen-4.2.25432/non-dbg/tools/qemu-xen-dir/qemu-timer-common.c:57: undefined reference to `clock_gettime'' qga/guest-agent-commands.o: In function `qmp_guest_file_write'': qga/guest-agent-commands.c:249: undefined reference to `g_base64_decode'' qga/guest-agent-commands.o: In function `qmp_guest_file_read'': qga/guest-agent-commands.c:224: undefined reference to `g_base64_encode'' collect2: ld returned 1 exit status make[3]: *** [qemu-ga] Error 1 Add a version check to configure to require at least glib 2.12 to build qemu-upstream. Signed-off-by: Olaf Hering <olaf@aepfle.de> diff -r a70b35deb2b5 -r ea554d05821b tools/configure.ac --- a/tools/configure.ac +++ b/tools/configure.ac @@ -115,7 +115,7 @@ AX_PATH_PROG_OR_FAIL([BCC], [bcc]) AX_PATH_PROG_OR_FAIL([IASL], [iasl]) AX_CHECK_UUID AX_CHECK_CURSES -PKG_CHECK_MODULES(glib, glib-2.0) +PKG_CHECK_MODULES(glib, [glib-2.0 >= 2.12]) # Check library path AX_DEFAULT_LIB
Olaf Hering
2012-Jun-13 08:01 UTC
[PATCH 2 of 3] tools/m4: add AC_LANG_SOURCE to fix autoconf warnings
# HG changeset patch # User Olaf Hering <olaf@aepfle.de> # Date 1339574439 -7200 # Node ID 57679d60e43077004757aede949e41b5e297e028 # Parent ea554d05821b95a7e96e4a25cbf953c5abe35aeb tools/m4: add AC_LANG_SOURCE to fix autoconf warnings I see these warnings with autoconf 2.68, add AC_LANG_SOURCE as suggested by upstream documentation. ... # bash autogen.sh configure.ac:141: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body ../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from... ../../lib/autoconf/general.m4:2662: _AC_LINK_IFELSE is expanded from... ../../lib/autoconf/general.m4:2679: AC_LINK_IFELSE is expanded from... ../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from... ../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from... ../../lib/autoconf/general.m4:2053: AC_CACHE_CHECK is expanded from... m4/pthread.m4:21: AX_CHECK_PTHREAD is expanded from... configure.ac:141: the top level configure.ac:142: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body ../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from... ../../lib/autoconf/general.m4:2662: _AC_LINK_IFELSE is expanded from... ../../lib/autoconf/general.m4:2679: AC_LINK_IFELSE is expanded from... ../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from... ../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from... ../../lib/autoconf/general.m4:2053: AC_CACHE_CHECK is expanded from... m4/ptyfuncs.m4:1: AX_CHECK_PTYFUNCS is expanded from... configure.ac:142: the top level configure.ac:141: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body ../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from... ../../lib/autoconf/general.m4:2662: _AC_LINK_IFELSE is expanded from... ../../lib/autoconf/general.m4:2679: AC_LINK_IFELSE is expanded from... ../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from... ../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from... ../../lib/autoconf/general.m4:2053: AC_CACHE_CHECK is expanded from... m4/pthread.m4:21: AX_CHECK_PTHREAD is expanded from... configure.ac:141: the top level configure.ac:142: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body ../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from... ../../lib/autoconf/general.m4:2662: _AC_LINK_IFELSE is expanded from... ../../lib/autoconf/general.m4:2679: AC_LINK_IFELSE is expanded from... ../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from... ../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from... ../../lib/autoconf/general.m4:2053: AC_CACHE_CHECK is expanded from... m4/ptyfuncs.m4:1: AX_CHECK_PTYFUNCS is expanded from... configure.ac:142: the top level Signed-off-by: Olaf Hering <olaf@aepfle.de> diff -r ea554d05821b -r 57679d60e430 tools/m4/pthread.m4 --- a/tools/m4/pthread.m4 +++ b/tools/m4/pthread.m4 @@ -24,13 +24,13 @@ AC_DEFUN([AX_CHECK_PTHREAD],[ AX_PTHREAD_CV2VARS AX_PTHREAD_VARS([AX_SAVEVAR_SAVE]) AX_PTHREAD_VARS([AX_PTHREAD_VAR_APPLY]) - AC_LINK_IFELSE([ + AC_LINK_IFELSE([AC_LANG_SOURCE([ #include <pthread.h> int main(void) { pthread_atfork(0,0,0); pthread_create(0,0,0,0); } -],[],[ax_cv_pthread_flags=failed]) +])],[],[ax_cv_pthread_flags=failed]) AX_PTHREAD_VARS([AX_SAVEVAR_RESTORE]) ]) if test "x$ax_cv_pthread_flags" = xfailed; then diff -r ea554d05821b -r 57679d60e430 tools/m4/ptyfuncs.m4 --- a/tools/m4/ptyfuncs.m4 +++ b/tools/m4/ptyfuncs.m4 @@ -9,7 +9,7 @@ AC_DEFUN([AX_CHECK_PTYFUNCS], [ fi AX_SAVEVAR_SAVE(LIBS) LIBS="$LIBS $ax_cv_ptyfuncs_libs" - AC_LINK_IFELSE([ + AC_LINK_IFELSE([AC_LANG_SOURCE([ #ifdef INCLUDE_LIBUTIL_H #include INCLUDE_LIBUTIL_H #endif @@ -17,7 +17,7 @@ int main(void) { openpty(0,0,0,0,0); login_tty(0); } -],[ +])],[ break ],[]) AX_SAVEVAR_RESTORE(LIBS)
Olaf Hering
2012-Jun-13 08:01 UTC
[PATCH 3 of 3] tools/configure.ac: fill PACKAGE_TARNAME in AC_INIT
# HG changeset patch # User Olaf Hering <olaf@aepfle.de> # Date 1339574441 -7200 # Node ID 306676f2c25b58e2cc094017f53910cb0c9ea9a9 # Parent 57679d60e43077004757aede949e41b5e297e028 tools/configure.ac: fill PACKAGE_TARNAME in AC_INIT Upcoming changes will move DOCDIR from Config.mk to config/Tools.mk. To preserve the currently used path, which ends with /xen, specify a value for PACKAGE_TARNAME. Without this change the path would end with /xen-hypervisor. Signed-off-by: Olaf Hering <olaf@aepfle.de> diff -r 57679d60e430 -r 306676f2c25b tools/configure.ac --- a/tools/configure.ac +++ b/tools/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.67]) AC_INIT([Xen Hypervisor], m4_esyscmd([../version.sh ../xen/Makefile]), - [xen-devel@lists.xensource.com]) + [xen-devel@lists.xensource.com], [xen], [http://www.xen.org/]) AC_CONFIG_SRCDIR([libxl/libxl.c]) AC_CONFIG_FILES([../config/Tools.mk]) AC_CONFIG_HEADERS([config.h])
Ian Campbell
2012-Jun-13 08:14 UTC
Re: [PATCH 1 of 3] tools/configure.ac: add version check for glib2
On Wed, 2012-06-13 at 09:01 +0100, Olaf Hering wrote:> # HG changeset patch > # User Olaf Hering <olaf@aepfle.de> > # Date 1339572293 -7200 > # Node ID ea554d05821b95a7e96e4a25cbf953c5abe35aeb > # Parent a70b35deb2b5592cc1b2363860f21bb2c7049885 > tools/configure.ac: add version check for glib2 > > xen-unstable fails to build in a SLES10SP4 environment since a long time > because the included version of glib is slightly older than the required > glib version. According to the docs glib version 2.12 includes base64 > support, but SLES10 is shipped with glib 2.8.6: > > qemu-timer-common.o: In function `init_get_clock'': > /usr/src/packages/BUILD/xen-4.2.25432/non-dbg/tools/qemu-xen-dir/qemu-timer-common.c:57: > undefined reference to `clock_gettime'' > qga/guest-agent-commands.o: In function `qmp_guest_file_write'': > qga/guest-agent-commands.c:249: undefined reference to `g_base64_decode'' > qga/guest-agent-commands.o: In function `qmp_guest_file_read'': > qga/guest-agent-commands.c:224: undefined reference to `g_base64_encode'' > collect2: ld returned 1 exit status > make[3]: *** [qemu-ga] Error 1 > > Add a version check to configure to require at least glib 2.12 to build > qemu-upstream.Does this cause configure to fail or does it cause us to just not build qemu-upstream? I think the former (which is fine with me) but your last sentence suggests that latter.> > Signed-off-by: Olaf Hering <olaf@aepfle.de> > > diff -r a70b35deb2b5 -r ea554d05821b tools/configure.ac > --- a/tools/configure.ac > +++ b/tools/configure.ac > @@ -115,7 +115,7 @@ AX_PATH_PROG_OR_FAIL([BCC], [bcc]) > AX_PATH_PROG_OR_FAIL([IASL], [iasl]) > AX_CHECK_UUID > AX_CHECK_CURSES > -PKG_CHECK_MODULES(glib, glib-2.0) > +PKG_CHECK_MODULES(glib, [glib-2.0 >= 2.12]) > > # Check library path > AX_DEFAULT_LIB > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel
Roger Pau Monne
2012-Jun-13 08:56 UTC
Re: [PATCH 1 of 3] tools/configure.ac: add version check for glib2
Ian Campbell wrote:> On Wed, 2012-06-13 at 09:01 +0100, Olaf Hering wrote: >> # HG changeset patch >> # User Olaf Hering<olaf@aepfle.de> >> # Date 1339572293 -7200 >> # Node ID ea554d05821b95a7e96e4a25cbf953c5abe35aeb >> # Parent a70b35deb2b5592cc1b2363860f21bb2c7049885 >> tools/configure.ac: add version check for glib2 >> >> xen-unstable fails to build in a SLES10SP4 environment since a long time >> because the included version of glib is slightly older than the required >> glib version. According to the docs glib version 2.12 includes base64 >> support, but SLES10 is shipped with glib 2.8.6: >> >> qemu-timer-common.o: In function `init_get_clock': >> /usr/src/packages/BUILD/xen-4.2.25432/non-dbg/tools/qemu-xen-dir/qemu-timer-common.c:57: >> undefined reference to `clock_gettime' >> qga/guest-agent-commands.o: In function `qmp_guest_file_write': >> qga/guest-agent-commands.c:249: undefined reference to `g_base64_decode' >> qga/guest-agent-commands.o: In function `qmp_guest_file_read': >> qga/guest-agent-commands.c:224: undefined reference to `g_base64_encode' >> collect2: ld returned 1 exit status >> make[3]: *** [qemu-ga] Error 1 >> >> Add a version check to configure to require at least glib 2.12 to build >> qemu-upstream. > > Does this cause configure to fail or does it cause us to just not build > qemu-upstream? I think the former (which is fine with me) but your last > sentence suggests that latter.From my understanding it causes Qemu build to fail, since our version of Qemu configure script doesn't check for glib version. The following commit should be backported to our Qemu tree also a52d28afb4e825a5b28815370a268904a4c6dc11.>> Signed-off-by: Olaf Hering<olaf@aepfle.de>Anyway, since we check for glib already, I think this should be applied, so at least we check for the required version Acked-by: Roger Pau Monné <roger.pau@citrix.com> Please rerun autoconf after applying this.>> >> diff -r a70b35deb2b5 -r ea554d05821b tools/configure.ac >> --- a/tools/configure.ac >> +++ b/tools/configure.ac >> @@ -115,7 +115,7 @@ AX_PATH_PROG_OR_FAIL([BCC], [bcc]) >> AX_PATH_PROG_OR_FAIL([IASL], [iasl]) >> AX_CHECK_UUID >> AX_CHECK_CURSES >> -PKG_CHECK_MODULES(glib, glib-2.0) >> +PKG_CHECK_MODULES(glib, [glib-2.0>= 2.12]) >> >> # Check library path >> AX_DEFAULT_LIB >> >> _______________________________________________ >> Xen-devel mailing list >> Xen-devel@lists.xen.org >> http://lists.xen.org/xen-devel > >_______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel
Ian Campbell
2012-Jun-13 08:58 UTC
Re: [PATCH 1 of 3] tools/configure.ac: add version check for glib2
On Wed, 2012-06-13 at 09:56 +0100, Roger Pau Monne wrote:> Ian Campbell wrote: > > On Wed, 2012-06-13 at 09:01 +0100, Olaf Hering wrote: > >> # HG changeset patch > >> # User Olaf Hering<olaf@aepfle.de> > >> # Date 1339572293 -7200 > >> # Node ID ea554d05821b95a7e96e4a25cbf953c5abe35aeb > >> # Parent a70b35deb2b5592cc1b2363860f21bb2c7049885 > >> tools/configure.ac: add version check for glib2 > >> > >> xen-unstable fails to build in a SLES10SP4 environment since a long time > >> because the included version of glib is slightly older than the required > >> glib version. According to the docs glib version 2.12 includes base64 > >> support, but SLES10 is shipped with glib 2.8.6: > >> > >> qemu-timer-common.o: In function `init_get_clock': > >> /usr/src/packages/BUILD/xen-4.2.25432/non-dbg/tools/qemu-xen-dir/qemu-timer-common.c:57: > >> undefined reference to `clock_gettime' > >> qga/guest-agent-commands.o: In function `qmp_guest_file_write': > >> qga/guest-agent-commands.c:249: undefined reference to `g_base64_decode' > >> qga/guest-agent-commands.o: In function `qmp_guest_file_read': > >> qga/guest-agent-commands.c:224: undefined reference to `g_base64_encode' > >> collect2: ld returned 1 exit status > >> make[3]: *** [qemu-ga] Error 1 > >> > >> Add a version check to configure to require at least glib 2.12 to build > >> qemu-upstream. > > > > Does this cause configure to fail or does it cause us to just not build > > qemu-upstream? I think the former (which is fine with me) but your last > > sentence suggests that latter. > > From my understanding it causes Qemu build to fail, since our version > of Qemu configure script doesn't check for glib version.But this patch makes it do that check, right?> > The following commit should be backported to our Qemu tree also > a52d28afb4e825a5b28815370a268904a4c6dc11. > > >> Signed-off-by: Olaf Hering<olaf@aepfle.de> > > Anyway, since we check for glib already, I think this should be applied, > so at least we check for the required version > > Acked-by: Roger Pau Monné <roger.pau@citrix.com> > > Please rerun autoconf after applying this. > > >> > >> diff -r a70b35deb2b5 -r ea554d05821b tools/configure.ac > >> --- a/tools/configure.ac > >> +++ b/tools/configure.ac > >> @@ -115,7 +115,7 @@ AX_PATH_PROG_OR_FAIL([BCC], [bcc]) > >> AX_PATH_PROG_OR_FAIL([IASL], [iasl]) > >> AX_CHECK_UUID > >> AX_CHECK_CURSES > >> -PKG_CHECK_MODULES(glib, glib-2.0) > >> +PKG_CHECK_MODULES(glib, [glib-2.0>= 2.12]) > >> > >> # Check library path > >> AX_DEFAULT_LIB > >> > >> _______________________________________________ > >> Xen-devel mailing list > >> Xen-devel@lists.xen.org > >> http://lists.xen.org/xen-devel > > > > >_______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel
Roger Pau Monne
2012-Jun-13 08:59 UTC
Re: [PATCH 3 of 3] tools/configure.ac: fill PACKAGE_TARNAME in AC_INIT
Olaf Hering wrote:> # HG changeset patch > # User Olaf Hering<olaf@aepfle.de> > # Date 1339574441 -7200 > # Node ID 306676f2c25b58e2cc094017f53910cb0c9ea9a9 > # Parent 57679d60e43077004757aede949e41b5e297e028 > tools/configure.ac: fill PACKAGE_TARNAME in AC_INIT > > Upcoming changes will move DOCDIR from Config.mk to config/Tools.mk. To > preserve the currently used path, which ends with /xen, specify a value > for PACKAGE_TARNAME. Without this change the path would end with > /xen-hypervisor. > > Signed-off-by: Olaf Hering<olaf@aepfle.de> > > diff -r 57679d60e430 -r 306676f2c25b tools/configure.ac > --- a/tools/configure.ac > +++ b/tools/configure.ac > @@ -3,7 +3,7 @@ > > AC_PREREQ([2.67]) > AC_INIT([Xen Hypervisor], m4_esyscmd([../version.sh ../xen/Makefile]), > - [xen-devel@lists.xensource.com]) > + [xen-devel@lists.xensource.com], [xen], [http://www.xen.org/])Since you already change the line, could you also change the ML address to xen@lists.xen.org?> AC_CONFIG_SRCDIR([libxl/libxl.c]) > AC_CONFIG_FILES([../config/Tools.mk]) > AC_CONFIG_HEADERS([config.h])
Roger Pau Monne
2012-Jun-13 09:01 UTC
Re: [PATCH 1 of 3] tools/configure.ac: add version check for glib2
Ian Campbell wrote:> On Wed, 2012-06-13 at 09:56 +0100, Roger Pau Monne wrote: >> Ian Campbell wrote: >>> On Wed, 2012-06-13 at 09:01 +0100, Olaf Hering wrote: >>>> # HG changeset patch >>>> # User Olaf Hering<olaf@aepfle.de> >>>> # Date 1339572293 -7200 >>>> # Node ID ea554d05821b95a7e96e4a25cbf953c5abe35aeb >>>> # Parent a70b35deb2b5592cc1b2363860f21bb2c7049885 >>>> tools/configure.ac: add version check for glib2 >>>> >>>> xen-unstable fails to build in a SLES10SP4 environment since a long time >>>> because the included version of glib is slightly older than the required >>>> glib version. According to the docs glib version 2.12 includes base64 >>>> support, but SLES10 is shipped with glib 2.8.6: >>>> >>>> qemu-timer-common.o: In function `init_get_clock': >>>> /usr/src/packages/BUILD/xen-4.2.25432/non-dbg/tools/qemu-xen-dir/qemu-timer-common.c:57: >>>> undefined reference to `clock_gettime' >>>> qga/guest-agent-commands.o: In function `qmp_guest_file_write': >>>> qga/guest-agent-commands.c:249: undefined reference to `g_base64_decode' >>>> qga/guest-agent-commands.o: In function `qmp_guest_file_read': >>>> qga/guest-agent-commands.c:224: undefined reference to `g_base64_encode' >>>> collect2: ld returned 1 exit status >>>> make[3]: *** [qemu-ga] Error 1 >>>> >>>> Add a version check to configure to require at least glib 2.12 to build >>>> qemu-upstream. >>> Does this cause configure to fail or does it cause us to just not build >>> qemu-upstream? I think the former (which is fine with me) but your last >>> sentence suggests that latter. >> From my understanding it causes Qemu build to fail, since our version >> of Qemu configure script doesn't check for glib version. > > But this patch makes it do that check, right?Yes, we currently check for glib, but we don't require any specific version. This patch sets the necessary glib version for Qemu-upstream compilation to succeed as a requirement for our configure script.> >> The following commit should be backported to our Qemu tree also >> a52d28afb4e825a5b28815370a268904a4c6dc11. >> >>>> Signed-off-by: Olaf Hering<olaf@aepfle.de> >> Anyway, since we check for glib already, I think this should be applied, >> so at least we check for the required version >> >> Acked-by: Roger Pau Monné<roger.pau@citrix.com> >> >> Please rerun autoconf after applying this. >> >>>> diff -r a70b35deb2b5 -r ea554d05821b tools/configure.ac >>>> --- a/tools/configure.ac >>>> +++ b/tools/configure.ac >>>> @@ -115,7 +115,7 @@ AX_PATH_PROG_OR_FAIL([BCC], [bcc]) >>>> AX_PATH_PROG_OR_FAIL([IASL], [iasl]) >>>> AX_CHECK_UUID >>>> AX_CHECK_CURSES >>>> -PKG_CHECK_MODULES(glib, glib-2.0) >>>> +PKG_CHECK_MODULES(glib, [glib-2.0>= 2.12]) >>>> >>>> # Check library path >>>> AX_DEFAULT_LIB >>>> >>>> _______________________________________________ >>>> Xen-devel mailing list >>>> Xen-devel@lists.xen.org >>>> http://lists.xen.org/xen-devel >>> > >_______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel
Ian Campbell
2012-Jun-13 09:41 UTC
Re: [PATCH 1 of 3] tools/configure.ac: add version check for glib2
On Wed, 2012-06-13 at 10:01 +0100, Roger Pau Monne wrote:> Ian Campbell wrote: > > On Wed, 2012-06-13 at 09:56 +0100, Roger Pau Monne wrote: > >> Ian Campbell wrote: > >>> On Wed, 2012-06-13 at 09:01 +0100, Olaf Hering wrote: > >>>> # HG changeset patch > >>>> # User Olaf Hering<olaf@aepfle.de> > >>>> # Date 1339572293 -7200 > >>>> # Node ID ea554d05821b95a7e96e4a25cbf953c5abe35aeb > >>>> # Parent a70b35deb2b5592cc1b2363860f21bb2c7049885 > >>>> tools/configure.ac: add version check for glib2 > >>>> > >>>> xen-unstable fails to build in a SLES10SP4 environment since a long time > >>>> because the included version of glib is slightly older than the required > >>>> glib version. According to the docs glib version 2.12 includes base64 > >>>> support, but SLES10 is shipped with glib 2.8.6: > >>>> > >>>> qemu-timer-common.o: In function `init_get_clock': > >>>> /usr/src/packages/BUILD/xen-4.2.25432/non-dbg/tools/qemu-xen-dir/qemu-timer-common.c:57: > >>>> undefined reference to `clock_gettime' > >>>> qga/guest-agent-commands.o: In function `qmp_guest_file_write': > >>>> qga/guest-agent-commands.c:249: undefined reference to `g_base64_decode' > >>>> qga/guest-agent-commands.o: In function `qmp_guest_file_read': > >>>> qga/guest-agent-commands.c:224: undefined reference to `g_base64_encode' > >>>> collect2: ld returned 1 exit status > >>>> make[3]: *** [qemu-ga] Error 1 > >>>> > >>>> Add a version check to configure to require at least glib 2.12 to build > >>>> qemu-upstream. > >>> Does this cause configure to fail or does it cause us to just not build > >>> qemu-upstream? I think the former (which is fine with me) but your last > >>> sentence suggests that latter. > >> From my understanding it causes Qemu build to fail, since our version > >> of Qemu configure script doesn't check for glib version. > > > > But this patch makes it do that check, right? > > Yes, we currently check for glib, but we don't require any specific > version. This patch sets the necessary glib version for Qemu-upstream > compilation to succeed as a requirement for our configure script.Right. By "this" in my original question I was asking about the change not the original failure, sorry that was probably not obvious. IOW the behaviour after this patch is that our configure will now fail.> > > > >> The following commit should be backported to our Qemu tree also > >> a52d28afb4e825a5b28815370a268904a4c6dc11. > >> > >>>> Signed-off-by: Olaf Hering<olaf@aepfle.de> > >> Anyway, since we check for glib already, I think this should be applied, > >> so at least we check for the required version > >> > >> Acked-by: Roger Pau Monné<roger.pau@citrix.com> > >> > >> Please rerun autoconf after applying this. > >> > >>>> diff -r a70b35deb2b5 -r ea554d05821b tools/configure.ac > >>>> --- a/tools/configure.ac > >>>> +++ b/tools/configure.ac > >>>> @@ -115,7 +115,7 @@ AX_PATH_PROG_OR_FAIL([BCC], [bcc]) > >>>> AX_PATH_PROG_OR_FAIL([IASL], [iasl]) > >>>> AX_CHECK_UUID > >>>> AX_CHECK_CURSES > >>>> -PKG_CHECK_MODULES(glib, glib-2.0) > >>>> +PKG_CHECK_MODULES(glib, [glib-2.0>= 2.12]) > >>>> > >>>> # Check library path > >>>> AX_DEFAULT_LIB > >>>> > >>>> _______________________________________________ > >>>> Xen-devel mailing list > >>>> Xen-devel@lists.xen.org > >>>> http://lists.xen.org/xen-devel > >>> > > > > >_______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel
Olaf Hering
2012-Jun-13 12:54 UTC
Re: [PATCH 1 of 3] tools/configure.ac: add version check for glib2
On Wed, Jun 13, Ian Campbell wrote:> On Wed, 2012-06-13 at 09:01 +0100, Olaf Hering wrote: > > # HG changeset patch > > # User Olaf Hering <olaf@aepfle.de> > > # Date 1339572293 -7200 > > # Node ID ea554d05821b95a7e96e4a25cbf953c5abe35aeb > > # Parent a70b35deb2b5592cc1b2363860f21bb2c7049885 > > tools/configure.ac: add version check for glib2 > > > > xen-unstable fails to build in a SLES10SP4 environment since a long time > > because the included version of glib is slightly older than the required > > glib version. According to the docs glib version 2.12 includes base64 > > support, but SLES10 is shipped with glib 2.8.6: > > > > qemu-timer-common.o: In function `init_get_clock'': > > /usr/src/packages/BUILD/xen-4.2.25432/non-dbg/tools/qemu-xen-dir/qemu-timer-common.c:57: > > undefined reference to `clock_gettime'' > > qga/guest-agent-commands.o: In function `qmp_guest_file_write'': > > qga/guest-agent-commands.c:249: undefined reference to `g_base64_decode'' > > qga/guest-agent-commands.o: In function `qmp_guest_file_read'': > > qga/guest-agent-commands.c:224: undefined reference to `g_base64_encode'' > > collect2: ld returned 1 exit status > > make[3]: *** [qemu-ga] Error 1 > > > > Add a version check to configure to require at least glib 2.12 to build > > qemu-upstream. > > Does this cause configure to fail or does it cause us to just not build > qemu-upstream? I think the former (which is fine with me) but your last > sentence suggests that latter.I will resend with this change: Add a version check to toplevel configure to require at least glib 2.12. This makes sure configure can detect the condition early instead of failing later in the middle of tools build when qemu-upstream errors out. Olaf