From a700373bffed88aaf76b99e8ef35710848c669aa Mon Sep 17 00:00:00 2001 From: sebastia Date: Tue, 10 Jul 2012 09:19:32 +0000 Subject: [PATCH] Do not link against -lpthread Pointed out and OK aja@ --- x11/gnustep/base/Makefile | 3 ++- x11/gnustep/base/patches/patch-configure | 32 ++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 x11/gnustep/base/patches/patch-configure diff --git a/x11/gnustep/base/Makefile b/x11/gnustep/base/Makefile index 8c254863129..cbc50190e3a 100644 --- a/x11/gnustep/base/Makefile +++ b/x11/gnustep/base/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.43 2012/07/08 13:22:54 sebastia Exp $ +# $OpenBSD: Makefile,v 1.44 2012/07/10 09:19:32 sebastia Exp $ COMMENT= GNUstep base library DISTNAME= gnustep-base-1.24.0 +REVISION = 0 SHARED_LIBS= gnustep-base 5.0 CATEGORIES= devel diff --git a/x11/gnustep/base/patches/patch-configure b/x11/gnustep/base/patches/patch-configure new file mode 100644 index 00000000000..a79d530a715 --- /dev/null +++ b/x11/gnustep/base/patches/patch-configure @@ -0,0 +1,32 @@ +$OpenBSD: patch-configure,v 1.6 2012/07/10 09:19:32 sebastia Exp $ + +use -pthread instead of -lpthread + +--- configure.orig Sun Jul 8 18:51:13 2012 ++++ configure Sun Jul 8 18:51:35 2012 +@@ -12441,13 +12441,13 @@ else + $as_echo "$as_me: error: Unable to find pthread.h (needed for thread support)." >&2;} + { (exit 1); exit 1; }; } + fi +-{ $as_echo "$as_me:$LINENO: checking for pthread_join in -lpthread" >&5 +-$as_echo_n "checking for pthread_join in -lpthread... " >&6; } ++{ $as_echo "$as_me:$LINENO: checking for pthread_join in -pthread" >&5 ++$as_echo_n "checking for pthread_join in -pthread... " >&6; } + if test "${ac_cv_lib_pthread_pthread_join+set}" = set; then + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lpthread $LIBS" ++LIBS="-pthread $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -12517,7 +12517,7 @@ case "$target_os" in + mingw*) ismingw=yes;; + esac + if test $pthread_ok = yes ; then +- LIBS="$LIBS -lpthread" ++ LIBS="$LIBS -pthread" + else + if test $ismingw = yes ; then + { $as_echo "$as_me:$LINENO: checking for pthread_join in -lpthreadGC2" >&5