Package: luabind
Version: 0.9.1+dfsg-3
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch



*** /tmp/tmpoECTw2
In Ubuntu, the attached patch was applied to use mutliarch location of lua libs.
When Debian will update the lua package to use multiarch location, you probably 
will need this type of patch to fix a FTBFS.

Changelog :

  * debian/rules:
   - Export DEB_HOST_MULTIARCH to detect multiarch location.
  * debian/patches:
   - 04_multiarch.patch: Update libraries location to use multiarch.
     (LP: #831066)


Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers oneiric-updates
  APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500, 
'oneiric')
Architecture: amd64 (x86_64)

Kernel: Linux 3.0.0-10-generic (SMP w/8 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
--- luabind-0.9.1+dfsg/debian/patches/04_multiarch.patch	2011-09-14 00:00:03.000000000 +0200
+++ luabind-0.9.1+dfsg/debian/patches/04_multiarch.patch	2011-09-14 00:15:59.000000000 +0200
@@ -1,13 +1,21 @@
 Index: luabind-0.9.1+dfsg/Jamroot
 ===================================================================
---- luabind-0.9.1+dfsg.orig/Jamroot	2011-09-13 23:59:48.000000000 +0200
-+++ luabind-0.9.1+dfsg/Jamroot	2011-09-13 23:59:59.000000000 +0200
-@@ -86,7 +86,7 @@
-     local names = liblua5.1 liblua51 liblua ;
-     local extensions = .a .so ;
+--- luabind-0.9.1+dfsg.orig/Jamroot	2011-09-14 00:15:05.000000000 +0200
++++ luabind-0.9.1+dfsg/Jamroot	2011-09-14 00:15:55.000000000 +0200
+@@ -59,6 +59,7 @@
+ {
+     LUA_PATH = [ os.environ LUA_PATH ] ;
+     HOME = [ os.environ HOME ] ;
++    MULTIARCH = [ os.environ DEB_HOST_MULTIARCH ] ;
+ 
+     local possible-prefixes =
+         $(LUA_PATH) $(HOME)/Library/Frameworks /Library/Frameworks /usr /usr/local /opt/local /opt ;
+@@ -81,7 +82,7 @@
+         prefix = $(prefix:D) ;
+     }
  
--    library = [ GLOB $(lib)/lua51 $(lib)/lua5.1 $(lib)/lua $(lib) :
-+    library = [ GLOB $(lib)/lua51 $(lib)/lua5.1 $(lib)/lua $(lib) $(biarch_suffix)/lua51 $(biarch_suffix)/lua5.1 $(biarch_suffix)/lua $(biarch_suffix):
-         $(names)$(extensions) ] ;
-     lib-name = [ MATCH "lib(.*)" : $(library[1]:B) ] ;
+-    local lib = $(prefix)/lib ;
++    local lib = $(prefix)/lib/$(MULTIARCH) ;
  
+     local names = liblua5.1 liblua51 liblua ;
+     local extensions = .a .so ;
diff -Nru luabind-0.9.1+dfsg/debian/rules luabind-0.9.1+dfsg/debian/rules
--- luabind-0.9.1+dfsg/debian/rules	2011-06-14 22:51:28.000000000 +0200
+++ luabind-0.9.1+dfsg/debian/rules	2011-09-14 00:11:54.000000000 +0200
@@ -14,6 +14,9 @@
 	CFLAGS += -O2
 endif
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+export DEB_HOST_MULTIARCH
+
 tests := $(filter-out main.cpp,$(subst test/,,$(wildcard test/*.cpp)))
 
 build: build-stamp

Reply via email to