diff options
| author | bapt <bapt@FreeBSD.org> | 2017-04-02 04:36:47 +0800 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2017-04-02 04:36:47 +0800 |
| commit | d912aa483b769354b63b84873a8671c52553d3b9 (patch) | |
| tree | 5aa6004578001ff2abeafd30b0f581e020751a67 | |
| parent | 85afc1fd5fb5f6fbd8188b641e578f4953d87cc4 (diff) | |
| download | freebsd-ports-gnome-d912aa483b769354b63b84873a8671c52553d3b9.tar.gz freebsd-ports-gnome-d912aa483b769354b63b84873a8671c52553d3b9.tar.zst freebsd-ports-gnome-d912aa483b769354b63b84873a8671c52553d3b9.zip | |
Reapply 437111
While here remove configure arguments already passed by the framework
Reported by: jbeich
| -rw-r--r-- | devel/glib20/Makefile | 5 | ||||
| -rw-r--r-- | devel/glib20/files/patch-glib_gthread-posix.c | 20 |
2 files changed, 2 insertions, 23 deletions
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 5e63fdef3b48..edc2a8592794 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -3,7 +3,7 @@ PORTNAME= glib PORTVERSION= 2.52.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -54,8 +54,7 @@ COLLATION_FIX_DESC= Use ICU for UTF-8 string collation (if libc is broken) OPTIONS_EXCLUDE_FreeBSD_11= COLLATION_FIX OPTIONS_EXCLUDE_FreeBSD_12= COLLATION_FIX -DEBUG_CONFIGURE_ARGS+= --enable-debug=yes \ - --disable-silent-rules +DEBUG_CONFIGURE_ARGS+= --enable-debug=yes COLLATION_FIX_LIB_DEPENDS+= libicui18n.so:devel/icu COLLATION_FIX_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-glib_Makefile.in \ diff --git a/devel/glib20/files/patch-glib_gthread-posix.c b/devel/glib20/files/patch-glib_gthread-posix.c deleted file mode 100644 index 3334a19ba25a..000000000000 --- a/devel/glib20/files/patch-glib_gthread-posix.c +++ /dev/null @@ -1,20 +0,0 @@ ---- glib/gthread-posix.c.orig 2014-09-22 15:42:12.000000000 +0200 -+++ glib/gthread-posix.c 2014-09-28 09:46:56.659280343 +0200 -@@ -98,7 +98,7 @@ - if G_UNLIKELY (mutex == NULL) - g_thread_abort (errno, "malloc"); - --#ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP -+#if defined(PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) && !defined(__FreeBSD__) - pthread_mutexattr_init (&attr); - pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_ADAPTIVE_NP); - pattr = &attr; -@@ -107,7 +107,7 @@ - if G_UNLIKELY ((status = pthread_mutex_init (mutex, pattr)) != 0) - g_thread_abort (status, "pthread_mutex_init"); - --#ifdef PTHREAD_ADAPTIVE_MUTEX_NP -+#if defined(PTHREAD_ADAPTIVE_MUTEX_NP) && !defined(__FreeBSD__) - pthread_mutexattr_destroy (&attr); - #endif - |