summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg>2006-03-28 21:41:13 +0000
committerjoerg <joerg>2006-03-28 21:41:13 +0000
commit5b23dd884e725fbad7f9d983a46ebe2fabe05b26 (patch)
treea09b7c7bf03ca14ad9502e91952443b354d605c6
parentb7280800c6a7f23d590007322fc22fbfe4bf6f43 (diff)
downloadpkgsrc-5b23dd884e725fbad7f9d983a46ebe2fabe05b26.tar.gz
Fix pthread linkage and gettext detection.
-rw-r--r--games/grhino/distinfo3
-rw-r--r--games/grhino/patches/patch-aa51
2 files changed, 53 insertions, 1 deletions
diff --git a/games/grhino/distinfo b/games/grhino/distinfo
index 4dc1d373220..ea24d85bfcf 100644
--- a/games/grhino/distinfo
+++ b/games/grhino/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.9 2005/04/19 00:49:49 wiz Exp $
+$NetBSD: distinfo,v 1.10 2006/03/28 21:41:13 joerg Exp $
SHA1 (grhino-0.15.0.tar.gz) = 11fddcc6904a8abad417b1f982212861d2e666fb
RMD160 (grhino-0.15.0.tar.gz) = 8f1f3282409bfcb0d94ac97ba629823b01af8ddf
Size (grhino-0.15.0.tar.gz) = 1149961 bytes
+SHA1 (patch-aa) = b380e7141a5991c3f1a1ee1707844e927b9422ea
SHA1 (patch-ab) = e84e7fe4b6c5af92cd7a8a916c01bd583e028e54
diff --git a/games/grhino/patches/patch-aa b/games/grhino/patches/patch-aa
new file mode 100644
index 00000000000..65ab04aab7b
--- /dev/null
+++ b/games/grhino/patches/patch-aa
@@ -0,0 +1,51 @@
+$NetBSD: patch-aa,v 1.5 2006/03/28 21:41:13 joerg Exp $
+
+--- configure.orig 2005-04-15 14:03:04.000000000 +0000
++++ configure
+@@ -3324,13 +3324,13 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+
+-echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
++echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
+ if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpthread $LIBS"
++LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -3389,7 +3389,7 @@ fi
+ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
+ echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
+ if test $ac_cv_lib_pthread_pthread_create = yes; then
+- LIBS="$LIBS -lpthread"
++ LIBS="$LIBS ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
+ else
+ { { echo "$as_me:$LINENO: error: pthread library is required" >&5
+ echo "$as_me: error: pthread library is required" >&2;}
+@@ -6926,18 +6926,12 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #include <libintl.h>
+-extern int _nl_msg_cat_cntr;
+-extern
+-#ifdef __cplusplus
+-"C"
+-#endif
+-const char *_nl_expand_alias ();
++
+ int
+ main ()
+ {
+ bindtextdomain ("", "");
+-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
+- ;
++return (int) gettext ("");
+ return 0;
+ }
+ _ACEOF