* [PATCH] mesa-demos: Specify the lib dir to locate glut libraries
@ 2014-05-08 20:17 Drew Moseley
2014-05-10 6:33 ` Khem Raj
2014-05-12 16:34 ` Drew Moseley
0 siblings, 2 replies; 11+ messages in thread
From: Drew Moseley @ 2014-05-08 20:17 UTC (permalink / raw)
To: openembedded-core
From: Drew Moseley <drew_moseley@mentor.com>
Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
---
meta/recipes-graphics/mesa/mesa-demos/glut.patch | 2 +-
meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/mesa/mesa-demos/glut.patch b/meta/recipes-graphics/mesa/mesa-demos/glut.patch
index 84b6d4f..2ca5a93 100644
--- a/meta/recipes-graphics/mesa/mesa-demos/glut.patch
+++ b/meta/recipes-graphics/mesa/mesa-demos/glut.patch
@@ -27,7 +27,7 @@ Index: mesa-demos-8.0.1/configure.ac
- [glutInit],
- [],
- [glut_enabled=no])
-+ GLUT_LIBS="-L$withval/lib -lglut"],
++ GLUT_LIBS="-L$withval -lglut"],
+ [GLUT_CFLAGS=""
+ GLUT_LIBS="-lglut"]
+ )
diff --git a/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb b/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb
index d6e6fbc..211df3b 100644
--- a/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb
+++ b/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb
@@ -33,7 +33,7 @@ PACKAGECONFIG[freetype2] = "--enable-freetype2,--disable-freetype2,freetype"
PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm,virtual/libgl"
PACKAGECONFIG[gles1] = "--enable-gles1,--disable-gles1,virtual/libgles1"
PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,virtual/libgles2"
-PACKAGECONFIG[glut] = "--with-glut,--without-glut,"
+PACKAGECONFIG[glut] = "--with-glut=${STAGING_LIBDIR},--without-glut,"
PACKAGECONFIG[osmesa] = "--enable-osmesa,--disable-osmesa,"
PACKAGECONFIG[vg] = "--enable-vg,--disable-vg,virtual/libvg"
PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,virtual/libgl wayland"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH] mesa-demos: Specify the lib dir to locate glut libraries
2014-05-08 20:17 [PATCH] mesa-demos: Specify the lib dir to locate glut libraries Drew Moseley
@ 2014-05-10 6:33 ` Khem Raj
2014-05-12 14:40 ` Drew Moseley
2014-05-12 16:34 ` Drew Moseley
1 sibling, 1 reply; 11+ messages in thread
From: Khem Raj @ 2014-05-10 6:33 UTC (permalink / raw)
To: Drew Moseley; +Cc: Patches and discussions about the oe-core layer
On Thu, May 8, 2014 at 1:17 PM, Drew Moseley <drew@moseleynet.net> wrote:
> +PACKAGECONFIG[glut] = "--with-glut=${STAGING_LIBDIR},--without-glut,"
should this be libdir instead ?
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH] mesa-demos: Specify the lib dir to locate glut libraries
2014-05-10 6:33 ` Khem Raj
@ 2014-05-12 14:40 ` Drew Moseley
2014-05-12 15:06 ` Burton, Ross
0 siblings, 1 reply; 11+ messages in thread
From: Drew Moseley @ 2014-05-12 14:40 UTC (permalink / raw)
To: Khem Raj; +Cc: Patches and discussions about the oe-core layer
On May 10, 2014, at 2:33 AM, Khem Raj <raj.khem@gmail.com> wrote:
> On Thu, May 8, 2014 at 1:17 PM, Drew Moseley <drew@moseleynet.net> wrote:
>> +PACKAGECONFIG[glut] = "--with-glut=${STAGING_LIBDIR},--without-glut,"
>
> should this be libdir instead ?
I don't believe so. This is used at compile time to locate the libraries and header files. However forcing it here to be the libdir is clearly not correct even though it doesn't seem to break the build.
I'll continue investigating and see if I can find a better solution.
Drew
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH] mesa-demos: Specify the lib dir to locate glut libraries
2014-05-12 14:40 ` Drew Moseley
@ 2014-05-12 15:06 ` Burton, Ross
2014-05-12 15:28 ` Drew Moseley
0 siblings, 1 reply; 11+ messages in thread
From: Burton, Ross @ 2014-05-12 15:06 UTC (permalink / raw)
To: Drew Moseley; +Cc: Patches and discussions about the oe-core layer
On 12 May 2014 15:40, Drew Moseley <drew@moseleynet.net> wrote:
>> should this be libdir instead ?
>
> I don't believe so. This is used at compile time to locate the libraries and header files. However forcing it here to be the libdir is clearly not correct even though it doesn't seem to break the build.
>
> I'll continue investigating and see if I can find a better solution.
For configure-time detection of libraries STAGING_LIBDIR is correct.
Ross
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] mesa-demos: Specify the lib dir to locate glut libraries
2014-05-12 15:06 ` Burton, Ross
@ 2014-05-12 15:28 ` Drew Moseley
0 siblings, 0 replies; 11+ messages in thread
From: Drew Moseley @ 2014-05-12 15:28 UTC (permalink / raw)
To: Burton, Ross; +Cc: Patches and discussions about the oe-core layer
On May 12, 2014, at 11:06 AM, Burton, Ross <ross.burton@intel.com> wrote:
> On 12 May 2014 15:40, Drew Moseley <drew@moseleynet.net> wrote:
>>> should this be libdir instead ?
>>
>> I don't believe so. This is used at compile time to locate the libraries and header files. However forcing it here to be the libdir is clearly not correct even though it doesn't seem to break the build.
>>
>> I'll continue investigating and see if I can find a better solution.
>
> For configure-time detection of libraries STAGING_LIBDIR is correct.
>
> Ross
It's actually a bit different than just standard configure-time detection. With the current code, all that is specified on the configure command line is "--with-glut" which results in the following compile issue:
| ../../x86_64-mel-linux-libtool: line 6012: cd: yes/lib: No such file or directory
| x86_64-mel-linux-libtool: link: cannot determine absolute directory name of `yes/lib'
| make[2]: *** [libutil.la] Error 1
Interestingly since we use the '--sysroot=' command line option then the actual value specified to '--with-glut' is actually redundant. STAGING_LIBDIR is not the right value here though since it's used to located both header files and libs. I'm testing an updated version now.
Drew
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH] mesa-demos: Specify the lib dir to locate glut libraries
2014-05-08 20:17 [PATCH] mesa-demos: Specify the lib dir to locate glut libraries Drew Moseley
2014-05-10 6:33 ` Khem Raj
@ 2014-05-12 16:34 ` Drew Moseley
2014-05-12 16:53 ` Drew Moseley
2014-05-12 18:19 ` Saul Wold
1 sibling, 2 replies; 11+ messages in thread
From: Drew Moseley @ 2014-05-12 16:34 UTC (permalink / raw)
To: openembedded-core
From: Drew Moseley <drew_moseley@mentor.com>
Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
---
meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb b/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb
index d6e6fbc..7cda19e 100644
--- a/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb
+++ b/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb
@@ -33,7 +33,7 @@ PACKAGECONFIG[freetype2] = "--enable-freetype2,--disable-freetype2,freetype"
PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm,virtual/libgl"
PACKAGECONFIG[gles1] = "--enable-gles1,--disable-gles1,virtual/libgles1"
PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,virtual/libgles2"
-PACKAGECONFIG[glut] = "--with-glut,--without-glut,"
+PACKAGECONFIG[glut] = "--with-glut=${STAGING_EXECPREFIXDIR},--without-glut,"
PACKAGECONFIG[osmesa] = "--enable-osmesa,--disable-osmesa,"
PACKAGECONFIG[vg] = "--enable-vg,--disable-vg,virtual/libvg"
PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,virtual/libgl wayland"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH] mesa-demos: Specify the lib dir to locate glut libraries
2014-05-12 16:34 ` Drew Moseley
@ 2014-05-12 16:53 ` Drew Moseley
2014-05-12 18:19 ` Saul Wold
1 sibling, 0 replies; 11+ messages in thread
From: Drew Moseley @ 2014-05-12 16:53 UTC (permalink / raw)
To: openembedded-core
On May 12, 2014, at 12:34 PM, Drew Moseley <drew@moseleynet.net> wrote:
> From: Drew Moseley <drew_moseley@mentor.com>
>
> Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
Not sure why "git send-email" dropped the V2 that I thought I put into the
subject but for clarity this patch completely replaces my earlier one.
The modification of glut.patch is no longer needed.
Drew
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] mesa-demos: Specify the lib dir to locate glut libraries
2014-05-12 16:34 ` Drew Moseley
2014-05-12 16:53 ` Drew Moseley
@ 2014-05-12 18:19 ` Saul Wold
2014-05-12 20:10 ` [PATCH] mesa-demos: Specify the lib dir properly \Drew Moseley
1 sibling, 1 reply; 11+ messages in thread
From: Saul Wold @ 2014-05-12 18:19 UTC (permalink / raw)
To: Drew Moseley, openembedded-core
On 05/12/2014 09:34 AM, Drew Moseley wrote:
> From: Drew Moseley <drew_moseley@mentor.com>
>
> Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
> ---
> meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb b/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb
> index d6e6fbc..7cda19e 100644
> --- a/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb
> +++ b/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb
> @@ -33,7 +33,7 @@ PACKAGECONFIG[freetype2] = "--enable-freetype2,--disable-freetype2,freetype"
> PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm,virtual/libgl"
> PACKAGECONFIG[gles1] = "--enable-gles1,--disable-gles1,virtual/libgles1"
> PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,virtual/libgles2"
> -PACKAGECONFIG[glut] = "--with-glut,--without-glut,"
> +PACKAGECONFIG[glut] = "--with-glut=${STAGING_EXECPREFIXDIR},--without-glut,"
> PACKAGECONFIG[osmesa] = "--enable-osmesa,--disable-osmesa,"
> PACKAGECONFIG[vg] = "--enable-vg,--disable-vg,virtual/libvg"
> PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,virtual/libgl wayland"
>
Seems the first version was merged already, so we could revert it or if
you want to rebase this change against master, which would remove the
configure patch and update the PACKAGECONFIG as above.
Thanks
Sau!
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH] mesa-demos: Specify the lib dir properly.
2014-05-12 18:19 ` Saul Wold
@ 2014-05-12 20:10 ` \Drew Moseley
2014-05-12 21:42 ` Richard Purdie
0 siblings, 1 reply; 11+ messages in thread
From: \Drew Moseley @ 2014-05-12 20:10 UTC (permalink / raw)
To: openembedded-core
From: Drew Moseley <drew_moseley@mentor.com>
Use STAGING_EXECPREFIXDIR to specify the location of glut
header files and libs rather than STAGING_LIBDIR.
Also revert the previous unneeded change to glut.patch.
Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
---
meta/recipes-graphics/mesa/mesa-demos/glut.patch | 2 +-
meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/mesa/mesa-demos/glut.patch b/meta/recipes-graphics/mesa/mesa-demos/glut.patch
index 2ca5a93..84b6d4f 100644
--- a/meta/recipes-graphics/mesa/mesa-demos/glut.patch
+++ b/meta/recipes-graphics/mesa/mesa-demos/glut.patch
@@ -27,7 +27,7 @@ Index: mesa-demos-8.0.1/configure.ac
- [glutInit],
- [],
- [glut_enabled=no])
-+ GLUT_LIBS="-L$withval -lglut"],
++ GLUT_LIBS="-L$withval/lib -lglut"],
+ [GLUT_CFLAGS=""
+ GLUT_LIBS="-lglut"]
+ )
diff --git a/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb b/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb
index 211df3b..7cda19e 100644
--- a/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb
+++ b/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb
@@ -33,7 +33,7 @@ PACKAGECONFIG[freetype2] = "--enable-freetype2,--disable-freetype2,freetype"
PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm,virtual/libgl"
PACKAGECONFIG[gles1] = "--enable-gles1,--disable-gles1,virtual/libgles1"
PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,virtual/libgles2"
-PACKAGECONFIG[glut] = "--with-glut=${STAGING_LIBDIR},--without-glut,"
+PACKAGECONFIG[glut] = "--with-glut=${STAGING_EXECPREFIXDIR},--without-glut,"
PACKAGECONFIG[osmesa] = "--enable-osmesa,--disable-osmesa,"
PACKAGECONFIG[vg] = "--enable-vg,--disable-vg,virtual/libvg"
PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,virtual/libgl wayland"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH] mesa-demos: Specify the lib dir properly.
2014-05-12 20:10 ` [PATCH] mesa-demos: Specify the lib dir properly \Drew Moseley
@ 2014-05-12 21:42 ` Richard Purdie
2014-05-12 22:26 ` Drew Moseley
0 siblings, 1 reply; 11+ messages in thread
From: Richard Purdie @ 2014-05-12 21:42 UTC (permalink / raw)
To: \Drew Moseley; +Cc: openembedded-core
On Mon, 2014-05-12 at 16:10 -0400, \Drew Moseley wrote:
> From: Drew Moseley <drew_moseley@mentor.com>
>
> Use STAGING_EXECPREFIXDIR to specify the location of glut
> header files and libs rather than STAGING_LIBDIR.
>
> Also revert the previous unneeded change to glut.patch.
>
> Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
> ---
> meta/recipes-graphics/mesa/mesa-demos/glut.patch | 2 +-
> meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
Is this change multilib safe?
It looks to me like this hardcodes "lib" and things like "lib64" or
"lib32" would be an issue since it wouldn't honour $libdir?
Cheers,
Richard
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] mesa-demos: Specify the lib dir properly.
2014-05-12 21:42 ` Richard Purdie
@ 2014-05-12 22:26 ` Drew Moseley
0 siblings, 0 replies; 11+ messages in thread
From: Drew Moseley @ 2014-05-12 22:26 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
On May 12, 2014, at 5:42 PM, Richard Purdie <richard.purdie@linuxfoundation.org> wrote:
> On Mon, 2014-05-12 at 16:10 -0400, \Drew Moseley wrote:
>> From: Drew Moseley <drew_moseley@mentor.com>
>>
>> Use STAGING_EXECPREFIXDIR to specify the location of glut
>> header files and libs rather than STAGING_LIBDIR.
>>
>> Also revert the previous unneeded change to glut.patch.
>>
>> Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
>> ---
>> meta/recipes-graphics/mesa/mesa-demos/glut.patch | 2 +-
>> meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb | 2 +-
>> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> Is this change multilib safe?
>
> It looks to me like this hardcodes "lib" and things like "lib64" or
> "lib32" would be an issue since it wouldn't honour $libdir?
>
> Cheers,
>
> Richard
Sort of. This is essentially putting the code back to what it was yesterday
which was hardcoded to /lib. It doesn't affect Yocto builds since the
"--sysroot" option makes the directories specified here redundant. I have
verified the libraries are properly located even when installed in usr/lib64.
Ultimately this should probably be cleaned up in the upstream mesa-demos
by adding a "--with-glut-includes" and "--with-glut-libs" or some such but
this is at least less broken than it was before Previously setting "glut"
in the packageconfig would pass "--with-glut" to configure resulting in
the build failure:
> ../../x86_64-mel-linux-libtool: line 6012: cd: yes/lib: No such file or directory
> x86_64-mel-linux-libtool: link: cannot determine absolute directory name of `yes/lib'
> make[2]: *** [libutil.la] Error 1
Drew
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2014-05-12 22:31 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-08 20:17 [PATCH] mesa-demos: Specify the lib dir to locate glut libraries Drew Moseley
2014-05-10 6:33 ` Khem Raj
2014-05-12 14:40 ` Drew Moseley
2014-05-12 15:06 ` Burton, Ross
2014-05-12 15:28 ` Drew Moseley
2014-05-12 16:34 ` Drew Moseley
2014-05-12 16:53 ` Drew Moseley
2014-05-12 18:19 ` Saul Wold
2014-05-12 20:10 ` [PATCH] mesa-demos: Specify the lib dir properly \Drew Moseley
2014-05-12 21:42 ` Richard Purdie
2014-05-12 22:26 ` Drew Moseley
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox