From 4b98ce0cc0333934520e3bba744c8f93cd13cf38 Mon Sep 17 00:00:00 2001 From: matthieu Date: Mon, 23 Oct 2017 16:50:28 +0000 Subject: [PATCH] Remove all references to libpthread-stubs from xenocara. "looks sane" guenther@. --- lib/fontconfig/fc-cache/Makefile | 4 +- lib/fontconfig/fc-cat/Makefile | 4 +- lib/fontconfig/fc-list/Makefile | 4 +- lib/fontconfig/fc-match/Makefile | 4 +- lib/fontconfig/fc-pattern/Makefile | 4 +- lib/fontconfig/fc-query/Makefile | 4 +- lib/fontconfig/fc-scan/Makefile | 4 +- lib/fontconfig/fc-validate/Makefile | 4 +- lib/fontconfig/src/Makefile | 4 +- lib/fontconfig/src/libfontconfig.la.in | 2 +- lib/libdrm/Makefile.bsd-wrapper | 4 +- lib/libxcb/libxcb/Makefile | 4 +- lib/mesa/Makefile.bsd-wrapper | 5 +- lib/pixman/configure | 75 -------------------------- lib/pixman/configure.ac | 1 - lib/pixman/pixman-1.pc.in | 1 - 16 files changed, 28 insertions(+), 100 deletions(-) diff --git a/lib/fontconfig/fc-cache/Makefile b/lib/fontconfig/fc-cache/Makefile index f12504bfb..ff813dab2 100644 --- a/lib/fontconfig/fc-cache/Makefile +++ b/lib/fontconfig/fc-cache/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.1 2013/03/09 14:34:44 matthieu Exp $ +# $OpenBSD: Makefile,v 1.2 2017/10/23 16:50:28 matthieu Exp $ FONTCONFIG= ${.CURDIR}/../../../dist/fontconfig PROG= fc-cache -LDADD= -L../src -L${X11BASE}/lib -lfontconfig -lfreetype -lexpat -lz -lpthread-stubs +LDADD= -L../src -L${X11BASE}/lib -lfontconfig -lfreetype -lexpat -lz obj: _xenocara_obj diff --git a/lib/fontconfig/fc-cat/Makefile b/lib/fontconfig/fc-cat/Makefile index e7ce0bd38..9d1493fc0 100644 --- a/lib/fontconfig/fc-cat/Makefile +++ b/lib/fontconfig/fc-cat/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.1 2013/03/09 14:34:44 matthieu Exp $ +# $OpenBSD: Makefile,v 1.2 2017/10/23 16:50:28 matthieu Exp $ FONTCONFIG= ${.CURDIR}/../../../dist/fontconfig PROG= fc-cat -LDADD= -L../src -L${X11BASE}/lib -lfontconfig -lfreetype -lexpat -lz -lpthread-stubs +LDADD= -L../src -L${X11BASE}/lib -lfontconfig -lfreetype -lexpat -lz obj: _xenocara_obj diff --git a/lib/fontconfig/fc-list/Makefile b/lib/fontconfig/fc-list/Makefile index 6ead3464b..a3cdc8ef9 100644 --- a/lib/fontconfig/fc-list/Makefile +++ b/lib/fontconfig/fc-list/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.1 2013/03/09 14:34:45 matthieu Exp $ +# $OpenBSD: Makefile,v 1.2 2017/10/23 16:50:28 matthieu Exp $ FONTCONFIG= ${.CURDIR}/../../../dist/fontconfig PROG= fc-list -LDADD= -L../src -L${X11BASE}/lib -lfontconfig -lfreetype -lexpat -lz -lpthread-stubs +LDADD= -L../src -L${X11BASE}/lib -lfontconfig -lfreetype -lexpat -lz obj: _xenocara_obj diff --git a/lib/fontconfig/fc-match/Makefile b/lib/fontconfig/fc-match/Makefile index 6aefe36d6..fe7370d38 100644 --- a/lib/fontconfig/fc-match/Makefile +++ b/lib/fontconfig/fc-match/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.1 2013/03/09 14:34:45 matthieu Exp $ +# $OpenBSD: Makefile,v 1.2 2017/10/23 16:50:28 matthieu Exp $ FONTCONFIG= ${.CURDIR}/../../../dist/fontconfig PROG= fc-match -LDADD= -L../src -L${X11BASE}/lib -lfontconfig -lfreetype -lexpat -lz -lpthread-stubs +LDADD= -L../src -L${X11BASE}/lib -lfontconfig -lfreetype -lexpat -lz obj: _xenocara_obj diff --git a/lib/fontconfig/fc-pattern/Makefile b/lib/fontconfig/fc-pattern/Makefile index 872cfa98d..b6c5163b5 100644 --- a/lib/fontconfig/fc-pattern/Makefile +++ b/lib/fontconfig/fc-pattern/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.1 2013/03/09 14:34:45 matthieu Exp $ +# $OpenBSD: Makefile,v 1.2 2017/10/23 16:50:28 matthieu Exp $ FONTCONFIG= ${.CURDIR}/../../../dist/fontconfig PROG= fc-pattern -LDADD= -L../src -L${X11BASE}/lib -lfontconfig -lfreetype -lexpat -lz -lpthread-stubs +LDADD= -L../src -L${X11BASE}/lib -lfontconfig -lfreetype -lexpat -lz obj: _xenocara_obj diff --git a/lib/fontconfig/fc-query/Makefile b/lib/fontconfig/fc-query/Makefile index 2b35653f6..beba1023e 100644 --- a/lib/fontconfig/fc-query/Makefile +++ b/lib/fontconfig/fc-query/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.1 2013/03/09 14:34:45 matthieu Exp $ +# $OpenBSD: Makefile,v 1.2 2017/10/23 16:50:28 matthieu Exp $ FONTCONFIG= ${.CURDIR}/../../../dist/fontconfig PROG= fc-query -LDADD= -L../src -L${X11BASE}/lib -lfontconfig -lfreetype -lexpat -lz -lpthread-stubs +LDADD= -L../src -L${X11BASE}/lib -lfontconfig -lfreetype -lexpat -lz obj: _xenocara_obj diff --git a/lib/fontconfig/fc-scan/Makefile b/lib/fontconfig/fc-scan/Makefile index 8b1d3c6f1..8da9946bc 100644 --- a/lib/fontconfig/fc-scan/Makefile +++ b/lib/fontconfig/fc-scan/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.1 2013/03/09 14:34:45 matthieu Exp $ +# $OpenBSD: Makefile,v 1.2 2017/10/23 16:50:28 matthieu Exp $ FONTCONFIG= ${.CURDIR}/../../../dist/fontconfig PROG= fc-scan -LDADD= -L../src -L${X11BASE}/lib -lfontconfig -lfreetype -lexpat -lz -lpthread-stubs +LDADD= -L../src -L${X11BASE}/lib -lfontconfig -lfreetype -lexpat -lz obj: _xenocara_obj diff --git a/lib/fontconfig/fc-validate/Makefile b/lib/fontconfig/fc-validate/Makefile index df3257b03..e9f44c3f7 100644 --- a/lib/fontconfig/fc-validate/Makefile +++ b/lib/fontconfig/fc-validate/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.1 2013/03/09 14:34:45 matthieu Exp $ +# $OpenBSD: Makefile,v 1.2 2017/10/23 16:50:28 matthieu Exp $ FONTCONFIG= ${.CURDIR}/../../../dist/fontconfig PROG= fc-validate -LDADD= -L../src -L${X11BASE}/lib -lfontconfig -lfreetype -lexpat -lz -lpthread-stubs +LDADD= -L../src -L${X11BASE}/lib -lfontconfig -lfreetype -lexpat -lz obj: _xenocara_obj diff --git a/lib/fontconfig/src/Makefile b/lib/fontconfig/src/Makefile index faaca164b..5db174eb9 100644 --- a/lib/fontconfig/src/Makefile +++ b/lib/fontconfig/src/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2017/06/18 21:09:07 espie Exp $ +# $OpenBSD: Makefile,v 1.10 2017/10/23 16:50:28 matthieu Exp $ .include @@ -39,7 +39,7 @@ CFLAGS += -DFC_CACHEDIR='"$(FC_CACHEDIR)"' \ -DFONTCONFIG_PATH='"$(BASECONFIGDIR)"' \ -I. -LDADD = -L${X11BASE}/lib -lfreetype -lexpat -lz -lpthread-stubs +LDADD = -L${X11BASE}/lib -lfreetype -lexpat -lz PUBLIC_FILES = \ $(FONTCONFIG)/fontconfig/fontconfig.h \ diff --git a/lib/fontconfig/src/libfontconfig.la.in b/lib/fontconfig/src/libfontconfig.la.in index 32ec939c5..ac9bd1b64 100644 --- a/lib/fontconfig/src/libfontconfig.la.in +++ b/lib/fontconfig/src/libfontconfig.la.in @@ -17,7 +17,7 @@ old_library='libfontconfig.a' inherited_linker_flags='' # Libraries that this one depends upon. -dependency_libs='-L/usr/X11R6/lib -lfreetype -lz -lexpat -lpthread-stubs' +dependency_libs='-L/usr/X11R6/lib -lfreetype -lz -lexpat' # Names of additional weak libraries provided by this library weak_library_names='' diff --git a/lib/libdrm/Makefile.bsd-wrapper b/lib/libdrm/Makefile.bsd-wrapper index 6e000d6b3..bd69c84a8 100644 --- a/lib/libdrm/Makefile.bsd-wrapper +++ b/lib/libdrm/Makefile.bsd-wrapper @@ -1,5 +1,7 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.12 2017/08/05 14:21:16 jsg Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.13 2017/10/23 16:50:29 matthieu Exp $ +# cheat on configure - we don't need pthread-stubs anymore +CONFIGURE_ARGS= PTHREADSTUBS_CFLAGS=' ' PTHREADSTUBS_LIBS=' ' SHARED_LIBS= drm 7.5 drm_radeon 4.0 drm_intel 5.4 \ drm_amdgpu 1.4 drm_nouveau 3.0 diff --git a/lib/libxcb/libxcb/Makefile b/lib/libxcb/libxcb/Makefile index a4b6e67dd..dcb221c49 100644 --- a/lib/libxcb/libxcb/Makefile +++ b/lib/libxcb/libxcb/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2016/09/02 10:09:43 matthieu Exp $ +# $OpenBSD: Makefile,v 1.8 2017/10/23 16:50:28 matthieu Exp $ LIB= xcb @@ -26,7 +26,7 @@ SRCS= \ PKGCONFIG= xcb.pc -NEEDED= pthread-stubs xau >= 0.99.2 xdmcp +NEEDED= xau >= 0.99.2 xdmcp CFLAGS+= --std=c99 diff --git a/lib/mesa/Makefile.bsd-wrapper b/lib/mesa/Makefile.bsd-wrapper index 40a77fff7..dde75cbb9 100644 --- a/lib/mesa/Makefile.bsd-wrapper +++ b/lib/mesa/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.13 2017/08/26 16:59:17 jsg Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.14 2017/10/23 16:50:29 matthieu Exp $ .include @@ -35,6 +35,9 @@ CONFIGURE_ARGS= --with-dri-drivers=${DRI_DRIVERS} \ --with-dri-driverdir=${X11BASE}/lib/modules/dri \ --with-dri-searchpath=${X11BASE}/lib/modules/dri +# cheat on configure - we don't need pthread-stubs anymore +CONFIGURE_ARGS+= PTHREADSTUBS_CFLAGS=' ' PTHREADSTUBS_LIBS=' ' + # The i965 driver uses the cmpxchg8b instruction .if ${MACHINE} == i386 CONFIGURE_ARGS+= USER_CFLAGS="-march=i586" USER_CXXFLAGS="-march=i586" diff --git a/lib/pixman/configure b/lib/pixman/configure index 78875bb76..44e3c8529 100644 --- a/lib/pixman/configure +++ b/lib/pixman/configure @@ -14162,81 +14162,6 @@ support_for_pthreads=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthreads" >&5 $as_echo_n "checking for pthreads... " >&6; } - if test "z$support_for_pthreads" != "zyes"; then - save_CFLAGS="$CFLAGS" - save_LDFLAGS="$LDFLAGS" - save_LIBS="$LIBS" - CFLAGS="" - LDFLAGS="" - LIBS="" - CFLAGS=""; LIBS="-L/usr/X11R6/lib -lpthread-stubs" - CFLAGS="$save_CFLAGS $CFLAGS" - LDFLAGS="$save_LDFLAGS $LDFLAGS" - LIBS="$save_LIBS $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include - -static pthread_once_t once_control = PTHREAD_ONCE_INIT; -static pthread_key_t key; - -static void -make_key (void) -{ - pthread_key_create (&key, NULL); -} - -int -main () -{ - void *value = NULL; - - if (pthread_once (&once_control, make_key) != 0) - { - value = NULL; - } - else - { - value = pthread_getspecific (key); - if (!value) - { - value = malloc (100); - pthread_setspecific (key, value); - } - } - return 0; -} - -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - pixman_cc_stderr=`test -f conftest.err && cat conftest.err` - pixman_cc_flag=yes -else - pixman_cc_stderr=`test -f conftest.err && cat conftest.err` - pixman_cc_flag=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - - if test "x$pixman_cc_stderr" != "x"; then - pixman_cc_flag=no - fi - - if test "x$pixman_cc_flag" = "xyes"; then - PTHREAD_CFLAGS="$CFLAGS" - PTHREAD_LIBS="$LIBS" - PTHREAD_LDFLAGS="$LDFLAGS" - support_for_pthreads=yes - else - : - fi - CFLAGS="$save_CFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - - fi - if test "z$support_for_pthreads" != "zyes"; then save_CFLAGS="$CFLAGS" save_LDFLAGS="$LDFLAGS" diff --git a/lib/pixman/configure.ac b/lib/pixman/configure.ac index a52c76417..b08d7a127 100644 --- a/lib/pixman/configure.ac +++ b/lib/pixman/configure.ac @@ -1004,7 +1004,6 @@ support_for_pthreads=no AC_MSG_CHECKING(for pthreads) -PIXMAN_CHECK_PTHREAD([CFLAGS=""; LIBS="-L/usr/X11R6/lib -lpthread-stubs"]) PIXMAN_CHECK_PTHREAD([CFLAGS="-pthread"; LDFLAGS="-pthread"]) PIXMAN_CHECK_PTHREAD([CFLAGS="-D_REENTRANT"; LIBS="-lpthread"]) PIXMAN_CHECK_PTHREAD([CFLAGS="-D_REENTRANT"; LDFLAGS="-lroot"]) diff --git a/lib/pixman/pixman-1.pc.in b/lib/pixman/pixman-1.pc.in index 0cae50524..e3b9711ae 100644 --- a/lib/pixman/pixman-1.pc.in +++ b/lib/pixman/pixman-1.pc.in @@ -6,7 +6,6 @@ includedir=@includedir@ Name: Pixman Description: The pixman library (version 1) Version: @PACKAGE_VERSION@ -Requires: pthread-stubs >= 0.3 Cflags: -I${includedir}/pixman-1 Libs: -L${libdir} -lpixman-1