[csw-devel] SF.net SVN: gar:[10115] csw/mgar/pkg/file/trunk

[wahwah at users.sourceforge.net]

Revision: 10115
          http://gar.svn.sourceforge.net/gar/?rev=10115&view=rev
Author:   wahwah
Date:     2010-06-07 21:17:21 +0000 (Mon, 07 Jun 2010)

Log Message:
-----------
file: Adding a patch to build the Python extension.

Modified Paths:
--------------
    csw/mgar/pkg/file/trunk/Makefile
    csw/mgar/pkg/file/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/file/trunk/files/0002-CSW-runpath.patch

Modified: csw/mgar/pkg/file/trunk/Makefile
===================================================================
--- csw/mgar/pkg/file/trunk/Makefile	2010-06-07 21:10:59 UTC (rev 10114)
+++ csw/mgar/pkg/file/trunk/Makefile	2010-06-07 21:17:21 UTC (rev 10115)
@@ -1,3 +1,5 @@
+# $Id$
+
 GARNAME = file
 GARVERSION = 5.04
 CATEGORIES = utils
@@ -18,7 +20,8 @@
 # These flags are not understood by Sun Studio
 CONFIGURE_ARGS += --disable-warnings
 TEST_TARGET = check
-PATCHFILES = 0001-libtool-dir-used-for-linking.patch
+PATCHFILES += 0001-libtool-dir-used-for-linking.patch
+PATCHFILES += 0002-CSW-runpath.patch
 PACKAGES = CSWfile CSWlibmagic CSWpy-libmagic
 PKGFILES_CSWlibmagic = $(PKGFILES_RT)
 PKGFILES_CSWpy-libmagic = /opt/csw/lib/python.*

Modified: csw/mgar/pkg/file/trunk/checksums
===================================================================
--- csw/mgar/pkg/file/trunk/checksums	2010-06-07 21:10:59 UTC (rev 10114)
+++ csw/mgar/pkg/file/trunk/checksums	2010-06-07 21:17:21 UTC (rev 10115)
@@ -1,2 +1,3 @@
 80e221ff50866a635483cc4f03773d94  0001-libtool-dir-used-for-linking.patch
+58e076108156a426d88c53b05d422673  0002-CSW-runpath.patch
 accade81ff1cc774904b47c72c8aeea0  file-5.04.tar.gz

Added: csw/mgar/pkg/file/trunk/files/0002-CSW-runpath.patch
===================================================================
--- csw/mgar/pkg/file/trunk/files/0002-CSW-runpath.patch	                        (rev 0)
+++ csw/mgar/pkg/file/trunk/files/0002-CSW-runpath.patch	2010-06-07 21:17:21 UTC (rev 10115)
@@ -0,0 +1,28 @@
+From 19ff890df2c01f4c0fa2f606017ff2ab421240c9 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Mon, 7 Jun 2010 21:25:39 +0200
+Subject: [PATCH] CSW runpath
+
+---
+ python/setup.py |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/python/setup.py b/python/setup.py
+index 71074c3..086211e 100644
+--- a/python/setup.py
++++ b/python/setup.py
+@@ -3,8 +3,9 @@ from distutils.core import setup, Extension
+ 
+ magic_module = Extension('magic',
+     libraries = ['magic'],
+-    library_dirs = ['./','../','../src','../src/.libs','/usr/lib/'],
+-    include_dirs = ['./','../','../src','/usr/include/'],
++    library_dirs = ['./','../','../src','../src/.libs','/usr/lib/','/opt/csw/lib'],
++    include_dirs = ['./','../','../src','/usr/include/','/opt/csw/include'],
++    runtime_library_dirs = ['/opt/csw/lib'],
+     sources = ['py_magic.c'])
+ 
+ setup (name = 'Magic file extensions',
+-- 
+1.7.1
+


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