xlib_libpthread-stubs: Rename package to libpthread-stubs

Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com>
Signed-Off-By: Paul Cercueil <paul@crapouillou.net>
Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/Config.in.legacy b/Config.in.legacy
index cfcf5a34079f305f6e6584f7c8fceef489aef683..afcd3b1b5456b8c617a1f5ee93b1656052e78109 100644 (file)
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -172,6 +172,15 @@ config BR2_PACKAGE_UDEV_ALL_EXTRAS
          the 'udev' providers if the dependencies are selected. For
          example, selecting 'libglib2' will trigger the build of gudev.
 
+config BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS
+       bool "xlib-libpthread-stubs option has been renamed"
+       depends on BR2_PACKAGE_XORG7
+       select BR2_LEGACY
+       select BR2_PACKAGE_LIBPTHREAD_STUBS
+       help
+         The pthread stubs neither depend on X11 nor Xlib. Thus the
+         package has been renamed BR2_PACKAGE_LIBPTHREAD_STUBS
+
 ###############################################################################
 comment "Legacy options removed in 2014.02"
 
@@ -642,11 +651,10 @@ config BR2_PACKAGE_XSERVER_tinyx
 config BR2_PACKAGE_PTHREAD_STUBS
        bool "pthread-stubs option has been renamed"
        select BR2_LEGACY
-       select BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS
-       depends on BR2_PACKAGE_XORG7
+       select BR2_PACKAGE_LIBPTHREAD_STUBS
        help
          For consistency reason, the pthread-stubs package has been
-         renamed to xlib_libpthread-stubs.
+         renamed to libpthread-stubs.
 
 ###############################################################################
 comment "Legacy options removed in 2012.08"

diff --git a/package/Config.in b/package/Config.in
index a519b97799d214eba1a756ca5325e6a7718a065f..e6fe6aa230106c836f9ed9632d608df6f1304214 100644 (file)
--- a/package/Config.in
+++ b/package/Config.in
@@ -775,6 +775,7 @@ source "package/liblog4c-localtime/Config.in"
 source "package/libnspr/Config.in"
 source "package/libpfm4/Config.in"
 source "package/libplist/Config.in"
+source "package/libpthread-stubs/Config.in"
 source "package/libpthsem/Config.in"
 source "package/libseccomp/Config.in"
 source "package/libsigc/Config.in"

diff --git a/package/libdrm/Config.in b/package/libdrm/Config.in
index 205f47ceeab13c8fd14020e09c5701b7d01cb70d..4d7646bec4669606cb3d5e4be6a8bb14f4303fc1 100644 (file)
--- a/package/libdrm/Config.in
+++ b/package/libdrm/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LIBDRM
        bool "libdrm"
-       select BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS
+       select BR2_PACKAGE_LIBPTHREAD_STUBS
        depends on BR2_PACKAGE_XORG7
        depends on BR2_LARGEFILE
        help

diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk
index a1b0580d9df9ae73c64d7777d37f3106142a8969..b9b7a58f6b190443cd85f11cd050a63e0c7fc8ad 100644 (file)
--- a/package/libdrm/libdrm.mk
+++ b/package/libdrm/libdrm.mk
@@ -12,7 +12,7 @@ LIBDRM_LICENSE = MIT
 LIBDRM_INSTALL_STAGING = YES
 
 LIBDRM_DEPENDENCIES = \
-       xlib_libpthread-stubs \
+       libpthread-stubs \
        host-pkgconf
 
 LIBDRM_CONF_OPT = \

diff --git a/package/libpthread-stubs/Config.in b/package/libpthread-stubs/Config.in
new file mode 100644 (file)
index 0000000..a4ce1cb
--- /dev/null
+++ b/package/libpthread-stubs/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_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

diff --git a/package/libpthread-stubs/libpthread-stubs.mk b/package/libpthread-stubs/libpthread-stubs.mk
new file mode 100644 (file)
index 0000000..b72e5a6
--- /dev/null
+++ b/package/libpthread-stubs/libpthread-stubs.mk
@@ -0,0 +1,20 @@
+################################################################################
+#
+# libpthread-stubs
+#
+################################################################################
+
+LIBPTHREAD_STUBS_VERSION = 0.3
+LIBPTHREAD_STUBS_SOURCE = libpthread-stubs-$(LIBPTHREAD_STUBS_VERSION).tar.bz2
+LIBPTHREAD_STUBS_SITE = http://xcb.freedesktop.org/dist/
+LIBPTHREAD_STUBS_LICENSE = MIT
+LIBPTHREAD_STUBS_LICENSE_FILES = COPYING
+
+LIBPTHREAD_STUBS_INSTALL_STAGING = YES
+
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+LIBPTHREAD_STUBS_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -pthread"
+endif
+
+$(eval $(autotools-package))
+$(eval $(host-autotools-package))

diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 5eff2df1a7ad1ee0758fe3437c4ce3b02e9ff369..5ef118b8703366b54c9f26836953495763848878 100644 (file)
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -53,7 +53,6 @@ if BR2_PACKAGE_XORG7
                source package/x11r7/xlib_libxkbfile/Config.in
                source package/x11r7/xlib_xtrans/Config.in
                source package/x11r7/xlib_libpciaccess/Config.in
-               source package/x11r7/xlib_libpthread-stubs/Config.in
        endmenu
        menu "X11R7 Applications"
                source package/x11r7/xapp_appres/Config.in

diff --git a/package/x11r7/libxcb/Config.in b/package/x11r7/libxcb/Config.in
index 1e1afb4cf7f187e5e872e4fd7b267f8980e72e13..32569f7918e6d080924bcbf9211ff3b7cef060e1 100644 (file)
--- a/package/x11r7/libxcb/Config.in
+++ b/package/x11r7/libxcb/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LIBXCB
        bool "libxcb"
-       select BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS
+       select BR2_PACKAGE_LIBPTHREAD_STUBS
        select BR2_PACKAGE_XCB_PROTO
        select BR2_PACKAGE_XLIB_LIBXDMCP
        select BR2_PACKAGE_XLIB_LIBXAU

diff --git a/package/x11r7/libxcb/libxcb.mk b/package/x11r7/libxcb/libxcb.mk
index fa8ed6dc214409072612463ab41609d813b3d07a..9cd8bf9d2d1fd00263f7c4314a2cad0ea57aa4b4 100644 (file)
--- a/package/x11r7/libxcb/libxcb.mk
+++ b/package/x11r7/libxcb/libxcb.mk
@@ -13,7 +13,7 @@ LIBXCB_LICENSE_FILES = COPYING
 LIBXCB_INSTALL_STAGING = YES
 
 LIBXCB_DEPENDENCIES = \
-       host-libxslt xlib_libpthread-stubs xcb-proto xlib_libXdmcp xlib_libXau \
+       host-libxslt libpthread-stubs xcb-proto xlib_libXdmcp xlib_libXau \
        host-xcb-proto host-python host-pkgconf
 
 LIBXCB_CONF_OPT = --disable-build-docs

diff --git a/package/x11r7/xlib_libpthread-stubs/Config.in b/package/x11r7/xlib_libpthread-stubs/Config.in
deleted file mode 100644 (file)
index 6ce1b94..0000000
--- a/package/x11r7/xlib_libpthread-stubs/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-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

diff --git a/package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk b/package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk
deleted file mode 100644 (file)
index 6343691..0000000
--- a/package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-################################################################################
-#
-# xlib_libpthread-stubs
-#
-################################################################################
-
-XLIB_LIBPTHREAD_STUBS_VERSION = 0.3
-XLIB_LIBPTHREAD_STUBS_SOURCE = libpthread-stubs-$(XLIB_LIBPTHREAD_STUBS_VERSION).tar.bz2
-XLIB_LIBPTHREAD_STUBS_SITE = http://xcb.freedesktop.org/dist/
-XLIB_LIBPTHREAD_STUBS_LICENSE = MIT
-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))