From patchwork Thu Sep 26 23:21:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Spenser Gilliland X-Patchwork-Id: 278296 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 9EEAB2C033E for ; Fri, 27 Sep 2013 09:22:22 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A02E98C027; Thu, 26 Sep 2013 23:22:21 +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 ey5ZRtc4j5Wb; Thu, 26 Sep 2013 23:22:15 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id D792E81652; Thu, 26 Sep 2013 23:22:13 +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 741101BF98C for ; Thu, 26 Sep 2013 23:22:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6F13F8BF30 for ; Thu, 26 Sep 2013 23:22:09 +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 e4nyGjELTXac for ; Thu, 26 Sep 2013 23:22:08 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ie0-f175.google.com (mail-ie0-f175.google.com [209.85.223.175]) by whitealder.osuosl.org (Postfix) with ESMTPS id 19AF58BF11 for ; Thu, 26 Sep 2013 23:22:08 +0000 (UTC) Received: by mail-ie0-f175.google.com with SMTP id e14so2399681iej.6 for ; Thu, 26 Sep 2013 16:22:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Nfm/Qpnubwh0ggGHwR84BVleNGnKfkJfCeXf7oRUuoQ=; b=mbHlgbWoqeJXOHW5f4yPQI7g1shEIJKR/M8bVrGO8glCJHV3/S1F4t0Yz5xsbm1GR3 lVIOwFCoOcHPWlolrL/+sCj7Al2UcmhP5tbgVGXZpjY6o/JQN0UEIb3avNR2RKl2ihWa z5gmyvKL017v7BncXRHIx2szPOfepq+5K3Dq1YEN9DmxHcx1cLQLDsWFKbw2E88g7FMN PoYObRsxI3uHBA+4wtP6Y+enOup+N9mLx29gYlJPIMBezR6OYzIralH4H8gaEHOspX4a hiKlHNz/gXCC00agc4tw7ZmRjyrbqKFOew/qP1FbEDRd10+yKxXvihWKOxsxDhikKhsV o7eg== X-Gm-Message-State: ALoCoQl4vsZassas5aVLZAXC1tJGGuUmaLK/m+L9AxMY6lEQRJzWERx/3E0C7ryhROQNgdazaIsp X-Received: by 10.43.162.136 with SMTP id mk8mr4364211icc.9.1380237727475; Thu, 26 Sep 2013 16:22:07 -0700 (PDT) Received: from localhost.localdomain (dhcp138.ece.iit.edu. [216.47.144.138]) by mx.google.com with ESMTPSA id yt10sm1006232igb.9.1969.12.31.16.00.00 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 26 Sep 2013 16:22:07 -0700 (PDT) From: Spenser Gilliland To: buildroot@busybox.net Date: Thu, 26 Sep 2013 18:21:46 -0500 Message-Id: <1380237714-2470-4-git-send-email-spenser@gillilanding.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1380237714-2470-1-git-send-email-spenser@gillilanding.com> References: <1380237714-2470-1-git-send-email-spenser@gillilanding.com> Subject: [Buildroot] [PATCH v3 03/11] libpthread-stubs: move out of x11r7 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 Signed-off-by: Spenser Gilliland --- package/Config.in | 1 + package/libdrm/libdrm.mk | 2 +- .../Config.in | 2 +- package/libpthread-stubs/xlib_libpthread-stubs.mk | 17 +++++++++++++++++ package/x11r7/Config.in | 1 - package/x11r7/libxcb/Config.in | 2 +- .../xlib_libpthread-stubs/xlib_libpthread-stubs.mk | 16 ---------------- 7 files changed, 21 insertions(+), 20 deletions(-) rename package/{x11r7/xlib_libpthread-stubs => libpthread-stubs}/Config.in (81%) create mode 100644 package/libpthread-stubs/xlib_libpthread-stubs.mk delete mode 100644 package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk diff --git a/package/Config.in b/package/Config.in index 1dd60d1..ca825f5 100644 --- a/package/Config.in +++ b/package/Config.in @@ -668,6 +668,7 @@ source "package/libglib2/Config.in" source "package/libical/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/libsigc/Config.in" source "package/libsigsegv/Config.in" diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index 697cd2f..da3a87c 100644 --- 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/x11r7/xlib_libpthread-stubs/Config.in b/package/libpthread-stubs/Config.in similarity index 81% rename from package/x11r7/xlib_libpthread-stubs/Config.in rename to package/libpthread-stubs/Config.in index fb53585..f81d851 100644 --- a/package/x11r7/xlib_libpthread-stubs/Config.in +++ b/package/libpthread-stubs/Config.in @@ -1,4 +1,4 @@ -config BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS +config BR2_PACKAGE_LIBPTHREAD_STUBS bool "libpthread-stubs" help This library provides weak aliases for pthread functions not diff --git a/package/libpthread-stubs/xlib_libpthread-stubs.mk b/package/libpthread-stubs/xlib_libpthread-stubs.mk new file mode 100644 index 0000000..c165183 --- /dev/null +++ b/package/libpthread-stubs/xlib_libpthread-stubs.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# 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 + +$(eval $(autotools-package)) +$(eval $(host-autotools-package)) + diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in index 205079c..16cd4b4 100644 --- a/package/x11r7/Config.in +++ b/package/x11r7/Config.in @@ -51,7 +51,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/xlib_libpthread-stubs/xlib_libpthread-stubs.mk b/package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk deleted file mode 100644 index 5ea02e9..0000000 --- a/package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk +++ /dev/null @@ -1,16 +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 - -$(eval $(autotools-package)) -$(eval $(host-autotools-package))