From patchwork Sat Jan 11 19:28:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 309538 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 9AAFD2C0095 for ; Sun, 12 Jan 2014 06:29:37 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 5CF8A9305F; Sat, 11 Jan 2014 19:29:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OT9oPkDh+RqR; Sat, 11 Jan 2014 19:29:27 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 41D368AE43; Sat, 11 Jan 2014 19:29:26 +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 D0DDA1BFA0C for ; Sat, 11 Jan 2014 19:29:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C971D8BE74 for ; Sat, 11 Jan 2014 19:29: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 Hd-LsfepN3Cf for ; Sat, 11 Jan 2014 19:29:17 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from blu0-omc3-s17.blu0.hotmail.com (blu0-omc3-s17.blu0.hotmail.com [65.55.116.92]) by whitealder.osuosl.org (Postfix) with ESMTP id 615B289CBD for ; Sat, 11 Jan 2014 19:29:17 +0000 (UTC) Received: from BLU0-SMTP76 ([65.55.116.74]) by blu0-omc3-s17.blu0.hotmail.com with Microsoft SMTPSVC(6.0.3790.4675); Sat, 11 Jan 2014 11:29:16 -0800 X-TMN: [HfaewwgLneJEqmMZnuKexmvp0v9VESYs] X-Originating-Email: [berndkuhls@hotmail.com] Message-ID: Received: from fli4l.lan.fli4l ([79.247.172.100]) by BLU0-SMTP76.phx.gbl over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Sat, 11 Jan 2014 11:29:13 -0800 Received: from fli4lbuild.lan.fli4l ([192.168.1.50]:35338) by fli4l.lan.fli4l with esmtpsa (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.80.1) (envelope-from ) id 1W24F5-0000Q6-2x; Sat, 11 Jan 2014 20:29:12 +0100 From: Bernd Kuhls To: buildroot@busybox.net Date: Sat, 11 Jan 2014 20:28:58 +0100 X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1389468543-6664-1-git-send-email-berndkuhls@hotmail.com> References: <1389468543-6664-1-git-send-email-berndkuhls@hotmail.com> X-OriginalArrivalTime: 11 Jan 2014 19:29:14.0263 (UTC) FILETIME=[69474270:01CF0F03] MIME-Version: 1.0 Cc: Bernd Kuhls Subject: [Buildroot] [PATCH 1/6] 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: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net v3: rebased v2 libdrm: rename to libpthread-stubs as well for bisectability v2: http://patchwork.ozlabs.org/patch/304117/ (Paul Cercueil) v1: http://patchwork.ozlabs.org/patch/278296/ (Spenser Gilliland) Tested-by: Bernd Kuhls Signed-off-by: Bernd Kuhls --- Config.in.legacy | 15 ++++++++++++--- package/Config.in | 1 + package/libdrm/Config.in | 2 +- package/libdrm/libdrm.mk | 2 +- .../Config.in | 2 +- package/libpthread-stubs/libpthread-stubs.mk | 20 ++++++++++++++++++++ package/x11r7/Config.in | 1 - package/x11r7/libxcb/Config.in | 2 +- package/x11r7/libxcb/libxcb.mk | 2 +- .../xlib_libpthread-stubs/xlib_libpthread-stubs.mk | 20 -------------------- 10 files changed, 38 insertions(+), 29 deletions(-) rename package/{x11r7/xlib_libpthread-stubs => libpthread-stubs}/Config.in (88%) create mode 100644 package/libpthread-stubs/libpthread-stubs.mk delete mode 100644 package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk diff --git a/Config.in.legacy b/Config.in.legacy index 01bf16b..388e6a6 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -419,11 +419,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 20e142f..b558069 100644 --- a/package/Config.in +++ b/package/Config.in @@ -722,6 +722,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/libdrm/Config.in b/package/libdrm/Config.in index 205f47c..4d7646b 100644 --- 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 f5efaf1..dd08af1 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 88% rename from package/x11r7/xlib_libpthread-stubs/Config.in rename to package/libpthread-stubs/Config.in index 6ce1b94..a4ce1cb 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" depends on BR2_TOOLCHAIN_HAS_THREADS help 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 5eff2df..5ef118b 100644 --- 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 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 fa8ed6d..9cd8bf9 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_OPT = --disable-build-docs 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))