edb7229dd4
first contains runtime libraries such as libintl and the latter contains developer tools such as msgfmt. Ports that use gettext will usually need a LIB_DEPENDS on gettext-runtime and a BUILD_DEPENDS on gettext-tools. USES=gettext-runtime can be used to set a LIB/BUILD/RUN_DEPENDS on devel/gettext-runtime and USES=gettext-tools can be used to set a BUILD/RUN_DEPENDS on devel/gettext-tools. USES=gettext is now the same as "USES=gettext-runtime gettext-tools" meaning a LIB_DEPENDS on devel/gettext-runtime and a BUILD_DEPENDS on devel/gettext-tools. Update gettext to 0.19.3. Remove :oldver from converters/libiconv and devel/gettext-runtime. Leave symlinks with the old library versions to avoid the need to bump PORTREVISION on a large number of dependent ports. When most of the dependent ports have had normal version updates, PORTREVISION can be bumped on the remaining ones (low number) and the links can be removed. Fix some ports that installed files in lib/locale instead of share/locale. PR: 194038 Reviewed by: bapt Exp-run: antoine Approved by: portmgr (antoine)
39 lines
955 B
C
39 lines
955 B
C
--- 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;
|