Patchwork [v3,04/11] libdrm: remove x11 dependency.

login
register
mail settings
Submitter Spenser Gilliland
Date Sept. 26, 2013, 11:21 p.m.
Message ID <1380237714-2470-5-git-send-email-spenser@gillilanding.com>
Download mbox | patch
Permalink /patch/278297/
State Superseded
Headers show

Comments

Spenser Gilliland - Sept. 26, 2013, 11:21 p.m.
Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
---
 package/libdrm/Config.in |    3 +--
 package/libdrm/libdrm.mk |    3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)
Thomas Petazzoni - Oct. 1, 2013, 7:02 p.m.
Dear Spenser Gilliland,

On Thu, 26 Sep 2013 18:21:47 -0500, Spenser Gilliland wrote:
> 
> Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
> ---
>  package/libdrm/Config.in |    3 +--
>  package/libdrm/libdrm.mk |    3 +++
>  2 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/package/libdrm/Config.in b/package/libdrm/Config.in
> index 533e985..d67a6c2 100644
> --- a/package/libdrm/Config.in
> +++ b/package/libdrm/Config.in
> @@ -1,7 +1,6 @@
>  config BR2_PACKAGE_LIBDRM
>  	bool "libdrm"
> -	select BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS
> -	depends on BR2_PACKAGE_XORG7
> +	select BR2_PACKAGE_LIBPTHREAD_STUBS
>  	depends on BR2_LARGEFILE
>  	help
>  	  Direct Rendering Manager
> diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk
> index da3a87c..f9438cd 100644
> --- a/package/libdrm/libdrm.mk
> +++ b/package/libdrm/libdrm.mk
> @@ -19,6 +19,9 @@ LIBDRM_CONF_OPT = \
>  	--disable-cairo-tests \
>  	--disable-manpages
>  
> +LIBDRM_CONF_ENV = \
> +	LIBS="-lrt -lpthread"

This hunk has nothing to do with the commit title. I am also not really
happy with those libraries being explicitly listed. I do remember the
problem that you had, and that we did not understand it completely, but
it doesn't seem right to do this.

Best regards,

Thomas
Spenser Gilliland - Oct. 2, 2013, 2:44 p.m.
On Tue, Oct 1, 2013 at 2:02 PM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Dear Spenser Gilliland,
>
> On Thu, 26 Sep 2013 18:21:47 -0500, Spenser Gilliland wrote:
>>
>> Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
>> ---
>>  package/libdrm/Config.in |    3 +--
>>  package/libdrm/libdrm.mk |    3 +++
>>  2 files changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/package/libdrm/Config.in b/package/libdrm/Config.in
>> index 533e985..d67a6c2 100644
>> --- a/package/libdrm/Config.in
>> +++ b/package/libdrm/Config.in
>> @@ -1,7 +1,6 @@
>>  config BR2_PACKAGE_LIBDRM
>>       bool "libdrm"
>> -     select BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS
>> -     depends on BR2_PACKAGE_XORG7
>> +     select BR2_PACKAGE_LIBPTHREAD_STUBS
>>       depends on BR2_LARGEFILE
>>       help
>>         Direct Rendering Manager
>> diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk
>> index da3a87c..f9438cd 100644
>> --- a/package/libdrm/libdrm.mk
>> +++ b/package/libdrm/libdrm.mk
>> @@ -19,6 +19,9 @@ LIBDRM_CONF_OPT = \
>>       --disable-cairo-tests \
>>       --disable-manpages
>>
>> +LIBDRM_CONF_ENV = \
>> +     LIBS="-lrt -lpthread"
>
> This hunk has nothing to do with the commit title. I am also not really
> happy with those libraries being explicitly listed. I do remember the
> problem that you had, and that we did not understand it completely, but
> it doesn't seem right to do this.

Yes, sorry. This was something I added in my code to get it to build
reliably with the Linaro toolchain.  While it's not the prettiest
solution, I haven't found another way to make this work.

Regards,
Spenser
Bernd Kuhls - Jan. 8, 2014, 7:04 p.m.
Spenser Gilliland <spenser@gillilanding.com> wrote
in news:1380237714-2470-5-git-send-email-spenser@gillilanding.com: 

> 
> Signed-off-by: Spenser Gilliland
> <spenser@gillilanding.com>

Hi,

I think this patch was superseded by
http://patchwork.ozlabs.org/patch/304116/

Regards, Bernd

Patch

diff --git a/package/libdrm/Config.in b/package/libdrm/Config.in
index 533e985..d67a6c2 100644
--- a/package/libdrm/Config.in
+++ b/package/libdrm/Config.in
@@ -1,7 +1,6 @@ 
 config BR2_PACKAGE_LIBDRM
 	bool "libdrm"
-	select BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS
-	depends on BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_LIBPTHREAD_STUBS
 	depends on BR2_LARGEFILE
 	help
 	  Direct Rendering Manager
diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk
index da3a87c..f9438cd 100644
--- a/package/libdrm/libdrm.mk
+++ b/package/libdrm/libdrm.mk
@@ -19,6 +19,9 @@  LIBDRM_CONF_OPT = \
 	--disable-cairo-tests \
 	--disable-manpages
 
+LIBDRM_CONF_ENV = \
+	LIBS="-lrt -lpthread"
+
 ifeq ($(BR2_PACKAGE_LIBDRM_INTEL),y)
 LIBDRM_CONF_OPT += --enable-intel
 LIBDRM_DEPENDENCIES += libatomic_ops xlib_libpciaccess