qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove all references to libpthread-stubs from xenocara.

Browse Source 
"looks sane" guenther@.
This commit is contained in:
matthieu 2017-10-23 16:50:28 +00:00
parent e58671c122
commit 4b98ce0cc0
16 changed files with 28 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/fontconfig/fc-cache/Makefile
View File

@ -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 FONTCONFIG= ${.CURDIR}/../../../dist/fontconfig
PROG= fc-cache 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 obj: _xenocara_obj

4
lib/fontconfig/fc-cat/Makefile
View File

@ -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 FONTCONFIG= ${.CURDIR}/../../../dist/fontconfig
PROG= fc-cat 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 obj: _xenocara_obj

4
lib/fontconfig/fc-list/Makefile
View File

@ -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 FONTCONFIG= ${.CURDIR}/../../../dist/fontconfig
PROG= fc-list 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 obj: _xenocara_obj

4
lib/fontconfig/fc-match/Makefile
View File

@ -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 FONTCONFIG= ${.CURDIR}/../../../dist/fontconfig
PROG= fc-match 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 obj: _xenocara_obj

4
lib/fontconfig/fc-pattern/Makefile
View File

@ -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 FONTCONFIG= ${.CURDIR}/../../../dist/fontconfig
PROG= fc-pattern 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 obj: _xenocara_obj

4
lib/fontconfig/fc-query/Makefile
View File

@ -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 FONTCONFIG= ${.CURDIR}/../../../dist/fontconfig
PROG= fc-query 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 obj: _xenocara_obj

4
lib/fontconfig/fc-scan/Makefile
View File

@ -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 FONTCONFIG= ${.CURDIR}/../../../dist/fontconfig
PROG= fc-scan 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 obj: _xenocara_obj

4
lib/fontconfig/fc-validate/Makefile
View File

@ -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 FONTCONFIG= ${.CURDIR}/../../../dist/fontconfig
PROG= fc-validate 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 obj: _xenocara_obj

4
lib/fontconfig/src/Makefile
View File

@ -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 <bsd.xconf.mk> .include <bsd.xconf.mk>
@ -39,7 +39,7 @@ CFLAGS += -DFC_CACHEDIR='"$(FC_CACHEDIR)"' \
-DFONTCONFIG_PATH='"$(BASECONFIGDIR)"' \ -DFONTCONFIG_PATH='"$(BASECONFIGDIR)"' \
-I. -I.
LDADD = -L${X11BASE}/lib -lfreetype -lexpat -lz -lpthread-stubs LDADD = -L${X11BASE}/lib -lfreetype -lexpat -lz
PUBLIC_FILES = \ PUBLIC_FILES = \
$(FONTCONFIG)/fontconfig/fontconfig.h \ $(FONTCONFIG)/fontconfig/fontconfig.h \

2
lib/fontconfig/src/libfontconfig.la.in
View File

@ -17,7 +17,7 @@ old_library='libfontconfig.a'
inherited_linker_flags='' inherited_linker_flags=''
# Libraries that this one depends upon. # 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 # Names of additional weak libraries provided by this library
weak_library_names='' weak_library_names=''

4
lib/libdrm/Makefile.bsd-wrapper
View File

@ -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 \ SHARED_LIBS= drm 7.5 drm_radeon 4.0 drm_intel 5.4 \
drm_amdgpu 1.4 drm_nouveau 3.0 drm_amdgpu 1.4 drm_nouveau 3.0

4
lib/libxcb/libxcb/Makefile
View File

@ -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 LIB= xcb
@ -26,7 +26,7 @@ SRCS= \
PKGCONFIG= xcb.pc PKGCONFIG= xcb.pc
NEEDED= pthread-stubs xau >= 0.99.2 xdmcp NEEDED= xau >= 0.99.2 xdmcp
CFLAGS+= --std=c99 CFLAGS+= --std=c99

5
lib/mesa/Makefile.bsd-wrapper
View File

@ -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 <bsd.own.mk> .include <bsd.own.mk>
@ -35,6 +35,9 @@ CONFIGURE_ARGS= --with-dri-drivers=${DRI_DRIVERS} \
--with-dri-driverdir=${X11BASE}/lib/modules/dri \ --with-dri-driverdir=${X11BASE}/lib/modules/dri \
--with-dri-searchpath=${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 # The i965 driver uses the cmpxchg8b instruction
.if ${MACHINE} == i386 .if ${MACHINE} == i386
CONFIGURE_ARGS+= USER_CFLAGS="-march=i586" USER_CXXFLAGS="-march=i586" CONFIGURE_ARGS+= USER_CFLAGS="-march=i586" USER_CXXFLAGS="-march=i586"

75
lib/pixman/configure vendored
View File

@ -14162,81 +14162,6 @@ support_for_pthreads=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthreads" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthreads" >&5
$as_echo_n "checking for pthreads... " >&6; } $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 <stdlib.h>
#include <pthread.h>
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 if test "z$support_for_pthreads" != "zyes"; then
save_CFLAGS="$CFLAGS" save_CFLAGS="$CFLAGS"
save_LDFLAGS="$LDFLAGS" save_LDFLAGS="$LDFLAGS"

1
lib/pixman/configure.ac
View File

@ -1004,7 +1004,6 @@ support_for_pthreads=no
AC_MSG_CHECKING(for pthreads) 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="-pthread"; LDFLAGS="-pthread"])
PIXMAN_CHECK_PTHREAD([CFLAGS="-D_REENTRANT"; LIBS="-lpthread"]) PIXMAN_CHECK_PTHREAD([CFLAGS="-D_REENTRANT"; LIBS="-lpthread"])
PIXMAN_CHECK_PTHREAD([CFLAGS="-D_REENTRANT"; LDFLAGS="-lroot"]) PIXMAN_CHECK_PTHREAD([CFLAGS="-D_REENTRANT"; LDFLAGS="-lroot"])

1
lib/pixman/pixman-1.pc.in
View File

@ -6,7 +6,6 @@ includedir=@includedir@
Name: Pixman Name: Pixman
Description: The pixman library (version 1) Description: The pixman library (version 1)
Version: @PACKAGE_VERSION@ Version: @PACKAGE_VERSION@
Requires: pthread-stubs >= 0.3
Cflags: -I${includedir}/pixman-1 Cflags: -I${includedir}/pixman-1
Libs: -L${libdir} -lpixman-1 Libs: -L${libdir} -lpixman-1