diff options
| author | rillig <rillig@pkgsrc.org> | 2006-09-20 12:07:19 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2006-09-20 12:07:19 +0000 |
| commit | d0cfa8cd6bd12f5ae159780faa553b20d83f9352 (patch) | |
| tree | a77825f90b860b7f2c0fc12fce8604c8f66f508b /lang | |
| parent | db70929415096ac83dc88983c0ef58a8279c3fe4 (diff) | |
| download | pkgsrc-d0cfa8cd6bd12f5ae159780faa553b20d83f9352.tar.gz | |
libpython needs the pkgsrc-provided LDFLAGS to resolve all dependencies
at runtime. Fixes PR 34565.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/python24/distinfo | 4 | ||||
| -rw-r--r-- | lang/python24/patches/patch-af | 33 |
2 files changed, 24 insertions, 13 deletions
diff --git a/lang/python24/distinfo b/lang/python24/distinfo index eaf49eff456..9f32a8426c9 100644 --- a/lang/python24/distinfo +++ b/lang/python24/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.19 2006/06/20 13:29:01 tron Exp $ +$NetBSD: distinfo,v 1.20 2006/09/20 12:07:19 rillig Exp $ SHA1 (Python-2.4.3.tar.bz2) = d6b81e1aec0045b5acff99676f2abe303da1b384 RMD160 (Python-2.4.3.tar.bz2) = c86247554975e6c44f91d05e44e68e280d5244dc @@ -8,7 +8,7 @@ SHA1 (patch-ab) = 5402e5b8f0c8e919fdf5c2c4baab0423eb74ada5 SHA1 (patch-ac) = 97d2dcbc93986dc13d7866025269ae5f15827a24 SHA1 (patch-ad) = 44a13d3f9814d471f266ab641024ad74be046ec1 SHA1 (patch-ae) = ccf62e62129f6f09bf46bb026bfb03d131a3aa1a -SHA1 (patch-af) = 15fa49e81d2a8d05654a7ad1ab0a37b58364ec3d +SHA1 (patch-af) = cf066348c706c6a778e7dbd8d123b51b6772c40e SHA1 (patch-ag) = 0cdc08af9d37ae7d00a06ab81c30efa021ef28ac SHA1 (patch-ah) = 8d56adee024b29e5d538a9fcd1994e38eb2b33c1 SHA1 (patch-ai) = 6435c5a7269c14d94eab6fb9777b9d059507e7b8 diff --git a/lang/python24/patches/patch-af b/lang/python24/patches/patch-af index be910fa2d29..67543f68df5 100644 --- a/lang/python24/patches/patch-af +++ b/lang/python24/patches/patch-af @@ -1,7 +1,7 @@ -$NetBSD: patch-af,v 1.5 2006/01/23 08:00:02 recht Exp $ +$NetBSD: patch-af,v 1.6 2006/09/20 12:07:19 rillig Exp $ ---- Makefile.pre.in.orig 2005-12-11 23:02:31.000000000 +0100 -+++ Makefile.pre.in 2005-12-11 23:02:02.000000000 +0100 +--- Makefile.pre.in.orig 2006-03-13 14:08:41.000000000 +0100 ++++ Makefile.pre.in 2006-09-20 12:51:11.139973424 +0200 @@ -30,6 +30,7 @@ CC= @CC@ @@ -41,17 +41,28 @@ $NetBSD: patch-af,v 1.5 2006/01/23 08:00:02 recht Exp $ platform: $(BUILDPYTHON) $(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform -@@ -360,6 +360,10 @@ - libpython$(VERSION).sl: $(LIBRARY_OBJS) - $(LDSHARED) -o $@ $(LIBRARY_OBJS) $(LIBC) $(LIBM) +@@ -351,14 +351,18 @@ -+libpython2.4.2.dylib: $(LIBRARY_OBJS) -+ $(LINKCC) -dynamiclib -install_name $(LIBDIR)/$@ -current_version 2.4.2 -compatibility_version 2.4 -o $@ -flat_namespace -undefined suppress $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) + 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) $(LDFLAGS) $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \ + $(LN) -f $(INSTSONAME) $@; \ + else\ +- $(LDSHARED) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \ ++ $(LDSHARED) -o $@ $(LDFLAGS) $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \ + fi + + libpython$(VERSION).sl: $(LIBRARY_OBJS) +- $(LDSHARED) -o $@ $(LIBRARY_OBJS) $(LIBC) $(LIBM) ++ $(LDSHARED) -o $@ $(LDFLAGS) $(LIBRARY_OBJS) $(LIBC) $(LIBM) + ++libpython2.4.2.dylib: $(LIBRARY_OBJS) ++ $(LINKCC) -dynamiclib -install_name $(LIBDIR)/$@ -current_version 2.4.2 -compatibility_version 2.4 -o $@ -flat_namespace -undefined suppress $(LDFLAGS) $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) + + # 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. @@ -437,8 +441,8 @@ -DVPATH='"$(VPATH)"' \ -o $@ $(srcdir)/Modules/getpath.c @@ -72,7 +83,7 @@ $NetBSD: patch-af,v 1.5 2006/01/23 08:00:02 recht Exp $ ###################################################################### -@@ -625,7 +629,12 @@ +@@ -629,7 +633,12 @@ (cd $(DESTDIR)$(LIBDIR); $(LN) -sf $(INSTSONAME) libpython$(VERSION)$(SO)); \ fi \ fi; \ @@ -86,7 +97,7 @@ $NetBSD: patch-af,v 1.5 2006/01/23 08:00:02 recht Exp $ fi # Install the manual page -@@ -788,7 +797,7 @@ +@@ -792,7 +801,7 @@ fi; \ fi $(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c |