[csw-devel] SF.net SVN: gar:[20073] csw/mgar/pkg/lang-python/python/trunk/Makefile

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Thu Jan 10 14:02:52 CET 2013


Revision: 20073
          http://gar.svn.sourceforge.net/gar/?rev=20073&view=rev
Author:   wahwah
Date:     2013-01-10 13:02:52 +0000 (Thu, 10 Jan 2013)
Log Message:
-----------
lang-python/python/trunk: fix https://www.opencsw.org/mantis/view.php?id=5040

Modified Paths:
--------------
    csw/mgar/pkg/lang-python/python/trunk/Makefile

Modified: csw/mgar/pkg/lang-python/python/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/python/trunk/Makefile	2013-01-10 12:24:33 UTC (rev 20072)
+++ csw/mgar/pkg/lang-python/python/trunk/Makefile	2013-01-10 13:02:52 UTC (rev 20073)
@@ -2,7 +2,6 @@
 
 NAME = Python
 VERSION = 2.6.8
-GARTYPE = v2
 VER = 2.6
 DVER = 2-6
 UVER = 2_6
@@ -35,22 +34,8 @@
 UFILES_REGEX = $(VER)\.\d+
 
 DISTFILES  = $(DISTNAME).tar.bz2
+DISTFILES += pyport.h
 
-# There is a segfault happening on Solaris 9 i386. I'm disabling the Solaris
-# 9 until we debug it or the upstream fixes it.
-# PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386
-# Some features are missing on Solaris 9, e.g. functionality required for the
-# multiprocessing support.
-# http://osdir.com/ml/opensolaris-discuss/2009-07/msg00865.html
-# http://bugs.python.org/issue3770
-# However, this bug is about better detection of SEM_VALUE_MAX in Solaris
-# http://bugs.python.org/issue3110
-
-# There are header differences between Solaris 9 and 10. Programs that include
-# pyconfig.h from Solaris 9 installed on Solaris 10 can get wrong settings,
-# e.g. wrt _X_OPEN_SOURCE.
-PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
-
 # Patches
 PATCHFILES += faqwiz.diff
 PATCHFILES += makesetup.diff
@@ -94,6 +79,17 @@
 BASECFLAGS = $(CFLAGS)
 EXTRA_COMMON_EXPORTS = BASECFLAGS
 
+# To fix https://www.opencsw.org/mantis/view.php?id=5040
+LINKER_IGNORE =
+CHECKPKG_OVERRIDES_CSWpython-tk += soname-unused|libX11.so.4|is|needed|by|/opt/csw/lib/python/lib-dynload/_tkinter.so|but|never|used
+CHECKPKG_OVERRIDES_CSWpython-tk += no-direct-binding|/opt/csw/lib/python/lib-dynload/_tkinter.so|is|not|directly|bound|to|soname|libX11.so.4
+CHECKPKG_OVERRIDES_CSWpython += soname-unused|libcurses.so.1|is|needed|by|/opt/csw/lib/python/lib-dynload/_curses_panel.so|but|never|used
+CHECKPKG_OVERRIDES_CSWpython += soname-unused|libncursesw.so.5|is|needed|by|/opt/csw/lib/python/lib-dynload/_curses_panel.so|but|never|used
+CHECKPKG_OVERRIDES_CSWpython += no-direct-binding|/opt/csw/lib/python/lib-dynload/_curses_panel.so|is|not|directly|bound|to|soname|libncursesw.so.5
+CHECKPKG_OVERRIDES_CSWpython += no-direct-binding|/opt/csw/lib/python/lib-dynload/_curses_panel.so|is|not|directly|bound|to|soname|libcurses.so.1
+CHECKPKG_OVERRIDES_CSWpython += soname-unused|libssl.so.1.0.0|is|needed|by|/opt/csw/lib/python/lib-dynload/_hashlib.so|but|never|used
+CHECKPKG_OVERRIDES_CSWpython += no-direct-binding|/opt/csw/lib/python/lib-dynload/_hashlib.so|is|not|directly|bound|to|soname|libssl.so.1.0.0
+
 NOISALIST = 1
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-shared
@@ -218,7 +214,11 @@
 	@$(MAKECOOKIE)
 
 post-merge-modulated:
-	echo "This is post-merge-modulated, which should not work. But it does."
+	# Some checks
+	# Prevent things like https://www.opencsw.org/mantis/view.php?id=5040
+	test ! -f $(PKGROOT)/opt/csw/lib/python/lib-dynload/_socket_failed.so
+	test -f $(PKGROOT)/opt/csw/lib/python/lib-dynload/_socket.so
+	# This is post-merge-modulated, which should not work. But it does.
 	ginstall -m 755 -d $(PKGROOT)$(includedir)/python$(VER)
-	ginstall -m 644 $(FILEDIR)/pyport.h $(PKGROOT)$(includedir)/python$(VER)/pyport.h
+	ginstall -m 644 $(WORKDIR)/pyport.h $(PKGROOT)$(includedir)/python$(VER)/pyport.h
 	@$(MAKECOOKIE)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list