diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/Config.in | 1 | ||||
| -rw-r--r-- | package/libdrm/Config.in | 2 | ||||
| -rw-r--r-- | package/libdrm/libdrm.mk | 2 | ||||
| -rw-r--r-- | package/libpthread-stubs/Config.in (renamed from package/x11r7/xlib_libpthread-stubs/Config.in) | 2 | ||||
| -rw-r--r-- | package/libpthread-stubs/libpthread-stubs.mk | 20 | ||||
| -rw-r--r-- | package/x11r7/Config.in | 1 | ||||
| -rw-r--r-- | package/x11r7/libxcb/Config.in | 2 | ||||
| -rw-r--r-- | package/x11r7/libxcb/libxcb.mk | 2 | ||||
| -rw-r--r-- | package/x11r7/xlib_libpthread-stubs/xlib_libpthread-stubs.mk | 20 |
9 files changed, 26 insertions, 26 deletions
diff --git a/package/Config.in b/package/Config.in index a519b9779..e6fe6aa23 100644 --- a/package/Config.in +++ b/package/Config.in @@ -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" diff --git a/package/libdrm/Config.in b/package/libdrm/Config.in index 205f47cee..4d7646bec 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 a1b0580d9..b9b7a58f6 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 index 6ce1b94fc..a4ce1cb0a 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 000000000..b72e5a64d --- /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 5eff2df1a..5ef118b87 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 1e1afb4cf..32569f791 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 fa8ed6dc2..9cd8bf9d2 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 634369156..000000000 --- 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)) |