From c86fe80720aac6c4ef330fd110e956543da88fde Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Mon, 26 Apr 2010 22:00:31 +0000
Subject: [PATCH] Regenerated the python-2.6.5 patch and added utf-8 as the
 default filesystem encoding.

---
 dev-lang/python/patches/python-2.6.5.patch | 278 +++++++++++----------
 1 file changed, 145 insertions(+), 133 deletions(-)

diff --git a/dev-lang/python/patches/python-2.6.5.patch b/dev-lang/python/patches/python-2.6.5.patch
index 66348d541..168bdfed0 100644
--- a/dev-lang/python/patches/python-2.6.5.patch
+++ b/dev-lang/python/patches/python-2.6.5.patch
@@ -1,6 +1,105 @@
-diff -urN Python-2.6.5/Lib/plat-haiku1/IN.py Python-2.6.5-haiku/Lib/plat-haiku1/IN.py
---- Python-2.6.5/Lib/plat-haiku1/IN.py	1970-01-01 00:00:00.000000000 +0000
-+++ Python-2.6.5-haiku/Lib/plat-haiku1/IN.py	2010-03-11 16:54:31.758644736 +0000
+diff -up Python-2.6.5/configure.in.orig Python-2.6.5/configure.in
+--- Python-2.6.5/configure.in.orig	2010-03-09 14:47:28.011272192 -0700
++++ Python-2.6.5/configure.in	2010-04-26 15:46:56.072613888 -0600
+@@ -747,7 +747,7 @@ if test $enable_shared = "yes"; then
+ 	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
+ 	  INSTSONAME="$LDLIBRARY".$SOVERSION
+           ;;
+-    Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*)
++    Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|Haiku*)
+ 	  LDLIBRARY='libpython$(VERSION).so'
+ 	  BLDLIBRARY='-L. -lpython$(VERSION)'
+ 	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
+@@ -825,7 +825,7 @@ AC_PROG_INSTALL
+ AC_SUBST(LN)
+ if test -z "$LN" ; then
+ 	case $ac_sys_system in
+-		BeOS*) LN="ln -s";;
++		BeOS*|Haiku*) LN="ln -s";;
+ 		CYGWIN*) LN="ln -s";;
+ 		atheos*) LN="ln -s";;
+ 		*) LN=ln;;
+@@ -1813,7 +1813,7 @@ then
+ 			fi
+ 		fi
+ 		;;
+-	Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared';;
++	Linux*|GNU*|QNX*|Haiku*) LDSHARED='$(CC) -shared';;
+ 	BSD/OS*/4*) LDSHARED="gcc -shared";;
+ 	FreeBSD*)
+ 		if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
+@@ -1867,7 +1867,7 @@ then
+ 		 then CCSHARED="-fPIC";
+ 		 else CCSHARED="+z";
+ 		 fi;;
+-	Linux*|GNU*) CCSHARED="-fPIC";;
++	Linux*|GNU*|Haiku*) CCSHARED="-fPIC";;
+ 	BSD/OS*/4*) CCSHARED="-fpic";;
+ 	FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";;
+ 	OpenUNIX*|UnixWare*)
+@@ -1900,7 +1900,7 @@ then
+ 	    LINKFORSHARED="-Wl,-E -Wl,+s";;
+ #	    LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;
+ 	BSD/OS/4*) LINKFORSHARED="-Xlinker -export-dynamic";;
+-	Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";;
++	Linux*|GNU*|Haiku*) LINKFORSHARED="-Xlinker -export-dynamic";;
+ 	# -u libsys_s pulls in all symbols in libsys
+ 	Darwin/*) 
+ 		# -u _PyMac_Error is needed to pull in the mac toolbox glue,
+@@ -2019,6 +2019,9 @@ case "$ac_sys_system" in
+ BeOS*)
+ AC_CHECK_LIB(net, socket, [LIBS="-lnet $LIBS"], [], $LIBS) # BeOS
+ ;;
++Haiku*)
++AC_CHECK_LIB(network, socket, [LIBS="-lnetwork $LIBS"], [], $LIBS) # Haiku
++;;
+ esac
+ 
+ AC_MSG_CHECKING(for --with-libs)
+@@ -3249,7 +3252,7 @@ fi],
+ AC_SUBST(LIBM)
+ case $ac_sys_system in
+ Darwin) ;;
+-BeOS) ;;
++BeOS|Haiku) ;;
+ *) LIBM=-lm
+ esac
+ AC_MSG_CHECKING(for --with-libm=STRING)
+diff -up Python-2.6.5/setup.py.orig Python-2.6.5/setup.py
+--- Python-2.6.5/setup.py.orig	2010-03-08 00:08:25.000000000 -0700
++++ Python-2.6.5/setup.py	2010-04-26 15:46:56.095682560 -0600
+@@ -382,6 +382,10 @@ class PyBuildExt(build_ext):
+             inc_dirs += ['/system/include', '/atheos/autolnk/include']
+             inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
+ 
++        if platform == 'haiku1':
++            inc_dirs += ['/boot/develop/headers/posix', '/boot/develop/headers/3rdparty', '/boot/common/include']
++            lib_dirs += ['/boot/system/lib', '/boot/develop/lib/x86', '/boot/common/lib']
++
+         # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb)
+         if platform in ['osf1', 'unixware7', 'openunix8']:
+             lib_dirs += ['/usr/ccs/lib']
+@@ -405,7 +409,7 @@ class PyBuildExt(build_ext):
+ 
+         # Check for MacOS X, which doesn't need libm.a at all
+         math_libs = ['m']
+-        if platform in ['darwin', 'beos', 'mac']:
++        if platform in ['darwin', 'beos', 'haiku1', 'mac']:
+             math_libs = []
+ 
+         # XXX Omitted modules: gl, pure, dl, SGI-specific modules
+@@ -1068,7 +1072,7 @@ class PyBuildExt(build_ext):
+                 missing.append('resource')
+ 
+             # Sun yellow pages. Some systems have the functions in libc.
+-            if (platform not in ['cygwin', 'atheos', 'qnx6'] and
++            if (platform not in ['cygwin', 'atheos', 'qnx6', 'haiku1'] and
+                 find_file('rpcsvc/yp_prot.h', inc_dirs, []) is not None):
+                 if (self.compiler.find_library_file(lib_dirs, 'nsl')):
+                     libs = ['nsl']
+diff -up Python-2.6.5/Lib/plat-haiku1/IN.py.orig Python-2.6.5/Lib/plat-haiku1/IN.py
+--- Python-2.6.5/Lib/plat-haiku1/IN.py.orig	2010-04-26 15:46:55.865337344 -0600
++++ Python-2.6.5/Lib/plat-haiku1/IN.py	2010-04-26 15:46:55.884736000 -0600
 @@ -0,0 +1,327 @@
 +# Generated by h2py from /boot/develop/headers/be/net/netinet/in.h
 +
@@ -329,9 +428,9 @@ diff -urN Python-2.6.5/Lib/plat-haiku1/IN.py Python-2.6.5-haiku/Lib/plat-haiku1/
 +def _FDMSKNO(fd): return ((fd) / NFDBITS)
 +
 +def _FDBITNO(fd): return ((fd) % NFDBITS)
-diff -urN Python-2.6.5/Lib/plat-haiku1/regen Python-2.6.5-haiku/Lib/plat-haiku1/regen
---- Python-2.6.5/Lib/plat-haiku1/regen	1970-01-01 00:00:00.000000000 +0000
-+++ Python-2.6.5-haiku/Lib/plat-haiku1/regen	2010-03-11 16:54:31.759693312 +0000
+diff -up Python-2.6.5/Lib/plat-haiku1/regen.orig Python-2.6.5/Lib/plat-haiku1/regen
+--- Python-2.6.5/Lib/plat-haiku1/regen.orig	2010-04-26 15:46:55.886833152 -0600
++++ Python-2.6.5/Lib/plat-haiku1/regen	2010-04-26 15:46:55.887095296 -0600
 @@ -0,0 +1,7 @@
 +#! /bin/sh
 +
@@ -340,10 +439,10 @@ diff -urN Python-2.6.5/Lib/plat-haiku1/regen Python-2.6.5-haiku/Lib/plat-haiku1/
 +
 +set -v
 +python $H2PY -i '(u_long)' $HEADERS/posix/netinet/in.h
-diff -urN Python-2.6.5/Modules/resource.c Python-2.6.5-haiku/Modules/resource.c
---- Python-2.6.5/Modules/resource.c	2009-05-08 20:59:57.027000832 +0000
-+++ Python-2.6.5-haiku/Modules/resource.c	2010-03-11 16:54:31.767819776 +0000
-@@ -86,6 +86,7 @@
+diff -up Python-2.6.5/Modules/resource.c.orig Python-2.6.5/Modules/resource.c
+--- Python-2.6.5/Modules/resource.c.orig	2009-05-08 14:59:57.064225280 -0600
++++ Python-2.6.5/Modules/resource.c	2010-04-26 15:46:55.908853248 -0600
+@@ -86,6 +86,7 @@ resource_getrusage(PyObject *self, PyObj
  			PyFloat_FromDouble(doubletime(ru.ru_utime)));
  	PyStructSequence_SET_ITEM(result, 1,
  			PyFloat_FromDouble(doubletime(ru.ru_stime)));
@@ -351,7 +450,7 @@ diff -urN Python-2.6.5/Modules/resource.c Python-2.6.5-haiku/Modules/resource.c
  	PyStructSequence_SET_ITEM(result, 2, PyInt_FromLong(ru.ru_maxrss));
  	PyStructSequence_SET_ITEM(result, 3, PyInt_FromLong(ru.ru_ixrss));
  	PyStructSequence_SET_ITEM(result, 4, PyInt_FromLong(ru.ru_idrss));
-@@ -100,6 +101,7 @@
+@@ -100,6 +101,7 @@ resource_getrusage(PyObject *self, PyObj
  	PyStructSequence_SET_ITEM(result, 13, PyInt_FromLong(ru.ru_nsignals));
  	PyStructSequence_SET_ITEM(result, 14, PyInt_FromLong(ru.ru_nvcsw));
  	PyStructSequence_SET_ITEM(result, 15, PyInt_FromLong(ru.ru_nivcsw));
@@ -359,10 +458,10 @@ diff -urN Python-2.6.5/Modules/resource.c Python-2.6.5-haiku/Modules/resource.c
  
  	if (PyErr_Occurred()) {
  		Py_DECREF(result);
-diff -urN Python-2.6.5/Modules/socketmodule.c Python-2.6.5-haiku/Modules/socketmodule.c
---- Python-2.6.5/Modules/socketmodule.c	2010-02-04 20:26:34.027787264 +0000
-+++ Python-2.6.5-haiku/Modules/socketmodule.c	2010-03-11 16:54:31.778043392 +0000
-@@ -4647,7 +4647,9 @@
+diff -up Python-2.6.5/Modules/socketmodule.c.orig Python-2.6.5/Modules/socketmodule.c
+--- Python-2.6.5/Modules/socketmodule.c.orig	2010-02-04 13:26:34.065011712 -0700
++++ Python-2.6.5/Modules/socketmodule.c	2010-04-26 15:46:55.934805504 -0600
+@@ -4647,7 +4647,9 @@ init_socket(void)
  #ifndef __BEOS__
  /* We have incomplete socket support. */
  	PyModule_AddIntConstant(m, "SOCK_RAW", SOCK_RAW);
@@ -372,10 +471,10 @@ diff -urN Python-2.6.5/Modules/socketmodule.c Python-2.6.5-haiku/Modules/socketm
  #if defined(SOCK_RDM)
  	PyModule_AddIntConstant(m, "SOCK_RDM", SOCK_RDM);
  #endif
-diff -urN Python-2.6.5/Modules/socketmodule.h Python-2.6.5-haiku/Modules/socketmodule.h
---- Python-2.6.5/Modules/socketmodule.h	2008-06-14 08:36:07.027000832 +0000
-+++ Python-2.6.5-haiku/Modules/socketmodule.h	2010-03-11 16:54:31.793247744 +0000
-@@ -47,6 +47,10 @@
+diff -up Python-2.6.5/Modules/socketmodule.h.orig Python-2.6.5/Modules/socketmodule.h
+--- Python-2.6.5/Modules/socketmodule.h.orig	2008-06-14 02:36:07.063963136 -0600
++++ Python-2.6.5/Modules/socketmodule.h	2010-04-26 15:46:55.948174848 -0600
+@@ -47,6 +47,10 @@ typedef int socklen_t;
  #  undef AF_NETLINK
  #endif
  
@@ -386,10 +485,10 @@ diff -urN Python-2.6.5/Modules/socketmodule.h Python-2.6.5-haiku/Modules/socketm
  #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
  #include <bluetooth/bluetooth.h>
  #include <bluetooth/rfcomm.h>
-diff -urN Python-2.6.5/Modules/spwdmodule.c Python-2.6.5-haiku/Modules/spwdmodule.c
---- Python-2.6.5/Modules/spwdmodule.c	2008-06-09 04:58:54.003932160 +0000
-+++ Python-2.6.5-haiku/Modules/spwdmodule.c	2010-03-11 16:54:31.794820608 +0000
-@@ -79,7 +79,9 @@
+diff -up Python-2.6.5/Modules/spwdmodule.c.orig Python-2.6.5/Modules/spwdmodule.c
+--- Python-2.6.5/Modules/spwdmodule.c.orig	2008-06-08 22:58:54.041418752 -0600
++++ Python-2.6.5/Modules/spwdmodule.c	2010-04-26 15:46:55.977534976 -0600
+@@ -79,7 +79,9 @@ static PyObject *mkspent(struct spwd *p)
  
  	SETS(setIndex++, p->sp_namp);
  	SETS(setIndex++, p->sp_pwdp);
@@ -399,10 +498,10 @@ diff -urN Python-2.6.5/Modules/spwdmodule.c Python-2.6.5-haiku/Modules/spwdmodul
  	SETI(setIndex++, p->sp_min);
  	SETI(setIndex++, p->sp_max);
  	SETI(setIndex++, p->sp_warn);
-diff -urN Python-2.6.5/Modules/timemodule.c Python-2.6.5-haiku/Modules/timemodule.c
---- Python-2.6.5/Modules/timemodule.c	2008-07-05 19:19:50.055836672 +0000
-+++ Python-2.6.5-haiku/Modules/timemodule.c	2010-03-11 16:54:31.796655616 +0000
-@@ -968,11 +968,11 @@
+diff -up Python-2.6.5/Modules/timemodule.c.orig Python-2.6.5/Modules/timemodule.c
+--- Python-2.6.5/Modules/timemodule.c.orig	2008-07-05 13:19:50.026214400 -0600
++++ Python-2.6.5/Modules/timemodule.c	2010-04-26 15:46:56.001048576 -0600
+@@ -968,11 +968,11 @@ floatsleep(double secs)
  		return -1;
  	}
  	Py_END_ALLOW_THREADS
@@ -416,25 +515,37 @@ diff -urN Python-2.6.5/Modules/timemodule.c Python-2.6.5-haiku/Modules/timemodul
  		}
  
  		Py_BEGIN_ALLOW_THREADS
-diff -urN Python-2.6.5/Parser/asdl_c.py Python-2.6.5-haiku/Parser/asdl_c.py
---- Python-2.6.5/Parser/asdl_c.py	2009-12-13 00:59:01.033030144 +0000
-+++ Python-2.6.5-haiku/Parser/asdl_c.py	2010-03-11 16:54:31.798228480 +0000
+diff -up Python-2.6.5/Parser/asdl_c.py.orig Python-2.6.5/Parser/asdl_c.py
+--- Python-2.6.5/Parser/asdl_c.py.orig	2009-12-12 17:59:01.002621440 -0700
++++ Python-2.6.5/Parser/asdl_c.py	2010-04-26 15:46:56.004456448 -0600
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env python
 +#! /bin/env python
  """Generate C code from an ASDL description."""
  
  # TO DO
-diff -urN Python-2.6.5/Tools/scripts/h2py.py Python-2.6.5-haiku/Tools/scripts/h2py.py
---- Python-2.6.5/Tools/scripts/h2py.py	2004-08-09 17:27:55.039059456 +0000
-+++ Python-2.6.5-haiku/Tools/scripts/h2py.py	2010-03-11 16:54:31.805830656 +0000
+diff -up Python-2.6.5/Python/bltinmodule.c.orig Python-2.6.5/Python/bltinmodule.c
+--- Python-2.6.5/Python/bltinmodule.c.orig	2010-04-26 15:47:08.138936320 -0600
++++ Python-2.6.5/Python/bltinmodule.c	2010-04-26 15:47:23.016777216 -0600
+@@ -18,7 +18,7 @@
+ */
+ #if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T)
+ const char *Py_FileSystemDefaultEncoding = "mbcs";
+-#elif defined(__APPLE__)
++#elif defined(__APPLE__) || defined(__HAIKU__)
+ const char *Py_FileSystemDefaultEncoding = "utf-8";
+ #else
+ const char *Py_FileSystemDefaultEncoding = NULL; /* use default */
+diff -up Python-2.6.5/Tools/scripts/h2py.py.orig Python-2.6.5/Tools/scripts/h2py.py
+--- Python-2.6.5/Tools/scripts/h2py.py.orig	2004-08-09 11:27:55.006815744 -0600
++++ Python-2.6.5/Tools/scripts/h2py.py	2010-04-26 15:46:56.047710208 -0600
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env python
 +#! /bin/env python
  
  # Read #define's and translate to Python code.
  # Handle #include statements.
-@@ -50,7 +50,7 @@
+@@ -50,7 +50,7 @@ except KeyError:
          searchdirs=os.environ['INCLUDE'].split(';')
      except KeyError:
          try:
@@ -443,102 +554,3 @@ diff -urN Python-2.6.5/Tools/scripts/h2py.py Python-2.6.5-haiku/Tools/scripts/h2
                  searchdirs=os.environ['BEINCLUDES'].split(';')
              elif sys.platform.startswith("atheos"):
                  searchdirs=os.environ['C_INCLUDE_PATH'].split(':')
-diff -urN Python-2.6.5/configure.in Python-2.6.5-haiku/configure.in
---- Python-2.6.5/configure.in	2010-03-09 21:47:28.038273024 +0000
-+++ Python-2.6.5-haiku/configure.in	2010-03-11 16:54:31.812908544 +0000
-@@ -747,7 +747,7 @@
- 	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
- 	  INSTSONAME="$LDLIBRARY".$SOVERSION
-           ;;
--    Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*)
-+    Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|Haiku*)
- 	  LDLIBRARY='libpython$(VERSION).so'
- 	  BLDLIBRARY='-L. -lpython$(VERSION)'
- 	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
-@@ -825,7 +825,7 @@
- AC_SUBST(LN)
- if test -z "$LN" ; then
- 	case $ac_sys_system in
--		BeOS*) LN="ln -s";;
-+		BeOS*|Haiku*) LN="ln -s";;
- 		CYGWIN*) LN="ln -s";;
- 		atheos*) LN="ln -s";;
- 		*) LN=ln;;
-@@ -1813,7 +1813,7 @@
- 			fi
- 		fi
- 		;;
--	Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared';;
-+	Linux*|GNU*|QNX*|Haiku*) LDSHARED='$(CC) -shared';;
- 	BSD/OS*/4*) LDSHARED="gcc -shared";;
- 	FreeBSD*)
- 		if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
-@@ -1867,7 +1867,7 @@
- 		 then CCSHARED="-fPIC";
- 		 else CCSHARED="+z";
- 		 fi;;
--	Linux*|GNU*) CCSHARED="-fPIC";;
-+	Linux*|GNU*|Haiku*) CCSHARED="-fPIC";;
- 	BSD/OS*/4*) CCSHARED="-fpic";;
- 	FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";;
- 	OpenUNIX*|UnixWare*)
-@@ -1900,7 +1900,7 @@
- 	    LINKFORSHARED="-Wl,-E -Wl,+s";;
- #	    LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;
- 	BSD/OS/4*) LINKFORSHARED="-Xlinker -export-dynamic";;
--	Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";;
-+	Linux*|GNU*|Haiku*) LINKFORSHARED="-Xlinker -export-dynamic";;
- 	# -u libsys_s pulls in all symbols in libsys
- 	Darwin/*) 
- 		# -u _PyMac_Error is needed to pull in the mac toolbox glue,
-@@ -2019,6 +2019,9 @@
- BeOS*)
- AC_CHECK_LIB(net, socket, [LIBS="-lnet $LIBS"], [], $LIBS) # BeOS
- ;;
-+Haiku*)
-+AC_CHECK_LIB(network, socket, [LIBS="-lnetwork $LIBS"], [], $LIBS) # Haiku
-+;;
- esac
- 
- AC_MSG_CHECKING(for --with-libs)
-@@ -3249,7 +3252,7 @@
- AC_SUBST(LIBM)
- case $ac_sys_system in
- Darwin) ;;
--BeOS) ;;
-+BeOS|Haiku) ;;
- *) LIBM=-lm
- esac
- AC_MSG_CHECKING(for --with-libm=STRING)
-diff -urN Python-2.6.5/setup.py Python-2.6.5-haiku/setup.py
---- Python-2.6.5/setup.py	2010-03-08 07:08:25.030146560 +0000
-+++ Python-2.6.5-haiku/setup.py	2010-03-11 16:55:47.940834816 +0000
-@@ -382,6 +382,10 @@
-             inc_dirs += ['/system/include', '/atheos/autolnk/include']
-             inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
- 
-+        if platform == 'haiku1':
-+            inc_dirs += ['/boot/develop/headers/posix', '/boot/develop/headers/3rdparty', '/boot/common/include']
-+            lib_dirs += ['/boot/system/lib', '/boot/develop/lib/x86', '/boot/common/lib']
-+
-         # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb)
-         if platform in ['osf1', 'unixware7', 'openunix8']:
-             lib_dirs += ['/usr/ccs/lib']
-@@ -405,7 +409,7 @@
- 
-         # Check for MacOS X, which doesn't need libm.a at all
-         math_libs = ['m']
--        if platform in ['darwin', 'beos', 'mac']:
-+        if platform in ['darwin', 'beos', 'haiku1', 'mac']:
-             math_libs = []
- 
-         # XXX Omitted modules: gl, pure, dl, SGI-specific modules
-@@ -1068,7 +1072,7 @@
-                 missing.append('resource')
- 
-             # Sun yellow pages. Some systems have the functions in libc.
--            if (platform not in ['cygwin', 'atheos', 'qnx6'] and
-+            if (platform not in ['cygwin', 'atheos', 'qnx6', 'haiku1'] and
-                 find_file('rpcsvc/yp_prot.h', inc_dirs, []) is not None):
-                 if (self.compiler.find_library_file(lib_dirs, 'nsl')):
-                     libs = ['nsl']