Package: llvm-py
Version: 0.5+svn85-1
Tags: patch
User: [email protected]
Usertags: origin-ubuntu maverick ubuntu-patch

[requires 0.6, not yet in unstable]

starting with llvm-2.7, the llvm package builds a shared llvm library. please link against it instead of using the static libs.

diff -Nru llvm-py-0.5+svn85/debian/control llvm-py-0.6/debian/control
--- llvm-py-0.5+svn85/debian/control	2010-09-18 11:24:14.000000000 +0000
+++ llvm-py-0.6/debian/control	2010-09-18 11:24:14.000000000 +0000
@@ -4,7 +4,7 @@
 Priority: optional
 Maintainer: Carl Chenet <[email protected]>
 Uploaders: Debian Python Modules Team <[email protected]>,
-Build-Depends: debhelper (>= 7.0.50~), python (>= 2.4), python-all-dev, python-all-dbg, python-support, llvm (>= 2.6), llvm-dev (>= 2.6)
+Build-Depends: debhelper (>= 7.0.50~), python (>= 2.4), python-all-dev, python-all-dbg, python-support, llvm-2.7, llvm-2.7-dev
 Standards-Version: 3.8.3
 Homepage: http://mdevan.nfshost.com/llvm-py/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/llvm-py/trunk/
diff -Nru llvm-py-0.5+svn85/debian/rules llvm-py-0.6/debian/rules
--- llvm-py-0.5+svn85/debian/rules	2010-09-18 11:24:14.000000000 +0000
+++ llvm-py-0.6/debian/rules	2010-09-18 11:24:14.000000000 +0000
@@ -2,6 +2,8 @@
 %:
 	dh $@
 
+#--llvm-config=llvm-config-2.7
+
 override_dh_strip:
 	dh_strip --dbg-package=python-llvm-dbg
 
diff -Nru llvm-py-0.5+svn85/setup.py llvm-py-0.6/setup.py
--- llvm-py-0.5+svn85/setup.py	2009-09-20 09:08:34.000000000 +0000
+++ llvm-py-0.6/setup.py	2010-09-18 11:24:14.000000000 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2008, Mahadevan R All rights reserved.
+# Copyright (c) 2008-10, Mahadevan R All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -44,18 +44,21 @@
     libs = []
     objs = []
     for part in parts:
+        if part.startswith('-lLLVM'):
+            continue
         if part.startswith('-l'):
             libs.append(part[2:])
         elif part.endswith('.o'):
 #            objs.append(part[:-2])
             objs.append(part) # eh, looks like we need the .o after all
+    libs.append('LLVM-2.7')
     return (libs, objs)
 
 
 def get_llvm_config():
 
     # get from command-line, or use default
-    lc = 'llvm-config'
+    lc = 'llvm-config-2.7'
     i = 0
     while i < len(sys.argv):
         arg = sys.argv[i]

Reply via email to