kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add DragonFly support. While here, add netbsd4 for future joy.

Browse source 
Use PTHREAD_* instead of hardcoded -lpthread.
This commit is contained in:
joerg 2006-01-09 21:22:57 +00:00
parent 0dece82cad
commit c4d0441014
7 changed files with 114 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lang/python22/PLIST.DragonFly Normal file
View file

@ -0,0 +1,4 @@
@comment $NetBSD: PLIST.DragonFly,v 1.1 2006/01/09 21:22:57 joerg Exp $
lib/python${PY_VER_SUFFIX}/lib-dynload/bsddb.so
lib/python${PY_VER_SUFFIX}/lib-dynload/dbm.so
lib/python${PY_VER_SUFFIX}/lib-dynload/nis.so

10
lang/python22/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.18 2005/11/16 19:18:58 joerg Exp $
$NetBSD: distinfo,v 1.19 2006/01/09 21:22:57 joerg Exp $
SHA1 (Python-2.2.3.tgz) = 177d587e77e0eaa14131ab0d0d0b470777de4400
RMD160 (Python-2.2.3.tgz) = 3590f813582d65194b467f4ab450e360e35eb40e
@ -8,11 +8,13 @@ SHA1 (patch-ab) = aa06824d9f595a24aaddc96c83f31646f522ab09
SHA1 (patch-ac) = 533d4c75b12f83a60808b784b794e200c4fa363f
SHA1 (patch-ae) = aefeec78e25631a6e9e2aa047dce12c9c522715e
SHA1 (patch-af) = a2b23859941766319f638e40c49b5af3f504ef52
SHA1 (patch-ag) = 08dad489e37199127f7f5cb0b4cc30f40a29fdda
SHA1 (patch-ah) = 22eca366910a007feeb6e5870eadb9f5024783b1
SHA1 (patch-ai) = 02f530a08fd8b61a696ae43ddabd7e86e4af7727
SHA1 (patch-al) = e114392656703cfda734d3a9ae0072a9fbcc8123
SHA1 (patch-al) = 9e1a69f0a1625054acc6ceed7242ac4d260c0948
SHA1 (patch-an) = 8e5b93bc65bb6d271e8e111949f715f7234f4371
SHA1 (patch-bb) = f1c1ae2b8f654132a991a3ced9467cea45f0bef9
SHA1 (patch-bc) = 9fbe77ff35519a290ef1f70fcaa72a60009a36a1
SHA1 (patch-bb) = 59c5bdef790918e6653fce0cf8189f5c01e9d4d5
SHA1 (patch-bc) = 376e5560f9f951d22ac371a8a5ab16c48d72404b
SHA1 (patch-ea) = babfed4a0e5ae599441423a06622d4820ab237b1
SHA1 (patch-eb) = b72694d414b55d11e324cc76d6ed03b7c8e7630c
SHA1 (patch-ec) = 3744382c5c58814129548f0529e3a5605c7ee0c8

31
lang/python22/patches/patch-ag Normal file
View file

@ -0,0 +1,31 @@
$NetBSD: patch-ag,v 1.1 2006/01/09 21:22:57 joerg Exp $
--- Modules/fpectlmodule.c.orig 2006-01-09 21:12:40.000000000 +0000
+++ Modules/fpectlmodule.c
@@ -68,7 +68,7 @@ extern "C" {
#include "Python.h"
#include <signal.h>
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__DragonFly__)
# include <ieeefp.h>
#endif
@@ -197,7 +197,7 @@ static void fpe_reset(Sigfunc *handler)
PyOS_setsig(SIGFPE, handler);
/*-- FreeBSD ----------------------------------------------------------------*/
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__DragonFly__)
fpresetsticky(fpgetsticky());
fpsetmask(FP_X_INV | FP_X_DZ | FP_X_OFL);
PyOS_setsig(SIGFPE, handler);
@@ -243,7 +243,7 @@ static void fpe_reset(Sigfunc *handler)
static PyObject *turnoff_sigfpe(PyObject *self,PyObject *args)
{
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__DragonFly__)
fpresetsticky(fpgetsticky());
fpsetmask(0);
#else

13
lang/python22/patches/patch-ah Normal file
View file

@ -0,0 +1,13 @@
$NetBSD: patch-ah,v 1.1 2006/01/09 21:22:57 joerg Exp $
--- Modules/linuxaudiodev.c.orig 2006-01-09 21:13:16.000000000 +0000
+++ Modules/linuxaudiodev.c
@@ -30,7 +30,7 @@
typedef unsigned long uint32_t;
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__DragonFly__)
#include <machine/soundcard.h>
#ifndef SNDCTL_DSP_CHANNELS

52
lang/python22/patches/patch-al
View file

@ -1,8 +1,18 @@
$NetBSD: patch-al,v 1.1 2005/01/24 21:43:40 tv Exp $
$NetBSD: patch-al,v 1.2 2006/01/09 21:22:57 joerg Exp $
--- configure.orig 2003-03-29 17:25:14.000000000 -0500
--- configure.orig 2003-03-29 22:25:14.000000000 +0000
+++ configure
@@ -3220,7 +3220,8 @@ then
@@ -3213,6 +3213,9 @@ then
Linux*) LDSHARED='$(CC) -shared';;
dgux*) LDSHARED="ld -G";;
BSD/OS*/4*) LDSHARED="gcc -shared";;
+ DragonFly*)
+ LDSHARED="cc -shared ${LDFLAGS}"
+ ;;
OpenBSD*|FreeBSD*)
if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
then
@@ -3220,7 +3223,8 @@ then
else
LDSHARED="ld -Bshareable ${LDFLAGS}"
fi;;
@ -12,15 +22,23 @@ $NetBSD: patch-al,v 1.1 2005/01/24 21:43:40 tv Exp $
OpenUNIX*|UnixWare*)
if test "$GCC" = "yes"
then LDSHARED="$(CC) -shared"
@@ -3251,6 +3252,7 @@ then
@@ -3250,7 +3254,8 @@ then
fi;;
Linux*) CCSHARED="-fPIC";;
BSD/OS*/4*) CCSHARED="-fpic";;
FreeBSD*|NetBSD*|OpenBSD*) CCSHARED="-fPIC";;
- FreeBSD*|NetBSD*|OpenBSD*) CCSHARED="-fPIC";;
+ FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";;
+ Interix*) CCSHARED="";;
OpenUNIX*|UnixWare*)
if test "$GCC" = "yes"
then CCSHARED="-fPIC"
@@ -3305,6 +3307,7 @@ then
@@ -3300,11 +3305,12 @@ then
OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;
SCO_SV*) LINKFORSHARED="-Wl,-Bexport";;
ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
- FreeBSD*|NetBSD*|OpenBSD*)
+ FreeBSD*|NetBSD*|OpenBSD*|DragonFly*)
if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
then
LINKFORSHARED="-Wl,--export-dynamic"
fi;;
@ -28,3 +46,25 @@ $NetBSD: patch-al,v 1.1 2005/01/24 21:43:40 tv Exp $
SunOS/5*) case $CC in
*gcc*)
if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
@@ -3800,9 +3806,9 @@ else
# on HP/UX, pthread.h renames pthread_create to a different symbol name.
# So we really have to include pthread.h, and then link.
_libs=$LIBS
- LIBS="$LIBS -lpthread"
- echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
-echo "configure:3806: checking for pthread_create in -lpthread" >&5
+ LIBS="$LIBS ${PTHREAD_LDFLAGS} ${PTHREAD_LIB}"
+ echo $ac_n "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIB}""... $ac_c" 1>&6
+echo "configure:3806: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIB}" >&5
cat > conftest.$ac_ext <<EOF
#line 3808 "configure"
#include "confdefs.h"
@@ -4097,7 +4103,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
EOF
posix_threads=yes
- LIBS="$LIBS -lpthread"
+ LIBS="$LIBS ${PTHREAD_LDFLAGS} ${PTHREAD_LIB}"
LIBOBJS="$LIBOBJS thread.o"
else
echo "$ac_t""no" 1>&6

11
lang/python22/patches/patch-bb
View file

@ -1,15 +1,16 @@
$NetBSD: patch-bb,v 1.3 2005/07/29 13:27:26 drochner Exp $
$NetBSD: patch-bb,v 1.4 2006/01/09 21:22:57 joerg Exp $
--- Lib/test/test_fcntl.py.orig 2002-08-23 18:06:46.000000000 +0200
+++ Lib/test/test_fcntl.py 2004-08-28 12:01:15.000000000 +0200
@@ -16,11 +16,11 @@
--- Lib/test/test_fcntl.py.orig 2002-08-23 16:06:46.000000000 +0000
+++ Lib/test/test_fcntl.py
@@ -16,11 +16,11 @@ except AttributeError:
else:
start_len = "qq"
-if sys.platform in ('netbsd1', 'Darwin1.2', 'darwin',
+if sys.platform in ('netbsd1', 'netbsd2', 'netbsd3', 'Darwin1.2', 'darwin',
'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
'bsdos2', 'bsdos3', 'bsdos4',
- 'bsdos2', 'bsdos3', 'bsdos4',
+ 'bsdos2', 'bsdos3', 'bsdos4', 'netbsd4', 'dragonfly1',
'openbsd', 'openbsd2', 'openbsd3'):
- lockdata = struct.pack('lxxxxlxxxxlhh', 0, 0, 0, fcntl.F_WRLCK, 0)
+ lockdata = struct.pack('qqihh', 0, 0, 0, fcntl.F_WRLCK, 0)

15
lang/python22/patches/patch-bc
View file

@ -1,14 +1,15 @@
$NetBSD: patch-bc,v 1.1 2004/08/29 10:44:19 recht Exp $
$NetBSD: patch-bc,v 1.2 2006/01/09 21:22:57 joerg Exp $
--- Lib/posixfile.py.orig 2001-10-25 00:03:35.000000000 +0200
+++ Lib/posixfile.py 2004-08-28 12:02:35.000000000 +0200
@@ -182,11 +182,11 @@
--- Lib/posixfile.py.orig 2001-10-24 22:03:35.000000000 +0000
+++ Lib/posixfile.py
@@ -182,11 +182,11 @@ class _posixfile_:
# Hack by davem@magnet.com to get locking to go on freebsd;
# additions for AIX by Vladimir.Marangozov@imag.fr
import sys, os
- if sys.platform in ('netbsd1',
+ if sys.platform in ('netbsd1', 'netbsd2',
'openbsd2',
- 'openbsd2',
+ if sys.platform in ('netbsd1', 'netbsd2', 'netbsd3', 'netbsd4',
+ 'openbsd2', 'dragonfly1',
'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
'bsdos2', 'bsdos3', 'bsdos4'):
- flock = struct.pack('lxxxxlxxxxlhh', \
@ -16,7 +17,7 @@ $NetBSD: patch-bc,v 1.1 2004/08/29 10:44:19 recht Exp $
l_start, l_len, os.getpid(), l_type, l_whence)
elif sys.platform in ['aix3', 'aix4']:
flock = struct.pack('hhlllii', \
@@ -198,12 +198,12 @@
@@ -198,12 +198,12 @@ class _posixfile_:
flock = fcntl.fcntl(self._file_.fileno(), cmd, flock)
if '?' in how: