From patchwork Fri Dec 20 15:33:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 304117 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id B1B602C00A4 for ; Sat, 21 Dec 2013 02:34:27 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 101EF8C605; Fri, 20 Dec 2013 15:34:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Tw-9xe-MTKSP; Fri, 20 Dec 2013 15:34:24 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id CB4DD8C62A; Fri, 20 Dec 2013 15:34:24 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 2FA661C294E for ; Fri, 20 Dec 2013 15:34:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 258E68C169 for ; Fri, 20 Dec 2013 15:34:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CaR5-mr0t0eA for ; Fri, 20 Dec 2013 15:34:18 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from marvin.crapouillou.net (rev33.vpn.fdn.fr [80.67.179.33]) by whitealder.osuosl.org (Postfix) with ESMTPS id B28558C23D for ; Fri, 20 Dec 2013 15:34:17 +0000 (UTC) Received: from acaen-252-1-185-247.w90-62.abo.wanadoo.fr ([90.62.173.247] helo=debian.home) by marvin.crapouillou.net with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA256:128) (Exim 4.80) (envelope-from ) id 1Vu25d-00081j-9t; Fri, 20 Dec 2013 16:34:13 +0100 From: Paul Cercueil To: buildroot@busybox.net Date: Fri, 20 Dec 2013 16:33:43 +0100 Message-Id: <1387553624-6780-2-git-send-email-paul@crapouillou.net> X-Mailer: git-send-email 1.8.5.1 In-Reply-To: <1387553624-6780-1-git-send-email-paul@crapouillou.net> References: <1387553624-6780-1-git-send-email-paul@crapouillou.net> Cc: Paul Cercueil Subject: [Buildroot] [PATCH 1/2] xlib_libpthread-stubs: Rename package to libpthread-stubs X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net While libpthread-stubs is part of the X libraries, it does not depend upon X11 or any other X library. On the current architecture, X11 must be enabled for this package to be selectionned; this commit aims to address this problem. Signed-Off-By: Paul Cercueil --- Config.in.legacy | 15 ++++++++++++--- package/Config.in | 1 + package/libpthread-stubs/Config.in | 11 +++++++++++ package/libpthread-stubs/libpthread-stubs.mk | 20 ++++++++++++++++++++ package/x11r7/Config.in | 1 - package/x11r7/libxcb/Config.in | 2 +- package/x11r7/libxcb/libxcb.mk | 2 +- package/x11r7/xlib_libpthread-stubs/Config.in | 11 ----------- .../xlib_libpthread-stubs/xlib_libpthread-stubs.mk | 20 -------------------- 9 files changed, 46 insertions(+), 37 deletions(-) create mode 100644 package/libpthread-stubs/Config.in create mode 100644 package/libpthread-stubs/libpthread-stubs.mk delete mode 100644 package/x11r7/xlib_libpthread-stubs/Config.in delete mode 100644 package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk diff --git a/Config.in.legacy b/Config.in.legacy index 09935f1..97edb01 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -382,11 +382,20 @@ 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. + +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 do not depend on X11 nor Xlib. Thus the + package has been renamed + BR2_PACKAGE_LIBPTHREAD_STUBS ############################################################################### comment "Legacy options removed in 2012.08" diff --git a/package/Config.in b/package/Config.in index 311cc6c..e6ccc6a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -698,6 +698,7 @@ source "package/libical/Config.in" source "package/liblog4c-localtime/Config.in" source "package/libnspr/Config.in" source "package/libpfm4/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/libpthread-stubs/Config.in b/package/libpthread-stubs/Config.in new file mode 100644 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 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 a534df9..fb0f8ed 100644 --- a/package/x11r7/Config.in +++ b/package/x11r7/Config.in @@ -52,7 +52,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 1e1afb4..32569f7 100644 --- 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 dfcf6fa..22197e3 100644 --- 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_ENV = STAGING_DIR="$(STAGING_DIR)" LIBXCB_MAKE_OPT = XCBPROTO_XCBINCLUDEDIR=$(STAGING_DIR)/usr/share/xcb \ diff --git a/package/x11r7/xlib_libpthread-stubs/Config.in b/package/x11r7/xlib_libpthread-stubs/Config.in deleted file mode 100644 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 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))