[prev in list] [next in list] [prev in thread] [next in thread]
List: mesa3d-dev
Subject: Re: [Mesa3d-dev] [PATCH] Fix EGL -dl inclusion when using autoconf
From: Benjamin Close <Benjamin.Close () clearchain ! com>
Date: 2009-02-26 22:28:46
Message-ID: 49A714CE.1090509 () clearchain ! com
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
On 27/02/2009 4:01 AM, Dan Nicholson wrote:
> On Thu, Feb 26, 2009 at 7:19 AM, Brian Paul<brianp@vmware.com> wrote:
>
>> Benjamin Close wrote:
>>
>>> configs/autoconf pulls in configs/defaults.
>>> EGL_LIB_DEPS in defauls has -dl which doesn't work on all platforms.
>>> Instead when using autoconf we pull in the already tested
>>> DLOPEN_LIBS variable and substitute it accordingly. This
>>> should make all o/s happy.
>>>
>>> Signed-off-by: Benjamin Close<Benjamin.Close@clearchain.com>
>>> ---
>>> configs/autoconf.in | 1 +
>>> configure.ac | 2 ++
>>> 2 files changed, 3 insertions(+), 0 deletions(-)
>>>
>>> diff --git a/configs/autoconf.in b/configs/autoconf.in
>>> index af66d58..b2e6ecf 100644
>>> --- a/configs/autoconf.in
>>> +++ b/configs/autoconf.in
>>> @@ -87,6 +87,7 @@ GLW_SOURCES = @GLW_SOURCES@
>>> MOTIF_CFLAGS = @MOTIF_CFLAGS@
>>>
>>> # Library/program dependencies
>>> +EGL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 @EGL_LIB_DEPS@
>>> GL_LIB_DEPS = $(EXTRA_LIB_PATH) @GL_LIB_DEPS@
>>> OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @OSMESA_MESA_DEPS@ \
>>> $(EXTRA_LIB_PATH) @OSMESA_LIB_DEPS@
>>> diff --git a/configure.ac b/configure.ac
>>> index bc233a7..88bb3a8 100644
>>> --- a/configure.ac
>>> +++ b/configure.ac
>>> @@ -674,6 +674,8 @@ esac
>>> dnl Just default to no EGL for now
>>> USING_EGL=0
>>> AC_SUBST([USING_EGL])
>>> +EGL_LIB_DEPS="$DLOPEN_LIBS"
>>> +AC_SUBST(EGL_LIB_DEPS)
>>>
>>> dnl Set DRI_DIRS, DEFINES and LIB_DEPS
>>> if test "$mesa_driver" = dri; then
>>>
>> Looks like Dan Nicholson's commit
>> 53b373451142aeea9111143d7902bf8f5716ef75 does something like this.
>> Maybe take a look at his change.
>>
>
> Yeah, it should work exactly the same as libGL under DRI. I meant to
> ping Benjamin for that, but forgot.
>
Confirmed, Dan's patch addresses the issue nicely. This one can be scrapped.
Cheers,
Benjamin
[Attachment #5 (text/html)]
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
</head>
<body bgcolor="#ffffff" text="#000000">
On 27/02/2009 4:01 AM, Dan Nicholson wrote:
<blockquote
cite="mid:91705d080902260931oe9c80c9r512451b937c2e6f7@mail.gmail.com"
type="cite">
<pre wrap="">On Thu, Feb 26, 2009 at 7:19 AM, Brian Paul <a \
class="moz-txt-link-rfc2396E" \
href="mailto:brianp@vmware.com"><brianp@vmware.com></a> wrote: </pre>
<blockquote type="cite">
<pre wrap="">Benjamin Close wrote:
</pre>
<blockquote type="cite">
<pre wrap="">configs/autoconf pulls in configs/defaults.
EGL_LIB_DEPS in defauls has -dl which doesn't work on all platforms.
Instead when using autoconf we pull in the already tested
DLOPEN_LIBS variable and substitute it accordingly. This
should make all o/s happy.
Signed-off-by: Benjamin Close <a class="moz-txt-link-rfc2396E" \
href="mailto:Benjamin.Close@clearchain.com"><Benjamin.Close@clearchain.com></a>
---
configs/autoconf.in | 1 +
configure.ac | 2 ++
2 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/configs/autoconf.in b/configs/autoconf.in
index af66d58..b2e6ecf 100644
--- a/configs/autoconf.in
+++ b/configs/autoconf.in
@@ -87,6 +87,7 @@ GLW_SOURCES = @GLW_SOURCES@
MOTIF_CFLAGS = @MOTIF_CFLAGS@
# Library/program dependencies
+EGL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 @EGL_LIB_DEPS@
GL_LIB_DEPS = $(EXTRA_LIB_PATH) @GL_LIB_DEPS@
OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) @OSMESA_MESA_DEPS@ \
$(EXTRA_LIB_PATH) @OSMESA_LIB_DEPS@
diff --git a/configure.ac b/configure.ac
index bc233a7..88bb3a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -674,6 +674,8 @@ esac
dnl Just default to no EGL for now
USING_EGL=0
AC_SUBST([USING_EGL])
+EGL_LIB_DEPS="$DLOPEN_LIBS"
+AC_SUBST(EGL_LIB_DEPS)
dnl Set DRI_DIRS, DEFINES and LIB_DEPS
if test "$mesa_driver" = dri; then
</pre>
</blockquote>
<pre wrap="">Looks like Dan Nicholson's commit
53b373451142aeea9111143d7902bf8f5716ef75 does something like this.
Maybe take a look at his change.
</pre>
</blockquote>
<pre wrap=""><!---->
Yeah, it should work exactly the same as libGL under DRI. I meant to
ping Benjamin for that, but forgot.
</pre>
</blockquote>
Confirmed, Dan's patch addresses the issue nicely. This one can be
scrapped.<br>
<br>
Cheers,<br>
Benjamin<br>
</body>
</html>
------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
Mesa3d-dev mailing list
Mesa3d-dev@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic