Re: [Mesa-dev] [PATCH] configure.ac: Check for expat21 if expat is not found.
On 7 August 2017 at 19:13, Vinson Leewrote: > On Mon, Aug 7, 2017 at 8:18 AM, Emil Velikov wrote: >> On 5 August 2017 at 21:53, Vinson Lee wrote: >>> Fixes build error on CentOS 6.9. >>> >>> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102052 >>> Fixes: 5c007203b73d ("configure.ac: drop manual detection of expat >>> header/library") >>> Signed-off-by: Vinson Lee >>> --- >>> configure.ac |4 +++- >>> 1 files changed, 3 insertions(+), 1 deletions(-) >>> >>> diff --git a/configure.ac b/configure.ac >>> index 5b12dd8..0dfd47b 100644 >>> --- a/configure.ac >>> +++ b/configure.ac >>> @@ -1792,7 +1792,9 @@ if test "x$with_dri_drivers" = xno; then >>> fi >>> >>> # Check for expat >>> -PKG_CHECK_MODULES([EXPAT], [expat]) >>> +PKG_CHECK_MODULES([EXPAT], [expat],, >>> +[PKG_CHECK_MODULES([EXPAT], [expat21])] >> Hmm... the CenOS guys have gone "interesting" ways with this. >> >> I doubt we have any actual users for such setups, so I'm wondering if >> you can keep a WA for this locally. >> Say simply create a link/copy? >> >> Thanks >> Emil > > CentOS 6 and RHEL 6 have expat 2.0 by default. expat 2.0 does not > provide expat.pc. No arguments there - it's their decision to use 10+ year old software. Do we have any actual RHEL/CentOS 6 users, apart from the build testing that you do? If yes, sure let's have the workaround - otherwise, please keep it locally. Some solutions include: - cp/symlink the file - set EXPAT_CFLAGS and EXPAT_LIBS alongside/prior to calling configure -Emil ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] configure.ac: Check for expat21 if expat is not found.
On Mon, Aug 7, 2017 at 8:18 AM, Emil Velikovwrote: > On 5 August 2017 at 21:53, Vinson Lee wrote: >> Fixes build error on CentOS 6.9. >> >> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102052 >> Fixes: 5c007203b73d ("configure.ac: drop manual detection of expat >> header/library") >> Signed-off-by: Vinson Lee >> --- >> configure.ac |4 +++- >> 1 files changed, 3 insertions(+), 1 deletions(-) >> >> diff --git a/configure.ac b/configure.ac >> index 5b12dd8..0dfd47b 100644 >> --- a/configure.ac >> +++ b/configure.ac >> @@ -1792,7 +1792,9 @@ if test "x$with_dri_drivers" = xno; then >> fi >> >> # Check for expat >> -PKG_CHECK_MODULES([EXPAT], [expat]) >> +PKG_CHECK_MODULES([EXPAT], [expat],, >> +[PKG_CHECK_MODULES([EXPAT], [expat21])] > Hmm... the CenOS guys have gone "interesting" ways with this. > > I doubt we have any actual users for such setups, so I'm wondering if > you can keep a WA for this locally. > Say simply create a link/copy? > > Thanks > Emil CentOS 6 and RHEL 6 have expat 2.0 by default. expat 2.0 does not provide expat.pc. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] configure.ac: Check for expat21 if expat is not found.
On 5 August 2017 at 21:53, Vinson Leewrote: > Fixes build error on CentOS 6.9. > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102052 > Fixes: 5c007203b73d ("configure.ac: drop manual detection of expat > header/library") > Signed-off-by: Vinson Lee > --- > configure.ac |4 +++- > 1 files changed, 3 insertions(+), 1 deletions(-) > > diff --git a/configure.ac b/configure.ac > index 5b12dd8..0dfd47b 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -1792,7 +1792,9 @@ if test "x$with_dri_drivers" = xno; then > fi > > # Check for expat > -PKG_CHECK_MODULES([EXPAT], [expat]) > +PKG_CHECK_MODULES([EXPAT], [expat],, > +[PKG_CHECK_MODULES([EXPAT], [expat21])] Hmm... the CenOS guys have gone "interesting" ways with this. I doubt we have any actual users for such setups, so I'm wondering if you can keep a WA for this locally. Say simply create a link/copy? Thanks Emil ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] configure.ac: Check for expat21 if expat is not found.
Fixes build error on CentOS 6.9. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102052 Fixes: 5c007203b73d ("configure.ac: drop manual detection of expat header/library") Signed-off-by: Vinson Lee--- configure.ac |4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 5b12dd8..0dfd47b 100644 --- a/configure.ac +++ b/configure.ac @@ -1792,7 +1792,9 @@ if test "x$with_dri_drivers" = xno; then fi # Check for expat -PKG_CHECK_MODULES([EXPAT], [expat]) +PKG_CHECK_MODULES([EXPAT], [expat],, +[PKG_CHECK_MODULES([EXPAT], [expat21])] +) dnl If $with_dri_drivers is yes, drivers will be added through dnl platform checks. Set DEFINES and LIB_DEPS -- 1.7.1 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev