Skip to contentSkip to conversation

xlib_libpthread-stubs: needs -pthread when linking statically

PATCH New Arnout Vandecappelle (Essensium/Mind) 2 participants 3 messages Nov 9, 2013 – Nov 10, 2013

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 xlib_libpthread-stubs: needs -pthread when linking statically

Fixes e.g. http://autobuild.buildroot.net/results/1eaa694263b74313b0c90c510abcb11d490a3773/

---
My gcc manual only documents the -pthread option for some architectures, but it seems to work for x86, sh and arm as well.

v2: resend

---
 package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk | 4 ++++
 1 file changed, 4 insertions(+)
package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk +4 -0
index 5ea02e9..6343691 100644
@@ -12,5 +12,9 @@ XLIB_LIBPTHREAD_STUBS_LICENSE_FILES = COPYING
 
 XLIB_LIBPTHREAD_STUBS_INSTALL_STAGING = YES
 
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+XLIB_LIBPTHREAD_STUBS_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -pthread"
+endif
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
Signature · 1 line
1.8.4.2
#1 lore raw

PATCH v2 2/2 xorg: needs thread support

From: Jerzy Grzegorek <[email protected]>

libpthread-stubs, libX11, and a few more xorg packages use threads. Since almost all xorg packages depend on libX11 directory or indirectly, and since the remaining ones are pretty useless on their own, just require threads for xorg as a whole.

The thread dependency is kept in libpthread-stubs, because that package will move out of the x11r7 directory later (pending patch by Spenser Gilliland), so the dependency on threads will be required then.

Fixes:
http://autobuild.buildroot.org/results/609/6099baac4bb469ae18aab6512233db25183eaabd/

[Arnout: disable all of xorg, correct comment]

---
v2:
- Patch taken over by Arnout
- Resolve reverse dependencies of libpthread-stubs -- turns out all of xorg needs to be disabled
- Change the comment according to the official pattern

---
 package/x11r7/Config.in                       | 5 +++--
 package/x11r7/xlib_libpthread-stubs/Config.in | 4 ++++
 2 files changed, 7 insertions(+), 2 deletions(-)
package/x11r7/Config.in +3 -2
index 09bc078..94cf7c6 100644
@@ -1,6 +1,7 @@
 menuconfig BR2_PACKAGE_XORG7
 	bool "X.org X Window System"
 	depends on BR2_USE_WCHAR
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  Support for X11R7 libraries, servers, drivers, and/or
 	  applications in the target.
@@ -261,5 +262,5 @@ if BR2_PACKAGE_XORG7
 	endmenu
 endif
 
-comment "X.org needs a toolchain w/ wchar"
-        depends on !BR2_USE_WCHAR
+comment "X.org needs a toolchain w/ wchar, threads"
+        depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
package/x11r7/xlib_libpthread-stubs/Config.in +4 -0
index fb53585..6ce1b94 100644
@@ -1,7 +1,11 @@
 config BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS
 	bool "libpthread-stubs"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  This library provides weak aliases for pthread functions not
 	  provided in libc or otherwise available by default.
 
 	  http://xcb.freedesktop.org/
+
+comment "libpthread-stubs needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
Signature · 1 line
1.8.4.2
#2 lore raw

PATCH v2 1/2 xlib_libpthread-stubs: needs -pthread when linking statically

In reply to Arnout Vandecappelle (Essensium/Mind)
Quoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Arnout" == Arnout Vandecappelle (Essensium/Mind) <[email protected]> writes:

Fixes e.g. http://autobuild.buildroot.net/results/1eaa694263b74313b0c90c510abcb11d490a3773/

---
My gcc manual only documents the -pthread option for some architectures, but it seems to work for x86, sh and arm as well.

v2: resend

Committed both, thanks.

Signature · 1 line
Bye, Peter Korsgaard