Commit 5bd41d16 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

pthread-stubs: rename to xlib_libpthread-stubs 



In upstream X.org releases, pthread-stubs is named libpthread-stubs,
so for consistency reasons, we rename the Buildroot package
accordingly. Also, while we're at it, we add a xlib_ prefix to the
package to match other X.org libraries in Buildroot.

The necessary Config.in.legacy code is added to ensure that users
having .config files using the old configuration option name get a
warning.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 1a18a456

Config.in.legacy

+8 −0
Original line number Diff line number Diff line
@@ -70,4 +70,12 @@ config BR2_PACKAGE_INPUT_TOOLS_EVTEST 
	help

	  The evtest program from input-tools is now a separate package.



config BR2_PACKAGE_PTHREAD_STUBS

	bool "pthread-stubs option has been renamed"

	select BR2_LEGACY

	select BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS

	help

	  For consistency reason, the pthread-stubs package has been

	  renamed to xlib_libpthread-stubs.



endif

package/libdrm/libdrm.mk

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ LIBDRM_DEPENDENCIES = \ 
	xlib_libXxf86vm \

	xlib_libXmu \

	xproto_dri2proto \

	pthread-stubs \

	xlib_libpthread-stubs \

	host-pkgconf



ifeq ($(BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL),y)

package/x11r7/Config.in

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ endmenu 
	menu "X11R7 Libraries"

		source package/x11r7/libxcb/Config.in

		source package/x11r7/mesa3d/Config.in

		source package/x11r7/pthread-stubs/Config.in

		source package/x11r7/xcb-util/Config.in

		source package/x11r7/xcb-util-keysyms/Config.in

		source package/x11r7/xlib_libFS/Config.in
@@ -79,6 +78,7 @@ endmenu 
		source package/x11r7/xlib_libxkbui/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

package/x11r7/libxcb/libxcb.mk

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ LIBXCB_SITE = http://xcb.freedesktop.org/dist/ 
LIBXCB_INSTALL_STAGING = YES



LIBXCB_DEPENDENCIES = \

	host-libxslt pthread-stubs xcb-proto xlib_libXdmcp xlib_libXau \

	host-libxslt xlib_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 \

package/x11r7/pthread-stubs/Config.in→package/x11r7/xlib_libpthread-stubs/Config.in

+2 −2
Original line number Diff line number Diff line 
config BR2_PACKAGE_PTHREAD_STUBS

	bool "pthread-stubs"

config BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS

	bool "libpthread-stubs"

	help

	  This library provides weak aliases for pthread functions not

	  provided in libc or otherwise available by default.