On Fri, Jul 20, 2012 at 10:05:04PM +0200, Enrico Tassi wrote: > On Fri, Jul 20, 2012 at 04:31:23PM +0200, Adam Borowski wrote: > > Looking around, it looks it could be fixed by: > > * moving lua-deb-multiarch.h to /usr/include/$arch/ > > * removing /usr/lib/x86_64-linux-gnu/lua5.1/include/ from pkgconfig data > > > > I kind of fail to see how lua-deb-multiarch.h is related to lua at all, it's > > an include that's generally useful. If it's the default search path, you > > can still cross-compile, but don't have to specify it in a -I stanza. > > Thanks for the list, I think I should just revert my last change, plus > some extra magic for cpp. I'll do it as soon as possible.
It would be sad to lose multiarchification, and it would need to be re-added in wheezy+1 anyway. I just tried the fix I proposed above, it seems to work (tested on 6 random failing packages). Patch attached. -- Copyright and patents were never about promoting culture and innovations; from the very start they were legalized bribes to give the king some income and to let businesses get rid of competition. For some history, please read https://en.wikipedia.org/wiki/Statute_of_Monopolies_1623
diff -Nurd lua5.1-5.1.5.orig/debian/changelog lua5.1-5.1.5/debian/changelog
--- lua5.1-5.1.5.orig/debian/changelog 2012-07-16 13:03:22.000000000 +0200
+++ lua5.1-5.1.5/debian/changelog 2012-07-21 08:10:07.640978034 +0200
@@ -1,3 +1,11 @@
+lua5.1 (5.1.5-3.1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * Put multiarch helper header in the standard include path, rather than
+ somewhere that relies on pkg-config (Closes: #682183)
+
+ -- Adam Borowski <kilob...@angband.pl> Sat, 21 Jul 2012 08:08:34 +0200
+
lua5.1 (5.1.5-3) unstable; urgency=low
* Install architecture dependent .h file in /usr/lib and fix .pc files
diff -Nurd lua5.1-5.1.5.orig/debian/liblua5.1-0-dev.install lua5.1-5.1.5/debian/liblua5.1-0-dev.install
--- lua5.1-5.1.5.orig/debian/liblua5.1-0-dev.install 2012-07-16 12:34:54.000000000 +0200
+++ lua5.1-5.1.5/debian/liblua5.1-0-dev.install 2012-07-21 08:06:33.496983230 +0200
@@ -1,5 +1,4 @@
usr/include
-usr/lib/*/*/*/*.h
usr/lib/*/*.a
usr/lib/*/*.so
usr/lib/*/pkgconfig/*.pc
diff -Nurd lua5.1-5.1.5.orig/debian/lua-c++.pc.in lua5.1-5.1.5/debian/lua-c++.pc.in
--- lua5.1-5.1.5.orig/debian/lua-c++.pc.in 2012-07-16 12:36:12.000000000 +0200
+++ lua5.1-5.1.5/debian/lua-c++.pc.in 2012-07-21 08:07:33.432981560 +0200
@@ -22,4 +22,4 @@
Requires:
Libs: -L${libdir} -l${lib_name}
Libs.private: -lm -ldl
-Cflags: -I${includedir}/${lib_name_include} -I/usr/lib/${deb_host_multiarch}/${lib_name_include}/include/
+Cflags: -I${includedir}/${lib_name_include}
diff -Nurd lua5.1-5.1.5.orig/debian/lua.pc.in lua5.1-5.1.5/debian/lua.pc.in
--- lua5.1-5.1.5.orig/debian/lua.pc.in 2012-07-16 12:36:22.000000000 +0200
+++ lua5.1-5.1.5/debian/lua.pc.in 2012-07-21 08:07:48.056981175 +0200
@@ -22,4 +22,4 @@
Requires:
Libs: -L${libdir} -l${lib_name}
Libs.private: -lm -ldl
-Cflags: -I${includedir}/${lib_name_include} -I/usr/lib/${deb_host_multiarch}/${lib_name_include}/include/
+Cflags: -I${includedir}/${lib_name_include}
diff -Nurd lua5.1-5.1.5.orig/debian/rules lua5.1-5.1.5/debian/rules
--- lua5.1-5.1.5.orig/debian/rules 2012-07-16 13:07:23.000000000 +0200
+++ lua5.1-5.1.5/debian/rules 2012-07-21 08:08:27.848980415 +0200
@@ -13,7 +13,7 @@
PKGPP_CONFIG_FILE = $(PKG_DIR)/$(LUA)-c++.pc
DOC_DIR = debian/$(LUA)-doc/usr/share/doc/$(LUA)-doc
-LUA_MULTIARCH_INCLUDE = $(DEB_DESTDIR)/lib/$(DEB_HOST_MULTIARCH)/$(LUA)/include/
+LUA_MULTIARCH_INCLUDE = $(DEB_DESTDIR)/include/$(DEB_HOST_MULTIARCH)/
LUA_MULTIARCH = lua-deb-multiarch.h
ifeq (hurd,$(shell dpkg-architecture -qDEB_HOST_ARCH_OS))
signature.asc
Description: Digital signature
