From: Arnout Vandecappelle <arnout@mind.be>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v3 1/3] xlib_libpthread-stubs: Rename package to libpthread-stubs
Date: Thu, 06 Feb 2014 07:20:53 +0100 [thread overview]
Message-ID: <52F329C5.5050002@mind.be> (raw)
In-Reply-To: <BLU0-SMTP268A8C3D4775DE75218334FD9950@phx.gbl>
On 05/02/14 21:49, Bernd Kuhls wrote:
> v4: Config.in.legacy:
> move BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS to 2014.02 (Arnout)
> 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)
The patch changelog should go below the SoB and ---. See
buildroot.net/downloads/manual/manual.html#submitting-patches
>
> 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>
Regards,
Arnout
> ---
> 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 2fe9cf9..4ea3e8e 100644
> --- a/Config.in.legacy
> +++ b/Config.in.legacy
> @@ -198,6 +198,16 @@ config BR2_PACKAGE_LUACJSON
> help
> The option has been renamed BR2_PACKAGE_LUA_CJSON.
>
> +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 2013.11"
>
> @@ -482,11 +492,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 ee2a68e..f4903ba 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -744,6 +744,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 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))
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
next prev parent reply other threads:[~2014-02-06 6:20 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1391633362-30331-1-git-send-email-berndkuhls@hotmail.com>
2014-02-05 20:49 ` [Buildroot] [PATCH v3 1/3] xlib_libpthread-stubs: Rename package to libpthread-stubs Bernd Kuhls
2014-02-06 6:20 ` Arnout Vandecappelle [this message]
2014-02-05 20:49 ` [Buildroot] [PATCH v3 2/3] libdrm: Remove dependency towards X11 Bernd Kuhls
2014-02-06 6:23 ` Arnout Vandecappelle
2014-02-05 20:49 ` [Buildroot] [PATCH v3 3/3] libdrm: bump to version 2.4.52 Bernd Kuhls
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=52F329C5.5050002@mind.be \
--to=arnout@mind.be \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.