Module Name: src
Committed By: mrg
Date: Thu Jul 4 05:23:33 UTC 2024
Modified Files:
src/distrib/sets/lists/xcomp: mi shl.mi
src/distrib/sets/lists/xdebug: mi
src/external/mit/xorg/lib: Makefile
Log Message:
libpthread-stubs is now a pkg-config.pc only package.
mark the old library obsolete (it only had pthread_condattr_init
which is in libpthread.) as a static-only library, not an issue
for binary compatibility.
To generate a diff of this commit:
cvs rdiff -u -r1.244 -r1.245 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.58 -r1.59 src/distrib/sets/lists/xcomp/shl.mi
cvs rdiff -u -r1.47 -r1.48 src/distrib/sets/lists/xdebug/mi
cvs rdiff -u -r1.59 -r1.60 src/external/mit/xorg/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.244 src/distrib/sets/lists/xcomp/mi:1.245
--- src/distrib/sets/lists/xcomp/mi:1.244 Sat Jun 15 12:38:15 2024
+++ src/distrib/sets/lists/xcomp/mi Thu Jul 4 05:23:33 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.244 2024/06/15 12:38:15 wiz Exp $
+# $NetBSD: mi,v 1.245 2024/07/04 05:23:33 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1250,8 +1250,8 @@
./usr/X11R7/lib/libpciaccess_p.a xcomp-libpciaccess-lib profile,xorg,compatx11file
./usr/X11R7/lib/libpixman-1.a xcomp-pixman-lib xorg,compatx11file
./usr/X11R7/lib/libpixman-1_p.a xcomp-pixman-lib profile,xorg,compatx11file
-./usr/X11R7/lib/libpthread-stubs.a xcomp-libpthread-stubs-lib xorg,compatx11file
-./usr/X11R7/lib/libpthread-stubs_p.a xcomp-libpthread-stubs-lib profile,xorg,compatx11file
+./usr/X11R7/lib/libpthread-stubs.a xcomp-obsolete obsolete
+./usr/X11R7/lib/libpthread-stubs_p.a xcomp-obsolete obsolete
./usr/X11R7/lib/libre.a xcomp-obsolete obsolete
./usr/X11R7/lib/libre_p.a xcomp-obsolete obsolete
./usr/X11R7/lib/libxcb-atom.a xcomp-xcb-util-lib xorg,compatx11file
@@ -1365,7 +1365,7 @@
./usr/X11R7/lib/pkgconfig/pixman-1.pc xcomp-pixman-lib xorg
./usr/X11R7/lib/pkgconfig/presentproto.pc xcomp-xorgproto-lib xorg
./usr/X11R7/lib/pkgconfig/printproto.pc xcomp-obsolete obsolete
-./usr/X11R7/lib/pkgconfig/pthread-stubs.pc xcomp-pthread-stubs-lib xorg
+./usr/X11R7/lib/pkgconfig/pthread-stubs.pc xcomp-obsolete obsolete
./usr/X11R7/lib/pkgconfig/randrproto.pc xcomp-xorgproto-lib xorg
./usr/X11R7/lib/pkgconfig/recordproto.pc xcomp-xorgproto-lib xorg
./usr/X11R7/lib/pkgconfig/renderproto.pc xcomp-xorgproto-lib xorg
@@ -5979,7 +5979,7 @@
./usr/libdata/lint/llib-llisp.ln xcomp-obsolete obsolete
./usr/libdata/lint/llib-lmp.ln xcomp-obsolete obsolete
./usr/libdata/lint/llib-lpciaccess.ln xcomp-libpciaccess-lintlib lint,xorg
-./usr/libdata/lint/llib-lpthread-stubs.ln xcomp-libpthread-stubs-lintlib lint,xorg
+./usr/libdata/lint/llib-lpthread-stubs.ln xcomp-obsolete obsolete
./usr/libdata/lint/llib-lre.ln xcomp-obsolete obsolete
./usr/libdata/lint/llib-lxcb-composite.ln xcomp-obsolete obsolete
./usr/libdata/lint/llib-lxcb-damage.ln xcomp-libxcb-lintlib lint,xorg
Index: src/distrib/sets/lists/xcomp/shl.mi
diff -u src/distrib/sets/lists/xcomp/shl.mi:1.58 src/distrib/sets/lists/xcomp/shl.mi:1.59
--- src/distrib/sets/lists/xcomp/shl.mi:1.58 Mon May 13 14:59:31 2024
+++ src/distrib/sets/lists/xcomp/shl.mi Thu Jul 4 05:23:33 2024
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.58 2024/05/13 14:59:31 christos Exp $
+# $NetBSD: shl.mi,v 1.59 2024/07/04 05:23:33 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -68,7 +68,7 @@
./usr/X11R7/lib/libmp_pic.a xcomp-obsolete obsolete
./usr/X11R7/lib/libpciaccess_pic.a xcomp-libpciaccess-lib xorg,picinstall,compatx11file
./usr/X11R7/lib/libpixman-1_pic.a xcomp-pixman-lib xorg,picinstall,compatx11file
-./usr/X11R7/lib/libpthread-stubs_pic.a xcomp-libpthread-stubs-lib xorg,picinstall,compatx11file
+./usr/X11R7/lib/libpthread-stubs_pic.a xcomp-obsolete obsolete
./usr/X11R7/lib/libre_pic.a xcomp-obsolete obsolete
./usr/X11R7/lib/libxcb-atom_pic.a xcomp-xcb-util-lib xorg,picinstall,compatx11file
./usr/X11R7/lib/libxcb-aux_pic.a xcomp-xcb-util-lib xorg,picinstall,compatx11file
Index: src/distrib/sets/lists/xdebug/mi
diff -u src/distrib/sets/lists/xdebug/mi:1.47 src/distrib/sets/lists/xdebug/mi:1.48
--- src/distrib/sets/lists/xdebug/mi:1.47 Mon May 13 14:56:44 2024
+++ src/distrib/sets/lists/xdebug/mi Thu Jul 4 05:23:33 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.47 2024/05/13 14:56:44 christos Exp $
+# $NetBSD: mi,v 1.48 2024/07/04 05:23:33 mrg Exp $
./etc/mtree/set.xdebug comp-sys-root
./usr/X11R7/lib base-x11-root xorg,debuglib,compatx11dir
./usr/X11R7/lib/libEGL_g.a xdebug-libEGL-debuglib xorg,debuglib,compatx11file,xorg_glamor
@@ -66,7 +66,7 @@
./usr/X11R7/lib/libxcvt_g.a xdebug-libxcvt-debuglib xorg,debuglib,compatx11file
./usr/X11R7/lib/libpciaccess_g.a xdebug-libpciaccess-debuglib xorg,debuglib,compatx11file
./usr/X11R7/lib/libpixman-1_g.a xdebug-pixman-debuglib xorg,debuglib,compatx11file
-./usr/X11R7/lib/libpthread-stubs_g.a xdebug-libpthread-stubs-debuglib xorg,debuglib,compatx11file
+./usr/X11R7/lib/libpthread-stubs_g.a xdebug-obsolete obsolete
./usr/X11R7/lib/libre_g.a xdebug-obsolete xorg,obsolete
./usr/X11R7/lib/libxcb-atom_g.a xdebug-xcb-util-debuglib xorg,debuglib,compatx11file
./usr/X11R7/lib/libxcb-aux_g.a xdebug-xcb-util-debuglib xorg,debuglib,compatx11file
Index: src/external/mit/xorg/lib/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.59 src/external/mit/xorg/lib/Makefile:1.60
--- src/external/mit/xorg/lib/Makefile:1.59 Thu May 9 06:38:27 2024
+++ src/external/mit/xorg/lib/Makefile Thu Jul 4 05:23:33 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2024/05/09 06:38:27 nia Exp $
+# $NetBSD: Makefile,v 1.60 2024/07/04 05:23:33 mrg Exp $
# build libraries for xorg
@@ -7,7 +7,7 @@
.include "mesa-which.mk"
SUBDIR= libfontenc freetype libFS libICE libglapi${OLD_SUFFIX} \
- libXau libXdmcp libdrm libpciaccess libpthread-stubs \
+ libXau libXdmcp libdrm libpciaccess \
libxcvt libxshmfence .WAIT
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
SUBDIR+=libdrm_intel
