From e9baf2c7024cf3d40e78af0cc44c1ef9313ffd07 Mon Sep 17 00:00:00 2001
From: dmcmahill <dmcmahill@pkgsrc.org>
Date: Mon, 7 Mar 2005 12:11:49 +0000
Subject: add LDFLAGS when linking libpython.  Needed to find -ldb4

---
 lang/python23/distinfo         |  4 ++--
 lang/python23/patches/patch-ah | 33 ++++++++++++++++++---------------
 2 files changed, 20 insertions(+), 17 deletions(-)

(limited to 'lang/python23')

diff --git a/lang/python23/distinfo b/lang/python23/distinfo
index 6ad0734887f..eb6227ef85b 100644
--- a/lang/python23/distinfo
+++ b/lang/python23/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2005/02/24 09:03:11 agc Exp $
+$NetBSD: distinfo,v 1.28 2005/03/07 12:11:49 dmcmahill Exp $
 
 SHA1 (Python-2.3.5.tgz) = 2729d068f5d1abe7b743f32012d4f7c4b0508a3c
 RMD160 (Python-2.3.5.tgz) = 2104a393ca7c91b72b990ced53a0da752ccf42ef
@@ -8,7 +8,7 @@ SHA1 (patch-ab) = 111d7fa8adbb7001bacad36e3bdbe23ae6ce8b9b
 SHA1 (patch-ad) = c8f6ea08e68dae3bd9ad639c38e74cf654c0b41e
 SHA1 (patch-ae) = 3dcf150147333342b333871b41fe6fa92bced2d9
 SHA1 (patch-af) = d23d42d5d5fc31aeaf1fca89448873cc4179ccf6
-SHA1 (patch-ah) = da362d3e2e46077c3177796f0c926661b0f751d4
+SHA1 (patch-ah) = 6740fb09c3a1fca8cd25642a683d65d6d66760f8
 SHA1 (patch-al) = 77ccdc4d9ef11b955db44680d4a0b572a49cea7a
 SHA1 (patch-am) = df5c858b32a9a5aa118c84f6742f9d3547c0c7f3
 SHA1 (patch-bb) = 7c6fe21b6328dddce2a079b0a1c7ae0bee817bae
diff --git a/lang/python23/patches/patch-ah b/lang/python23/patches/patch-ah
index e013b540ae1..6ca5dc28cc8 100644
--- a/lang/python23/patches/patch-ah
+++ b/lang/python23/patches/patch-ah
@@ -1,27 +1,33 @@
-$NetBSD: patch-ah,v 1.5 2005/02/15 12:25:07 drochner Exp $
+$NetBSD: patch-ah,v 1.6 2005/03/07 12:11:49 dmcmahill Exp $
 
---- Makefile.pre.in.orig	2005-01-11 14:48:52.000000000 +0100
-+++ Makefile.pre.in
-@@ -56,7 +56,7 @@ MAKESETUP=      $(srcdir)/Modules/makese
- OPT=		@OPT@
+--- Makefile.pre.in.orig	2005-01-11 08:48:52.000000000 -0500
++++ Makefile.pre.in	2005-03-07 06:41:33.425152000 -0500
+@@ -57,5 +57,5 @@
  BASECFLAGS=	@BASECFLAGS@
  CFLAGS=		$(BASECFLAGS) $(OPT)
 -CPPFLAGS=	-I. -I$(srcdir)/Include
 +CPPFLAGS+=	@CPPFLAGS@ -I. -I$(srcdir)/Include
  LDFLAGS=	@LDFLAGS@
  LDLAST=		@LDLAST@
- SGI_ABI=	@SGI_ABI@
-@@ -308,7 +308,7 @@ all:		$(BUILDPYTHON) oldsharedmods share
- $(BUILDPYTHON):	Modules/$(MAINOBJ) $(LIBRARY) $(LDLIBRARY)
+@@ -309,5 +309,5 @@
  		$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
  			Modules/$(MAINOBJ) \
 -			$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
 +			$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) ${LINK_ALL_LIBGCC_HACK}
  
  platform: $(BUILDPYTHON)
- 	$(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
-@@ -357,6 +357,9 @@ libpython$(VERSION).so: $(LIBRARY_OBJS)
- libpython$(VERSION).sl: $(LIBRARY_OBJS)
+@@ -349,8 +349,8 @@
+ libpython$(VERSION).so: $(LIBRARY_OBJS)
+ 	if test $(INSTSONAME) != $(LDLIBRARY); then \
+-		$(LDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \
++		$(LDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(LDFLAGS) $(SHLIBS) $(LIBC) $(LIBM); \
+ 		$(LN) -f $(INSTSONAME) $@; \
+ 	else\
+-		$(LDSHARED) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \
++		$(LDSHARED) -o $@ $(LIBRARY_OBJS) $(LDFLAGS) $(SHLIBS) $(LIBC) $(LIBM); \
+ 	fi
+ 
+@@ -358,4 +358,7 @@
  	$(LDSHARED) -o $@ $(LIBRARY_OBJS) $(LIBC) $(LIBM)
  
 +libpython$(VERSION).dylib: $(LIBRARY_OBJS)
@@ -29,9 +35,7 @@ $NetBSD: patch-ah,v 1.5 2005/02/15 12:25:07 drochner Exp $
 +
  # This rule is here for OPENSTEP/Rhapsody/MacOSX. It builds a temporary
  # minimal framework (not including the Lib directory and such) in the current
- # directory.
-@@ -616,7 +619,12 @@ altbininstall:	$(BUILDPYTHON)
- 				(cd $(DESTDIR)$(LIBDIR); $(LN) -sf $(INSTSONAME) libpython$(VERSION)$(SO)); \
+@@ -617,5 +620,10 @@
  			fi \
  		fi; \
 -	else	true; \
@@ -43,4 +47,3 @@ $NetBSD: patch-ah,v 1.5 2005/02/15 12:25:07 drochner Exp $
 +		fi \
  	fi
  
- # Install the manual page
-- 
cgit v1.2.3