Darwin build fixes:

- ignore poll()
- needs dlopen.buildlink3.mk
- pass -fPIC -fno-common to CC for objects being linked into a shared
  library

3 files changed, 25 insertions, 14 deletions

diff --git a/lang/python24/Makefile.common b/lang/python24/Makefile.common
index 81a29306358..b3d43d9ab69 100644
--- a/lang/python24/Makefile.common
+++ b/lang/python24/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2004/12/05 23:27:28 recht Exp $
+# $NetBSD: Makefile.common,v 1.2 2004/12/19 05:30:14 grant Exp $
 #
 
 DISTNAME=	Python-2.4
@@ -66,9 +66,11 @@ EXTRA_SO_SUBST=
 PLIST_SUBST+=	EXTRA_SO=${EXTRA_SO_SUBST}
 PLIST_SUBST+=	OSSAUDIODEV=${OSSAUDIODEV_SUBST}
 
-# Make sure python modules can link correctly
 .if ${OPSYS} == "Darwin"
+# Make sure python modules can link correctly
 INSTALL_UNSTRIPPED=	yes
+# newer Darwin has poll() but not poll.h, so explicitly ignore poll().
+CONFIGURE_ENV+=		ac_cv_func_poll=no
 .endif
 
 .if ${OPSYS} == "IRIX"
@@ -105,5 +107,6 @@ post-extract:
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/ossaudio.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/python24/distinfo b/lang/python24/distinfo
index 73addd44155..e7c6e6bcb08 100644
--- a/lang/python24/distinfo
+++ b/lang/python24/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/12/05 23:27:45 recht Exp $
+$NetBSD: distinfo,v 1.2 2004/12/19 05:30:14 grant Exp $
 
 SHA1 (Python-2.4.tar.bz2) = 80c06f491a4b2a629e868540150faf22c5d0e41e
 Size (Python-2.4.tar.bz2) = 7840762 bytes
@@ -13,5 +13,5 @@ SHA1 (patch-ah) = 6f5cff1f9f2482c59ef442bf019a1f3ad9fe21e8
 SHA1 (patch-ai) = 6435c5a7269c14d94eab6fb9777b9d059507e7b8
 SHA1 (patch-aj) = e471737ade95423039661b475f2dd0fc27aa9dac
 SHA1 (patch-ak) = f2e1d4087a94490bd3589a8c829ec72e04f31f72
-SHA1 (patch-al) = 2339f32554e13b24fe14a072665422b6e66ed0f8
+SHA1 (patch-al) = bd37238a62dc9a0f99b95aaac8de622a28919761
 SHA1 (patch-am) = aa71ec2f9cc8f434ff38b19df23b5dd433e13e5a
diff --git a/lang/python24/patches/patch-al b/lang/python24/patches/patch-al
index a9ef098e5fe..b06990f094d 100644
--- a/lang/python24/patches/patch-al
+++ b/lang/python24/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.1.1.1 2004/12/05 23:27:51 recht Exp $
+$NetBSD: patch-al,v 1.2 2004/12/19 05:30:14 grant Exp $
 
---- configure.orig	Sun Dec  5 22:09:59 2004
-+++ configure	Sun Dec  5 22:12:25 2004
-@@ -1479,6 +1479,8 @@
+--- configure.orig	2004-11-07 12:24:12.000000000 +1100
++++ configure
+@@ -1479,6 +1479,8 @@ case $ac_sys_system/$ac_sys_release in
    # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
    OpenBSD/2.* | OpenBSD/3.[0123456])
      define_xopen_source=no;;
@@ -11,7 +11,7 @@ $NetBSD: patch-al,v 1.1.1.1 2004/12/05 23:27:51 recht Exp $
    # On Solaris 2.6, sys/wait.h is inconsistent in the usage
    # of union __?sigval. Reported by Stuart Bishop.
    SunOS/5.6)
-@@ -3418,6 +3420,14 @@
+@@ -3418,6 +3420,14 @@ _ACEOF
  	  BLDLIBRARY='-L. -lpython$(VERSION)'
  	  RUNSHARED=DLL_PATH=`pwd`:${DLL_PATH:-/atheos/sys/libs:/atheos/autolnk/lib}
  	  ;;
@@ -26,7 +26,7 @@ $NetBSD: patch-al,v 1.1.1.1 2004/12/05 23:27:51 recht Exp $
    esac
  else # shared is disabled
    case $ac_sys_system in
-@@ -3816,7 +3826,12 @@
+@@ -3816,7 +3826,12 @@ echo "${ECHO_T}$ac_cv_no_strict_aliasing
  	    ;;
  	# is there any other compiler on Darwin besides gcc?
  	Darwin*)
@@ -40,7 +40,7 @@ $NetBSD: patch-al,v 1.1.1.1 2004/12/05 23:27:51 recht Exp $
  	    ;;
      esac
      ;;
-@@ -10295,7 +10310,7 @@
+@@ -10295,7 +10310,7 @@ then
  			LDSHARED="$LDSHARED "'-Wl,-F$(PYTHONFRAMEWORKPREFIX) -framework $(PYTHONFRAMEWORK)'
  		else
  			# No framework. Ignore undefined symbols, assuming they come from Python
@@ -49,7 +49,7 @@ $NetBSD: patch-al,v 1.1.1.1 2004/12/05 23:27:51 recht Exp $
  		fi ;;
  	Darwin/1.4*|Darwin/5.*|Darwin/6.*)
  		LDSHARED='$(CC) $(LDFLAGS) -bundle'
-@@ -10305,8 +10320,8 @@
+@@ -10305,8 +10320,8 @@ then
  			LDSHARED="$LDSHARED "'-Wl,-F$(PYTHONFRAMEWORKPREFIX) -framework $(PYTHONFRAMEWORK)'
  		else
  			# No framework, use the Python app as bundle-loader
@@ -60,7 +60,7 @@ $NetBSD: patch-al,v 1.1.1.1 2004/12/05 23:27:51 recht Exp $
  		fi ;;
  	Darwin/*)
  		# Use -undefined dynamic_lookup whenever possible (10.3 and later).
-@@ -10324,8 +10339,8 @@
+@@ -10324,8 +10339,8 @@ then
  				LDSHARED="$LDSHARED "'-Wl,-F$(PYTHONFRAMEWORKPREFIX) -framework $(PYTHONFRAMEWORK)'
  			else
  				# No framework, use the Python app as bundle-loader
@@ -71,7 +71,15 @@ $NetBSD: patch-al,v 1.1.1.1 2004/12/05 23:27:51 recht Exp $
  			fi
  		fi
  		;;
-@@ -14297,6 +14312,7 @@
+@@ -10370,6 +10385,7 @@ then
+ 		 fi;;
+ 	Linux*|GNU*) CCSHARED="-fPIC";;
+ 	BSD/OS*/4*) CCSHARED="-fpic";;
++	Darwin/7*) CCSHARED="-fPIC -fno-common";;
+ 	FreeBSD*|NetBSD*|OpenBSD*) CCSHARED="-fPIC";;
+ 	OpenUNIX*|UnixWare*)
+ 		if test "$GCC" = "yes"
+@@ -14297,6 +14313,7 @@ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
  #include "confdefs.h"