pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

libpthread-stubs-dfbsd: Update wip/libpthread-stubs-dfbsd to 0.4



Module Name:	pkgsrc-wip
Committed By:	David Shao <davshao%gmail.com@localhost>
Pushed By:	dshao
Date:		Thu Jun 8 22:06:54 2017 -0700
Changeset:	748f63ba54072c5451d8500501f2aba48859fd44

Modified Files:
	libpthread-stubs-dfbsd/Makefile
	libpthread-stubs-dfbsd/PLIST
	libpthread-stubs-dfbsd/buildlink3.mk
	libpthread-stubs-dfbsd/distinfo
Removed Files:
	libpthread-stubs-dfbsd/TODO
	libpthread-stubs-dfbsd/libpthread-stubs/DESCR
	libpthread-stubs-dfbsd/libpthread-stubs/Makefile
	libpthread-stubs-dfbsd/libpthread-stubs/PLIST
	libpthread-stubs-dfbsd/libpthread-stubs/buildlink3.mk
	libpthread-stubs-dfbsd/libpthread-stubs/distinfo
	libpthread-stubs-dfbsd/libpthread-stubs/patches/patch-Makefile.in
	libpthread-stubs-dfbsd/libpthread-stubs/patches/patch-stubs.c
	libpthread-stubs-dfbsd/patches/patch-Makefile.in
	libpthread-stubs-dfbsd/patches/patch-stubs.c

Log Message:
libpthread-stubs-dfbsd: Update wip/libpthread-stubs-dfbsd to 0.4

Doesn't event generate in the PLIST the lib anymore, not sure what
platforms this breaks.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=748f63ba54072c5451d8500501f2aba48859fd44

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 libpthread-stubs-dfbsd/Makefile                    |  2 +-
 libpthread-stubs-dfbsd/PLIST                       |  2 +-
 libpthread-stubs-dfbsd/TODO                        |  5 ---
 libpthread-stubs-dfbsd/buildlink3.mk               |  2 +-
 libpthread-stubs-dfbsd/distinfo                    | 10 ++---
 libpthread-stubs-dfbsd/libpthread-stubs/DESCR      |  9 -----
 libpthread-stubs-dfbsd/libpthread-stubs/Makefile   | 19 ---------
 libpthread-stubs-dfbsd/libpthread-stubs/PLIST      |  3 --
 .../libpthread-stubs/buildlink3.mk                 | 12 ------
 libpthread-stubs-dfbsd/libpthread-stubs/distinfo   |  8 ----
 .../libpthread-stubs/patches/patch-Makefile.in     | 31 ---------------
 .../libpthread-stubs/patches/patch-stubs.c         | 46 ----------------------
 libpthread-stubs-dfbsd/patches/patch-Makefile.in   | 27 -------------
 libpthread-stubs-dfbsd/patches/patch-stubs.c       | 33 ----------------
 14 files changed, 7 insertions(+), 202 deletions(-)

diffs:
diff --git a/libpthread-stubs-dfbsd/Makefile b/libpthread-stubs-dfbsd/Makefile
index 9775fec885..c86e54fcb4 100644
--- a/libpthread-stubs-dfbsd/Makefile
+++ b/libpthread-stubs-dfbsd/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	libpthread-stubs-0.3
+DISTNAME=	libpthread-stubs-0.4
 CATEGORIES=	x11
 MASTER_SITES=	https://xcb.freedesktop.org/dist/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/libpthread-stubs-dfbsd/PLIST b/libpthread-stubs-dfbsd/PLIST
index 418caea7d1..fd156b48cf 100644
--- a/libpthread-stubs-dfbsd/PLIST
+++ b/libpthread-stubs-dfbsd/PLIST
@@ -1,3 +1,3 @@
 @comment $NetBSD$
-lib/libpthread-stubs.la
+@comment lib/libpthread-stubs.la
 lib/pkgconfig/pthread-stubs.pc
diff --git a/libpthread-stubs-dfbsd/TODO b/libpthread-stubs-dfbsd/TODO
deleted file mode 100644
index 01dd0b0169..0000000000
--- a/libpthread-stubs-dfbsd/TODO
+++ /dev/null
@@ -1,5 +0,0 @@
-Copy port to devel/libpthread-stubs, do not install from wip.
-
-libpthread-stubs last release is from 2009 and actually does
-nothing on any OS tested.  Perhaps update to latest git snapshot
-from freedesktop.org
diff --git a/libpthread-stubs-dfbsd/buildlink3.mk b/libpthread-stubs-dfbsd/buildlink3.mk
index a2fe280ea4..9767e10f45 100644
--- a/libpthread-stubs-dfbsd/buildlink3.mk
+++ b/libpthread-stubs-dfbsd/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libpthread-stubs
 LIBPTHREAD_STUBS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libpthread-stubs+=	libpthread-stubs>=0.3
-BUILDLINK_PKGSRCDIR.libpthread-stubs?=	../../wip/libpthread-stubs
+BUILDLINK_PKGSRCDIR.libpthread-stubs?=	../../devel/libpthread-stubs
 .endif	# LIBPTHREAD_STUBS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libpthread-stubs
diff --git a/libpthread-stubs-dfbsd/distinfo b/libpthread-stubs-dfbsd/distinfo
index cbb351b705..5013b275d2 100644
--- a/libpthread-stubs-dfbsd/distinfo
+++ b/libpthread-stubs-dfbsd/distinfo
@@ -1,8 +1,6 @@
 $NetBSD$
 
-SHA1 (libpthread-stubs-0.3.tar.bz2) = 7fc486ad0ec54938f8b781cc374218f50eac8b99
-RMD160 (libpthread-stubs-0.3.tar.bz2) = a3a5f76e103c645749d7b8a8fc00ad472e59987b
-SHA512 (libpthread-stubs-0.3.tar.bz2) = c7cf63fa82ce9e8c37c6dc3b8cc30f8883655f95683c4466c54b617b086dd26a43bfa36363e47dc5730af6d59ac70443d211eb01b07d276edd144030a3580b15
-Size (libpthread-stubs-0.3.tar.bz2) = 203468 bytes
-SHA1 (patch-Makefile.in) = 739f6d82735fc2b7f71e62fd0681c4105ff360ea
-SHA1 (patch-stubs.c) = 90fd7f61bdaf42d124d2aa73151b43c55291e0dd
+SHA1 (libpthread-stubs-0.4.tar.bz2) = c42503a2ae0067b2238b2f3fefc86656baa4dd8e
+RMD160 (libpthread-stubs-0.4.tar.bz2) = d831b5b0370e88f752c454c4bb96c7bf2a240f10
+SHA512 (libpthread-stubs-0.4.tar.bz2) = 0fec563f3833b84311b32cb13a4fd9832aeb0204c65b1541bf453d5d35693b2267c3cee656e00a4b8533b07a8f6320ca5c3672dcf8ab047cdac8628154c08954
+Size (libpthread-stubs-0.4.tar.bz2) = 57565 bytes
diff --git a/libpthread-stubs-dfbsd/libpthread-stubs/DESCR b/libpthread-stubs-dfbsd/libpthread-stubs/DESCR
deleted file mode 100644
index 4e7e85b324..0000000000
--- a/libpthread-stubs-dfbsd/libpthread-stubs/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-This library provides weak aliases for pthread functions not provided in libc
-or otherwise available by default.  Libraries like libxcb rely on pthread
-stubs to use pthreads optionally, becoming thread-safe when linked to
-libpthread, while avoiding any performance hit when running single-threaded.
-libpthread-stubs supports this behavior even on platforms which do not supply
-all the necessary pthread stubs.  On platforms which already supply all the
-necessary pthread stubs, this package ships only the pkg-config file
-pthread-stubs.pc, to allow libraries to unconditionally express a dependency
-on pthread-stubs and still obtain correct behavior.
diff --git a/libpthread-stubs-dfbsd/libpthread-stubs/Makefile b/libpthread-stubs-dfbsd/libpthread-stubs/Makefile
deleted file mode 100644
index 9775fec885..0000000000
--- a/libpthread-stubs-dfbsd/libpthread-stubs/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD$
-
-DISTNAME=	libpthread-stubs-0.3
-CATEGORIES=	x11
-MASTER_SITES=	https://xcb.freedesktop.org/dist/
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	https://xcb.freedesktop.org/
-COMMENT=	This library provides weak aliases for pthread functions
-LICENSE=	mit
-
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
-
-PKGCONFIG_OVERRIDE+=	pthread-stubs.pc.in
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/libpthread-stubs-dfbsd/libpthread-stubs/PLIST b/libpthread-stubs-dfbsd/libpthread-stubs/PLIST
deleted file mode 100644
index 418caea7d1..0000000000
--- a/libpthread-stubs-dfbsd/libpthread-stubs/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD$
-lib/libpthread-stubs.la
-lib/pkgconfig/pthread-stubs.pc
diff --git a/libpthread-stubs-dfbsd/libpthread-stubs/buildlink3.mk b/libpthread-stubs-dfbsd/libpthread-stubs/buildlink3.mk
deleted file mode 100644
index 9767e10f45..0000000000
--- a/libpthread-stubs-dfbsd/libpthread-stubs/buildlink3.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD$
-
-BUILDLINK_TREE+=	libpthread-stubs
-
-.if !defined(LIBPTHREAD_STUBS_BUILDLINK3_MK)
-LIBPTHREAD_STUBS_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.libpthread-stubs+=	libpthread-stubs>=0.3
-BUILDLINK_PKGSRCDIR.libpthread-stubs?=	../../devel/libpthread-stubs
-.endif	# LIBPTHREAD_STUBS_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-libpthread-stubs
diff --git a/libpthread-stubs-dfbsd/libpthread-stubs/distinfo b/libpthread-stubs-dfbsd/libpthread-stubs/distinfo
deleted file mode 100644
index 3fc7e4e891..0000000000
--- a/libpthread-stubs-dfbsd/libpthread-stubs/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD$
-
-SHA1 (libpthread-stubs-0.3.tar.bz2) = 7fc486ad0ec54938f8b781cc374218f50eac8b99
-RMD160 (libpthread-stubs-0.3.tar.bz2) = a3a5f76e103c645749d7b8a8fc00ad472e59987b
-SHA512 (libpthread-stubs-0.3.tar.bz2) = c7cf63fa82ce9e8c37c6dc3b8cc30f8883655f95683c4466c54b617b086dd26a43bfa36363e47dc5730af6d59ac70443d211eb01b07d276edd144030a3580b15
-Size (libpthread-stubs-0.3.tar.bz2) = 203468 bytes
-SHA1 (patch-Makefile.in) = 1534afd01e02922f9c193d6f2eb51ca12422dcc7
-SHA1 (patch-stubs.c) = ffb82c0d7700a025c2eb1c4067623b064314924f
diff --git a/libpthread-stubs-dfbsd/libpthread-stubs/patches/patch-Makefile.in b/libpthread-stubs-dfbsd/libpthread-stubs/patches/patch-Makefile.in
deleted file mode 100644
index d95b5c0848..0000000000
--- a/libpthread-stubs-dfbsd/libpthread-stubs/patches/patch-Makefile.in
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD$
-
-From FreeBSD ports/ DragonFly dports devel/libpthread-stubs
-Unconditionally build libpthread-stubs.la as otherwise
-if all pthread functions found it might not be built.
-
---- Makefile.in.orig	2009-10-14 09:15:57.000000000 +0000
-+++ Makefile.in
-@@ -75,9 +75,9 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
- LTLIBRARIES = $(lib_LTLIBRARIES)
- libpthread_stubs_la_LIBADD =
- am__libpthread_stubs_la_SOURCES_DIST = stubs.c
--@BUILD_LIB_TRUE@am_libpthread_stubs_la_OBJECTS = stubs.lo
-+am_libpthread_stubs_la_OBJECTS = stubs.lo
- libpthread_stubs_la_OBJECTS = $(am_libpthread_stubs_la_OBJECTS)
--@BUILD_LIB_TRUE@am_libpthread_stubs_la_rpath = -rpath $(libdir)
-+am_libpthread_stubs_la_rpath = -rpath $(libdir)
- DEFAULT_INCLUDES = -I.@am__isrc@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-@@ -221,8 +221,8 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = pthread-stubs.pc
--@BUILD_LIB_TRUE@lib_LTLIBRARIES = libpthread-stubs.la
--@BUILD_LIB_TRUE@libpthread_stubs_la_SOURCES = stubs.c
-+lib_LTLIBRARIES = libpthread-stubs.la
-+libpthread_stubs_la_SOURCES = stubs.c
- all: config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
- 
diff --git a/libpthread-stubs-dfbsd/libpthread-stubs/patches/patch-stubs.c b/libpthread-stubs-dfbsd/libpthread-stubs/patches/patch-stubs.c
deleted file mode 100644
index 3b821ac20b..0000000000
--- a/libpthread-stubs-dfbsd/libpthread-stubs/patches/patch-stubs.c
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD$
-
-From FreeBSD ports / DragonFly dports
-
-XXX This is a big hack as we cannot define pthread_condattr_{init,destroy}
-here, or we will conflict with the weak symbols in libthr.  The way our linker
-works, the weak symbols will be resolved here, and pthread_condattr functions
-will not work even in threaded applications.
-
-I am working to get these symbols added to libc, but in the meantime, this
-is needed to avoid crashes in threaded applications which make use of
-pthread_condattr*.
-
-XXX Just comment out everything for tested platforms
-
---- stubs.c.orig	2009-10-14 09:13:09.000000000 +0000
-+++ stubs.c
-@@ -28,10 +28,12 @@
- #include <stdlib.h>
- #include "config.h"
- 
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__)
-+
- #ifndef HAVE_PTHREAD_SELF
- #define NEED_ZERO_STUB
- # ifdef SUPPORT_ATTRIBUTE_ALIAS
--int pthread_self() __attribute__ ((weak, alias ("__pthread_zero_stub")));
-+pthread_t pthread_self() __attribute__ ((weak, alias ("__pthread_zero_stub")));
- # else
- #  pragma weak pthread_self = __pthread_zero_stub
- # endif
-@@ -157,7 +159,7 @@ int pthread_equal() __attribute__ ((weak
- #ifndef HAVE_PTHREAD_EXIT
- #define NEED_EXIT_STUB
- # ifdef SUPPORT_ATTRIBUTE_ALIAS
--int pthread_exit() __attribute__ ((weak, alias ("__pthread_exit_stub")));
-+void pthread_exit(void*) __attribute__ ((weak, alias ("__pthread_exit_stub")));
- # else
- #  pragma weak pthread_exit = __pthread_exit_stub
- # endif
-@@ -190,3 +192,5 @@ static void __pthread_exit_stub(void *re
-     exit(EXIT_SUCCESS);
- }
- #endif
-+
-+#endif /* !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) */
diff --git a/libpthread-stubs-dfbsd/patches/patch-Makefile.in b/libpthread-stubs-dfbsd/patches/patch-Makefile.in
deleted file mode 100644
index e25a92252a..0000000000
--- a/libpthread-stubs-dfbsd/patches/patch-Makefile.in
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD$
-
---- Makefile.in.orig	2009-10-14 09:15:57.000000000 +0000
-+++ Makefile.in
-@@ -75,9 +75,9 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
- LTLIBRARIES = $(lib_LTLIBRARIES)
- libpthread_stubs_la_LIBADD =
- am__libpthread_stubs_la_SOURCES_DIST = stubs.c
--@BUILD_LIB_TRUE@am_libpthread_stubs_la_OBJECTS = stubs.lo
-+am_libpthread_stubs_la_OBJECTS = stubs.lo
- libpthread_stubs_la_OBJECTS = $(am_libpthread_stubs_la_OBJECTS)
--@BUILD_LIB_TRUE@am_libpthread_stubs_la_rpath = -rpath $(libdir)
-+am_libpthread_stubs_la_rpath = -rpath $(libdir)
- DEFAULT_INCLUDES = -I.@am__isrc@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-@@ -221,8 +221,8 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = pthread-stubs.pc
--@BUILD_LIB_TRUE@lib_LTLIBRARIES = libpthread-stubs.la
--@BUILD_LIB_TRUE@libpthread_stubs_la_SOURCES = stubs.c
-+lib_LTLIBRARIES = libpthread-stubs.la
-+libpthread_stubs_la_SOURCES = stubs.c
- all: config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
- 
diff --git a/libpthread-stubs-dfbsd/patches/patch-stubs.c b/libpthread-stubs-dfbsd/patches/patch-stubs.c
deleted file mode 100644
index 1d0a289492..0000000000
--- a/libpthread-stubs-dfbsd/patches/patch-stubs.c
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD$
-
---- stubs.c.orig	2009-10-14 09:13:09.000000000 +0000
-+++ stubs.c
-@@ -28,10 +28,12 @@
- #include <stdlib.h>
- #include "config.h"
- 
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__)
-+
- #ifndef HAVE_PTHREAD_SELF
- #define NEED_ZERO_STUB
- # ifdef SUPPORT_ATTRIBUTE_ALIAS
--int pthread_self() __attribute__ ((weak, alias ("__pthread_zero_stub")));
-+pthread_t pthread_self() __attribute__ ((weak, alias ("__pthread_zero_stub")));
- # else
- #  pragma weak pthread_self = __pthread_zero_stub
- # endif
-@@ -157,7 +159,7 @@ int pthread_equal() __attribute__ ((weak
- #ifndef HAVE_PTHREAD_EXIT
- #define NEED_EXIT_STUB
- # ifdef SUPPORT_ATTRIBUTE_ALIAS
--int pthread_exit() __attribute__ ((weak, alias ("__pthread_exit_stub")));
-+void pthread_exit(void*) __attribute__ ((weak, alias ("__pthread_exit_stub")));
- # else
- #  pragma weak pthread_exit = __pthread_exit_stub
- # endif
-@@ -190,3 +192,5 @@ static void __pthread_exit_stub(void *re
-     exit(EXIT_SUCCESS);
- }
- #endif
-+
-+#endif /* !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) */


Home | Main Index | Thread Index | Old Index