diff options
| author | drochner <drochner@pkgsrc.org> | 2003-06-16 16:33:34 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2003-06-16 16:33:34 +0000 |
| commit | bff8e49ca0c66c472bab746a6046d30afca08703 (patch) | |
| tree | c124e782a9a045f43263afbd4a3b325495b76254 /lang | |
| parent | 4f5d38569118d945c49748c7791195cc15523173 (diff) | |
| download | pkgsrc-bff8e49ca0c66c472bab746a6046d30afca08703.tar.gz | |
Don't check for socket() in libnet.* - this will give a false hit
if pkgsrc/devel/libnet is installed.
Should fix PR pkg/21876 by Jeremy C. Reed.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/python15/distinfo | 4 | ||||
| -rw-r--r-- | lang/python15/patches/patch-aa | 63 |
2 files changed, 57 insertions, 10 deletions
diff --git a/lang/python15/distinfo b/lang/python15/distinfo index b76396971ef..8a2a989a71e 100644 --- a/lang/python15/distinfo +++ b/lang/python15/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2003/06/06 18:14:09 drochner Exp $ +$NetBSD: distinfo,v 1.3 2003/06/16 16:33:34 drochner Exp $ SHA1 (py152.tgz) = 2d648d07b1aa1aab32a3a24851c33715141779b9 Size (py152.tgz) = 2533053 bytes -SHA1 (patch-aa) = 229ad8a0fda51641dd80c7765e10cfdda2dc2ceb +SHA1 (patch-aa) = d8ad652ad5900da9f5384a1d577626e0d16b51ce SHA1 (patch-ab) = 7cbbae8a41e9e0d530561c80009c20bb838ebc15 diff --git a/lang/python15/patches/patch-aa b/lang/python15/patches/patch-aa index 4ec1cb1b907..f48483920aa 100644 --- a/lang/python15/patches/patch-aa +++ b/lang/python15/patches/patch-aa @@ -1,8 +1,55 @@ -$NetBSD: patch-aa,v 1.2 2002/01/31 23:18:11 wiz Exp $ +$NetBSD: patch-aa,v 1.3 2003/06/16 16:33:35 drochner Exp $ ---- configure.orig Sat Apr 10 18:02:18 1999 -+++ configure Tue Jan 29 18:59:52 2002 -@@ -2601,507 +2601,8 @@ +--- configure.orig 1999-04-10 18:02:18.000000000 +0200 ++++ configure 2003-06-16 18:25:53.000000000 +0200 +@@ -2498,46 +2498,6 @@ + else + echo "$ac_t""no" 1>&6 + fi +- # SVR4 sockets +-echo $ac_n "checking for socket in -lnet""... $ac_c" 1>&6 +-echo "configure:2504: checking for socket in -lnet" >&5 +-ac_lib_var=`echo net'_'socket | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-lnet $LIBS $LIBS" +-cat > conftest.$ac_ext <<EOF +-#line 2512 "configure" +-#include "confdefs.h" +-/* Override any gcc2 internal prototype to avoid an error. */ +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char socket(); +- +-int main() { +-socket() +-; return 0; } +-EOF +-if { (eval echo configure:2523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" +- +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- LIBS="-lnet $LIBS" +-else +- echo "$ac_t""no" 1>&6 +-fi + # BeOS + ;; + esac +@@ -2601,507 +2561,8 @@ fi @@ -20,7 +67,7 @@ $NetBSD: patch-aa,v 1.2 2002/01/31 23:18:11 wiz Exp $ -cat >> confdefs.h <<\EOF -#define _REENTRANT 1 -EOF - +- -ac_safe=`echo "mach/cthreads.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for mach/cthreads.h""... $ac_c" 1>&6 -echo "configure:2622: checking for mach/cthreads.h" >&5 @@ -52,7 +99,7 @@ $NetBSD: patch-aa,v 1.2 2002/01/31 23:18:11 wiz Exp $ - cat >> confdefs.h <<\EOF -#define WITH_THREAD 1 -EOF - +- -cat >> confdefs.h <<\EOF -#define C_THREADS 1 -EOF @@ -111,11 +158,11 @@ $NetBSD: patch-aa,v 1.2 2002/01/31 23:18:11 wiz Exp $ -cat >> confdefs.h <<\EOF -#define _POSIX_THREADS 1 -EOF -- + -LIBOBJS="$LIBOBJS thread.o" -else - echo "$ac_t""no" 1>&6 -- + -ac_safe=`echo "kernel/OS.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for kernel/OS.h""... $ac_c" 1>&6 -echo "configure:2717: checking for kernel/OS.h" >&5 |