[csw-devel] SF.net SVN: gar:[20091] csw/mgar/pkg/lang-python/python/branches/python-3.3 /Makefile

[wahwah at users.sourceforge.net]

Revision: 20091
          http://gar.svn.sourceforge.net/gar/?rev=20091&view=rev
Author:   wahwah
Date:     2013-01-11 22:33:30 +0000 (Fri, 11 Jan 2013)
Log Message:
-----------
lang-python/python/branches/python-3.3: sort out the libffi linking issue

Modified Paths:
--------------
    csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile

Modified: csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile	2013-01-11 22:33:08 UTC (rev 20090)
+++ csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile	2013-01-11 22:33:30 UTC (rev 20091)
@@ -31,6 +31,7 @@
 
 MASTER_SITES = http://python.org/ftp/python/$(VERSION)/
 UPSTREAM_MASTER_SITES = http://python.org/ftp/python/
+UFILES_REGEX = $(VER)\.\d+
 
 DISTFILES  = $(DISTNAME).tar.bz2
 
@@ -54,7 +55,7 @@
 # pkgchk -L CSWlibffi-dev
 # (...)
 # /opt/csw/lib/ffi/libffi.so=../libffi.so.5.0.10 s none CSWlibffi-dev
-EXTRA_LIB += $(libdir)/ffi
+# EXTRA_LINKER_FLAGS += $(libdir)/ffi
 
 # BASECFLAGS = $(CFLAGS)
 BASECFLAGS = -g -O2
@@ -99,9 +100,6 @@
 SPKG_DESC_CSWpython$(CVER)       = A high-level scripting language, $(VER) series
 INCOMPATIBLE_PKGS_CSWpython$(CVER) = CSWpydistutils
 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibbz2-1-0
-# This seems to be an issue with the 64-bit build. The 32-bit binaries link
-# against libffi5, the 64-bit binaries link against libffi4.
-RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibffi4
 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibffi5
 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibgdbm4
@@ -208,3 +206,5 @@
 GARCOMPILER = GNU
 
 include gar/category.mk
+
+LINKER_FLAGS := -L$(libdir)/ffi $(LINKER_FLAGS)

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