gitolite/buildrootschalter
gitolite
/
buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Bernd Kuhls 2014-03-01 16:41:10 +01:00 committed by Thomas Petazzoni
parent 69265ebb67
commit 5562be136c
10 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Config.in.legacy
View File

@ -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"

1
package/Config.in
View File

@ -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"

2
package/libdrm/Config.in
View File

@ -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

2
package/libdrm/libdrm.mk
View File

@ -12,7 +12,7 @@ LIBDRM_LICENSE = MIT
LIBDRM_INSTALL_STAGING = YES
LIBDRM_DEPENDENCIES = \
xlib_libpthread-stubs \
libpthread-stubs \
host-pkgconf
LIBDRM_CONF_OPT = \

2
package/x11r7/xlib_libpthread-stubs/Config.in → package/libpthread-stubs/Config.in
View File

@ -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

20
package/libpthread-stubs/libpthread-stubs.mk Normal file
View File

@ -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))

1
package/x11r7/Config.in
View File

@ -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

2
package/x11r7/libxcb/Config.in
View File

@ -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

2
package/x11r7/libxcb/libxcb.mk
View File

@ -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

20
package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk
View File

@ -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))