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

[wahwah at users.sourceforge.net]

Revision: 9837
          http://gar.svn.sourceforge.net/gar/?rev=9837&view=rev
Author:   wahwah
Date:     2010-05-08 06:54:53 +0000 (Sat, 08 May 2010)

Log Message:
-----------
file: Splitting off libmagic and creating a Python extension: py_libmagic

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

Added Paths:
-----------
    csw/mgar/pkg/file/trunk/files/0001-libtool-dir-used-for-linking.patch

Modified: csw/mgar/pkg/file/trunk/Makefile
===================================================================
--- csw/mgar/pkg/file/trunk/Makefile	2010-05-08 06:53:03 UTC (rev 9836)
+++ csw/mgar/pkg/file/trunk/Makefile	2010-05-08 06:54:53 UTC (rev 9837)
@@ -18,15 +18,15 @@
 # These flags are not understood by Sun Studio
 CONFIGURE_ARGS += --disable-warnings
 TEST_TARGET = check
-PACKAGES = CSWfile CSWlibmagic CSWpy-magic
+PATCHFILES = 0001-libtool-dir-used-for-linking.patch
+PACKAGES = CSWfile CSWlibmagic CSWpy-libmagic
 PKGFILES_CSWlibmagic = $(PKGFILES_RT)
-PKGFILES_CSWpy-magic = later
+PKGFILES_CSWpy-libmagic = /opt/csw/lib/python.*
 SPKG_DESC_CSWfile = A file type guesser
 SPKG_DESC_CSWlibmagic = The library behind file(1)
-SPKG_DESC_CSWpy-magic = Python wrapper for libmagic
-CATALOGNAME_CSWpy-magic = py_magic
+SPKG_DESC_CSWpy-libmagic = Python extension for libmagic
+CATALOGNAME_CSWpy-libmagic = py_libmagic
 RUNTIME_DEP_PKGS_CSWfile += CSWlibmagic
-ARCHALL_CSWpy-magic = 1
 RUNTIME_DEP_PKGS_CSWfile += CSWzlib
 RUNTIME_DEP_PKGS_CSWlibmagic += CSWzlib
 
@@ -35,14 +35,19 @@
 # newly built "file".
 IGNORE_DESTDIR = 1
 
+# Doesn't hurt to have this on.
+DISTUTILS_DEBUG = 1
+export DISTUTILS_DEBUG
+
 include gar/category.mk
 
-post-build-modulated-disabled:
+post-build-modulated:
 	# This fails for a mysterious reason.  Can't find libmagic (-lmagic).
+	# (cd $(WORKSRC)/python && python setup.py build --compiler=unix)
 	(cd $(WORKSRC)/python && python setup.py build)
 	@$(MAKECOOKIE)
 
 post-install-modulated:
 	(cd $(WORKSRC)/python && \
-		python setup.py install)
+		python setup.py install --root=$(DESTDIR) --prefix=$(prefix))
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/file/trunk/checksums
===================================================================
--- csw/mgar/pkg/file/trunk/checksums	2010-05-08 06:53:03 UTC (rev 9836)
+++ csw/mgar/pkg/file/trunk/checksums	2010-05-08 06:54:53 UTC (rev 9837)
@@ -1 +1,2 @@
+80e221ff50866a635483cc4f03773d94  0001-libtool-dir-used-for-linking.patch
 accade81ff1cc774904b47c72c8aeea0  file-5.04.tar.gz

Added: csw/mgar/pkg/file/trunk/files/0001-libtool-dir-used-for-linking.patch
===================================================================
--- csw/mgar/pkg/file/trunk/files/0001-libtool-dir-used-for-linking.patch	                        (rev 0)
+++ csw/mgar/pkg/file/trunk/files/0001-libtool-dir-used-for-linking.patch	2010-05-08 06:54:53 UTC (rev 9837)
@@ -0,0 +1,25 @@
+From 071f0c1b11cf21628aa3ec8c092cfd050a11e9d9 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Sat, 8 May 2010 08:47:26 +0200
+Subject: [PATCH] libtool dir used for linking
+
+---
+ python/setup.py |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/python/setup.py b/python/setup.py
+index 7c86194..71074c3 100644
+--- a/python/setup.py
++++ b/python/setup.py
+@@ -3,7 +3,7 @@ from distutils.core import setup, Extension
+ 
+ magic_module = Extension('magic',
+     libraries = ['magic'],
+-    library_dirs = ['./','../','../src','/usr/lib/'],
++    library_dirs = ['./','../','../src','../src/.libs','/usr/lib/'],
+     include_dirs = ['./','../','../src','/usr/include/'],
+     sources = ['py_magic.c'])
+ 
+-- 
+1.7.0
+


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