Attachment #245466 for bug #274309

View | Details | Raw Unified | Return to bug 274309
Collapse All | Expand All

Lines 3-9 Link Here

(-)b/devel/gettext-runtime/Makefile (-1 / +1 lines)
3	# discretion.	3	# discretion.
4		4
5	PORTNAME= gettext-runtime	5	PORTNAME= gettext-runtime
6	PORTREVISION= 1	6	PORTREVISION= 0
7		7
8	COMMENT= GNU gettext runtime libraries and programs	8	COMMENT= GNU gettext runtime libraries and programs
9	WWW= https://www.gnu.org/software/gettext/	9	WWW= https://www.gnu.org/software/gettext/

Removed Link Here

(-)a/devel/gettext-runtime/files/patch-configure (-11 lines)
1	--- configure.orig 2023-06-17 11:53:59 UTC
2	+++ configure
3	@@ -27079,7 +27079,7 @@ then :
4	# On Solaris 10 or newer, this test is no longer needed, because
5	# libc contains the fully functional pthread functions.
6	case "$host_os" in
7	- solaris \| solaris2.[1-9] \| solaris2.[1-9].* \| hpux*)
8	+ solaris \| solaris2.[1-9] \| solaris2.[1-9].* \| hpux* \| freebsd*)
9
10	printf "%s\n" "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h
11

Removed Link Here

(-)a/devel/gettext-runtime/files/patch-intl_Makefile.in (-11 lines)
1	--- intl/Makefile.in.orig 2023-06-17 11:53:53 UTC
2	+++ intl/Makefile.in
3	@@ -1692,7 +1692,7 @@ AM_CPPFLAGS = -Ignulib-lib -I$(srcdir)/gnulib-lib \
4	AM_CPPFLAGS = -Ignulib-lib -I$(srcdir)/gnulib-lib \
5	-DLOCALEDIR=$(localedir_c_make) \
6	-DLOCALE_ALIAS_PATH=\"$(aliaspath)\" -DLIBDIR=\"$(libdir)\" \
7	- -DBUILDING_LIBINTL $(am__append_1)
8	+ -DBUILDING_LIBINTL -DBUILDING_DLL $(am__append_1)
9
10	# Enable more warning options in this directory.
11




--- intl/gnulib-lib/glthread/threadlib.c.orig	2023-02-03 13:19:38 UTC
+++ intl/gnulib-lib/glthread/threadlib.c
@@ -62,11 +62,10 @@ glthread_in_use (void)
 
 /* Test using pthread_create.  */
 
-/* The function to be executed by a dummy thread.  */
-static void *
-dummy_thread_func (void *arg)
+static pthread_once_t dummy_once_control = PTHREAD_ONCE_INIT;
+static void
+dummy_once_func (void)
 {
-  return arg;
 }
 
 int
@@ -77,19 +76,10 @@ glthread_in_use (void)
 
   if (!tested)
     {
-      pthread_t thread;
-
-      if (pthread_create (&thread, NULL, dummy_thread_func, NULL) != 0)
-        /* Thread creation failed.  */
+      if (pthread_once (&dummy_once_control, dummy_once_func) != 0)
         result = 0;
       else
-        {
-          /* Thread creation works.  */
-          void *retval;
-          if (pthread_join (thread, &retval) != 0)
-            abort ();
-          result = 1;
-        }
+        result = 1;
       tested = 1;
     }
   return result;

Lines 11-17 lib/libasprintf.so.0.0.0 Link Here

(-)b/devel/gettext-runtime/pkg-plist (-1 / +1 lines)
11	lib/libintl.a	11	lib/libintl.a
12	lib/libintl.so	12	lib/libintl.so
13	lib/libintl.so.8	13	lib/libintl.so.8
14	lib/libintl.so.8.3.0	14	lib/libintl.so.8.4.0
15	man/man1/envsubst.1.gz	15	man/man1/envsubst.1.gz
16	man/man1/gettext.1.gz	16	man/man1/gettext.1.gz
17	man/man1/ngettext.1.gz	17	man/man1/ngettext.1.gz




                 && test "$PACKAGE" != libintl; }; then
           gt_use_preinstalled_gnugettext=yes
         else
@@ -35320,7 +35319,7 @@ then :
              # On Solaris 10 or newer, this test is no longer needed, because
              # libc contains the fully functional pthread functions.
              case "$host_os" in
-               solaris | solaris2.[1-9] | solaris2.[1-9].* | hpux*)
+               solaris | solaris2.[1-9] | solaris2.[1-9].* | hpux* | freebsd*)
 
 printf "%s\n" "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h
 




--- gnulib-lib/glthread/threadlib.c.orig	2014-07-14 07:28:34 UTC
+++ gnulib-lib/glthread/threadlib.c
@@ -29,11 +29,10 @@
 
 # if PTHREAD_IN_USE_DETECTION_HARD
 
-/* The function to be executed by a dummy thread.  */
-static void *
-dummy_thread_func (void *arg)
+static pthread_once_t dummy_once_control = PTHREAD_ONCE_INIT;
+static void
+dummy_once_func (void)
 {
-  return arg;
 }
 
 int
@@ -44,19 +43,10 @@ glthread_in_use (void)
 
   if (!tested)
     {
-      pthread_t thread;
-
-      if (pthread_create (&thread, NULL, dummy_thread_func, NULL) != 0)
-        /* Thread creation failed.  */
+      if (pthread_once (&dummy_once_control, dummy_once_func) != 0)
         result = 0;
       else
-        {
-          /* Thread creation works.  */
-          void *retval;
-          if (pthread_join (thread, &retval) != 0)
-            abort ();
-          result = 1;
-        }
+        result = 1;
       tested = 1;
     }
   return result;




--- libgettextpo/glthread/threadlib.c.orig	2014-07-14 07:29:10 UTC
+++ libgettextpo/glthread/threadlib.c
@@ -29,11 +29,10 @@
 
 # if PTHREAD_IN_USE_DETECTION_HARD
 
-/* The function to be executed by a dummy thread.  */
-static void *
-dummy_thread_func (void *arg)
+static pthread_once_t dummy_once_control = PTHREAD_ONCE_INIT;
+static void
+dummy_once_func (void)
 {
-  return arg;
 }
 
 int
@@ -44,19 +43,10 @@ glthread_in_use (void)
 
   if (!tested)
     {
-      pthread_t thread;
-
-      if (pthread_create (&thread, NULL, dummy_thread_func, NULL) != 0)
-        /* Thread creation failed.  */
+      if (pthread_once (&dummy_once_control, dummy_once_func) != 0)
         result = 0;
       else
-        {
-          /* Thread creation works.  */
-          void *retval;
-          if (pthread_join (thread, &retval) != 0)
-            abort ();
-          result = 1;
-        }
+        result = 1;
       tested = 1;
     }
   return result;

Lines 27-33 lib/libgettextlib.so Link Here

(-)b/devel/gettext-tools/pkg-plist (-1 / +1 lines)
27	lib/libgettextpo.a	27	lib/libgettextpo.a
28	lib/libgettextpo.so	28	lib/libgettextpo.so
29	lib/libgettextpo.so.0	29	lib/libgettextpo.so.0
30	lib/libgettextpo.so.0.5.9	30	lib/libgettextpo.so.0.5.10
31	lib/libgettextsrc-%%PORTVERSION%%.so	31	lib/libgettextsrc-%%PORTVERSION%%.so
32	lib/libgettextsrc.so	32	lib/libgettextsrc.so
33	man/man1/autopoint.1.gz	33	man/man1/autopoint.1.gz

Lines 2-8 Link Here

(-)b/devel/gettext/Makefile.common (-1 / +1 lines)
2	# experimental ports run. Untested commits may be backed out at portmgr's	2	# experimental ports run. Untested commits may be backed out at portmgr's
3	# discretion.	3	# discretion.
4		4
5	DISTVERSION= 0.22	5	DISTVERSION= 0.22.3
6	PORTREVISION?= 0 # Leave this zero. Set in Makefile instead.	6	PORTREVISION?= 0 # Leave this zero. Set in Makefile instead.
7	CATEGORIES= devel	7	CATEGORIES= devel
8	MASTER_SITES= GNU/gettext	8	MASTER_SITES= GNU/gettext

Lines 1-3 Link Here

(-)b/devel/gettext/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1687532203	1	TIMESTAMP = 1696592259
2	SHA256 (gettext-0.22.tar.xz) = 0e60393a47061567b46875b249b7d2788b092d6457d656145bb0e7e6a3e26d93	2	SHA256 (gettext-0.22.3.tar.xz) = b838228b3f8823a6c1eddf07297197c4db13f7e1b173b9ef93f3f945a63080b6
3	SIZE (gettext-0.22.tar.xz) = 10008808	3	SIZE (gettext-0.22.3.tar.xz) = 10236340

Lines 5-11 include/textstyle/woe32dll.h Link Here

(-)b/devel/libtextstyle/pkg-plist (-2 / +1 lines)
5	lib/libtextstyle.a	5	lib/libtextstyle.a
6	lib/libtextstyle.so	6	lib/libtextstyle.so
7	lib/libtextstyle.so.0	7	lib/libtextstyle.so.0
8	lib/libtextstyle.so.0.2.0	8	lib/libtextstyle.so.0.2.1
9	%%PORTDOCS%%%%DOCSDIR%%/libtextstyle_1.html	9	%%PORTDOCS%%%%DOCSDIR%%/libtextstyle_1.html
10	%%PORTDOCS%%%%DOCSDIR%%/libtextstyle_2.html	10	%%PORTDOCS%%%%DOCSDIR%%/libtextstyle_2.html
11	%%PORTDOCS%%%%DOCSDIR%%/libtextstyle_3.html	11	%%PORTDOCS%%%%DOCSDIR%%/libtextstyle_3.html
12	-

Return to bug 274309

Removed Link Here

(-)a/devel/gettext-runtime/files/patch-intl_gnulib-lib_glthread_threadlib.c (-39 lines)
1	--- intl/gnulib-lib/glthread/threadlib.c.orig 2023-02-03 13:19:38 UTC
2	+++ intl/gnulib-lib/glthread/threadlib.c
3	@@ -62,11 +62,10 @@ glthread_in_use (void)
4
5	/* Test using pthread_create. */
6
7	-/* The function to be executed by a dummy thread. */
8	-static void *
9	-dummy_thread_func (void *arg)
10	+static pthread_once_t dummy_once_control = PTHREAD_ONCE_INIT;
11	+static void
12	+dummy_once_func (void)
13	{
14	- return arg;
15	}
16
17	int
18	@@ -77,19 +76,10 @@ glthread_in_use (void)
19
20	if (!tested)
21	{
22	- pthread_t thread;
23	-
24	- if (pthread_create (&thread, NULL, dummy_thread_func, NULL) != 0)
25	- /* Thread creation failed. */
26	+ if (pthread_once (&dummy_once_control, dummy_once_func) != 0)
27	result = 0;
28	else
29	- {
30	- /* Thread creation works. */
31	- void *retval;
32	- if (pthread_join (thread, &retval) != 0)
33	- abort ();
34	- result = 1;
35	- }
36	+ result = 1;
37	tested = 1;
38	}
39	return result;

Lines 8-19 Link Here

(-)b/devel/gettext-tools/files/patch-configure (-9 lines)
8	&& test "$PACKAGE" != libintl; }; then	8	&& test "$PACKAGE" != libintl; }; then
9	gt_use_preinstalled_gnugettext=yes	9	gt_use_preinstalled_gnugettext=yes
10	else	10	else
11	@@ -35320,7 +35319,7 @@ then :
12	# On Solaris 10 or newer, this test is no longer needed, because
13	# libc contains the fully functional pthread functions.
14	case "$host_os" in
15	- solaris \| solaris2.[1-9] \| solaris2.[1-9].* \| hpux*)
16	+ solaris \| solaris2.[1-9] \| solaris2.[1-9].* \| hpux* \| freebsd*)
17
18	printf "%s\n" "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h
19

Removed Link Here

(-)a/devel/gettext-tools/files/patch-gnulib-lib_glthread_threadlib.c (-39 lines)
1	--- gnulib-lib/glthread/threadlib.c.orig 2014-07-14 07:28:34 UTC
2	+++ gnulib-lib/glthread/threadlib.c
3	@@ -29,11 +29,10 @@
4
5	# if PTHREAD_IN_USE_DETECTION_HARD
6
7	-/* The function to be executed by a dummy thread. */
8	-static void *
9	-dummy_thread_func (void *arg)
10	+static pthread_once_t dummy_once_control = PTHREAD_ONCE_INIT;
11	+static void
12	+dummy_once_func (void)
13	{
14	- return arg;
15	}
16
17	int
18	@@ -44,19 +43,10 @@ glthread_in_use (void)
19
20	if (!tested)
21	{
22	- pthread_t thread;
23	-
24	- if (pthread_create (&thread, NULL, dummy_thread_func, NULL) != 0)
25	- /* Thread creation failed. */
26	+ if (pthread_once (&dummy_once_control, dummy_once_func) != 0)
27	result = 0;
28	else
29	- {
30	- /* Thread creation works. */
31	- void *retval;
32	- if (pthread_join (thread, &retval) != 0)
33	- abort ();
34	- result = 1;
35	- }
36	+ result = 1;
37	tested = 1;
38	}
39	return result;

Removed Link Here

(-)a/devel/gettext-tools/files/patch-libgettextpo_glthread_threadlib.c (-39 lines)
1	--- libgettextpo/glthread/threadlib.c.orig 2014-07-14 07:29:10 UTC
2	+++ libgettextpo/glthread/threadlib.c
3	@@ -29,11 +29,10 @@
4
5	# if PTHREAD_IN_USE_DETECTION_HARD
6
7	-/* The function to be executed by a dummy thread. */
8	-static void *
9	-dummy_thread_func (void *arg)
10	+static pthread_once_t dummy_once_control = PTHREAD_ONCE_INIT;
11	+static void
12	+dummy_once_func (void)
13	{
14	- return arg;
15	}
16
17	int
18	@@ -44,19 +43,10 @@ glthread_in_use (void)
19
20	if (!tested)
21	{
22	- pthread_t thread;
23	-
24	- if (pthread_create (&thread, NULL, dummy_thread_func, NULL) != 0)
25	- /* Thread creation failed. */
26	+ if (pthread_once (&dummy_once_control, dummy_once_func) != 0)
27	result = 0;
28	else
29	- {
30	- /* Thread creation works. */
31	- void *retval;
32	- if (pthread_join (thread, &retval) != 0)
33	- abort ();
34	- result = 1;
35	- }
36	+ result = 1;
37	tested = 1;
38	}
39	return result;