diff options
author | joerg <joerg@pkgsrc.org> | 2006-09-19 23:31:40 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2006-09-19 23:31:40 +0000 |
commit | aef58f867cb441b38061aab62a978474d76be907 (patch) | |
tree | f5f62ff293006f6fbfab7047ac621e19a890d8af /games/xsc | |
parent | 92ee46381c7021d313099e99cc100f2327d2505f (diff) | |
download | pkgsrc-aef58f867cb441b38061aab62a978474d76be907.tar.gz |
Kill C++ use in configure, since otherwise (s)random and gettimeofday
aren't detected on DragonFly.
Diffstat (limited to 'games/xsc')
-rw-r--r-- | games/xsc/distinfo | 3 | ||||
-rw-r--r-- | games/xsc/patches/patch-ab | 150 |
2 files changed, 152 insertions, 1 deletions
diff --git a/games/xsc/distinfo b/games/xsc/distinfo index 5c19176ffdc..28abed2cf84 100644 --- a/games/xsc/distinfo +++ b/games/xsc/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.3 2006/01/15 16:56:26 christos Exp $ +$NetBSD: distinfo,v 1.4 2006/09/19 23:31:40 joerg Exp $ SHA1 (xsc-1.5.tar.gz) = 3b6b71c2e9d132c56e276896f4869dc08a0e43a3 RMD160 (xsc-1.5.tar.gz) = d2519f75ad3089215b4c89ee765d1585de37db33 Size (xsc-1.5.tar.gz) = 86015 bytes SHA1 (patch-aa) = 4da7181d8037d0d334fbd5330a91a45a50b59753 +SHA1 (patch-ab) = 5140c951066a672610799ae7fd1fc8b4c5f2876d diff --git a/games/xsc/patches/patch-ab b/games/xsc/patches/patch-ab new file mode 100644 index 00000000000..de296fb4e14 --- /dev/null +++ b/games/xsc/patches/patch-ab @@ -0,0 +1,150 @@ +$NetBSD: patch-ab,v 1.1 2006/09/19 23:31:40 joerg Exp $ + +--- configure.orig 2006-09-20 01:23:24.000000000 +0000 ++++ configure +@@ -2236,31 +2236,11 @@ if eval "test \"`echo '$''{'ac_cv_func_$ + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2240 "configure" +-#include "confdefs.h" +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func(); below. */ +-#include <assert.h> +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char $ac_func(); ++#include <sys/time.h> + + int main() { +- +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +-choke me +-#else +-$ac_func(); +-#endif +- +-; return 0; } ++return gettimeofday(NULL, NULL); ++} + EOF + if { (eval echo configure:2266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* +@@ -2354,55 +2334,71 @@ fi + done + + +-for ac_func in random srandom +-do +-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:2361: checking for $ac_func" >&5 +-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then ++echo $ac_n "checking for random""... $ac_c" 1>&6 ++echo "configure:2361: checking for random" >&5 ++if eval "test \"`echo '$''{'ac_cv_func_random'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2366 "configure" +-#include "confdefs.h" +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func(); below. */ +-#include <assert.h> +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char $ac_func(); ++#include <stdlib.h> + + int main() { ++ return random(); ++} ++EOF ++if { (eval echo configure:2392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func_random=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_func_random=no" ++fi ++rm -f conftest* ++fi + +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +-choke me +-#else +-$ac_func(); +-#endif ++if eval "test \"`echo '$ac_cv_func_'random`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ ac_tr_func=HAVE_`echo random | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` ++ cat >> confdefs.h <<EOF ++#define $ac_tr_func 1 ++EOF ++ true ++else ++ echo "$ac_t""no" 1>&6 ++false ++fi + +-; return 0; } ++ ++echo $ac_n "checking for srandom""... $ac_c" 1>&6 ++echo "configure:2361: checking for srandom" >&5 ++if eval "test \"`echo '$''{'ac_cv_func_srandom'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ cat > conftest.$ac_ext <<EOF ++#include <stdlib.h> ++ ++int main(int argc, char **argv) { ++ srandom(argc); ++ ++ return 0; } + EOF + if { (eval echo configure:2392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* +- eval "ac_cv_func_$ac_func=yes" ++ eval "ac_cv_func_srandom=yes" + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* +- eval "ac_cv_func_$ac_func=no" ++ eval "ac_cv_func_srandom=no" + fi + rm -f conftest* + fi + +-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then ++if eval "test \"`echo '$ac_cv_func_'srandom`\" = yes"; then + echo "$ac_t""yes" 1>&6 +- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` ++ ac_tr_func=HAVE_`echo srandom | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <<EOF + #define $ac_tr_func 1 + EOF +@@ -2411,8 +2407,6 @@ else + echo "$ac_t""no" 1>&6 + false + fi +-done +- + + trap '' 1 2 15 + cat > confcache <<\EOF |