On Sat, Aug 06, 2011 at 09:30:32AM +0200, Sven Joachim wrote:
> On 2011-08-05 11:31 +0200, Riku Voipio wrote:
>
> > On Thu, Aug 04, 2011 at 04:47:06PM +0200, Sven Joachim wrote:
> >> > last is needed to support crosscompiling (so that /usr/bin/sdl-config is
> >> > same on all archs,
> >> > allowing Multi-Arch: same setting for the -dev package).
> >>
> >> There is a little problem with the latter, namely…
> >
> >> …it requires dpkg-dev (1.16.0 or later due to DEB_HOST_MULTIARCH) for
> >> dpkg-architecture.
> >
> > Easily fixed on the attached patch.
>
> It seems you forgot to actually attach the patch.
lets try attaching again...
> I'm not sure that having libfoo-dev packages depend on dpkg-dev is
> desirable, although this currently seems to be the only way to retrieve
> the multiarch path. Since there are many foo-config scripts in the
> archive, maybe this should be discussed with a broader audience,
> i.e. debian-devel?
Mmm.. what would exactly be the question for debian-devel? Also, my in
experience posting to d-d rarely results useful responses.
> See also http://bugs.debian.org/636352.
That is a bit different, I can understand that not everyone wants dpkg-dev
to build initramfs-tools. But for -dev packages dpkg-dev is most likely already
installed via build-essential. The only ones who would get an extra package
install
are those who want to build sdl apps without debian packaging.
Riku
diff -u libsdl1.2-1.2.14/debian/control libsdl1.2-1.2.14/debian/control
--- libsdl1.2-1.2.14/debian/control
+++ libsdl1.2-1.2.14/debian/control
@@ -4,8 +4,8 @@
Maintainer: Debian SDL packages maintainers <pkg-sdl-maintain...@lists.alioth.debian.org>
Uploaders: Barry deFreese <bdefre...@debian.org>
Standards-Version: 3.8.4
-Build-Depends: dpkg (>= 1.13.2),
- debhelper (>= 5.0),
+Build-Depends: dpkg-dev (>= 1.16.0),
+ debhelper (>= 8.1.3),
quilt,
nasm [any-i386],
libx11-dev,
@@ -27,7 +27,9 @@
Package: libsdl1.2debian
Architecture: any
+Multi-Arch: same
Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
Replaces: libsdl1.2debian-all,
libsdl1.2debian-alsa,
libsdl1.2debian-esd,
@@ -65,6 +67,7 @@
This version of SDL is compiled with directfb graphics and no sound.
Package: libsdl1.2-dev
+Multi-Arch: same
Architecture: any
Section: libdevel
Depends: ${misc:Depends},
@@ -77,7 +80,8 @@
libcaca-dev,
libusbhid-dev [kfreebsd-any],
libxt-dev,
- libxext-dev
+ libxext-dev,
+ dpkg-dev (>= 1.16.0)
Replaces: libsdl-dev, libsdl0.11-dev, libsdl1.0-dev, libsdl1.1-dev
Conflicts: xlibs-pic (<< 4.1.0-10), libsdl-dev, libsdl0.11-dev, libsdl0.11, libsdl1.0-dev, libsdl1.1-dev
Provides: libsdl-dev
diff -u libsdl1.2-1.2.14/debian/libsdl1.2debian.install libsdl1.2-1.2.14/debian/libsdl1.2debian.install
--- libsdl1.2-1.2.14/debian/libsdl1.2debian.install
+++ libsdl1.2-1.2.14/debian/libsdl1.2debian.install
@@ -1 +1 @@
-usr/lib/*.so.*
+usr/lib/*/*.so.*
diff -u libsdl1.2-1.2.14/debian/rules libsdl1.2-1.2.14/debian/rules
--- libsdl1.2-1.2.14/debian/rules
+++ libsdl1.2-1.2.14/debian/rules
@@ -19,11 +19,13 @@
DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
export DEB_HOST_GNU_TYPE
export DEB_BUILD_GNU_TYPE
-confflags = --prefix=/usr
+confflags = --prefix=/usr --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+
confflags += --disable-rpath --enable-sdl-dlopen --disable-loadso \
--disable-video-ggi --disable-video-svga --disable-video-aalib \
--disable-nas --disable-esd --disable-arts \
@@ -126,7 +128,10 @@
dh_installman -plibsdl1.2-dev debian/sdl-config.1
dh_installchangelogs
dh_install --sourcedir=debian/tmp
- sed -i -e "s/^dependency_libs=.*/dependency_libs=''/" debian/libsdl1.2-dev/usr/lib/libSDL.la
+ sed -i -e "s/^dependency_libs=.*/dependency_libs=''/" debian/libsdl1.2-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libSDL.la
+ mkdir -p debian/libsdl1.2-dev/usr/bin debian/libsdl1.2-dev/usr/lib/$(DEB_HOST_MULTIARCH)/sdl/
+ mv debian/tmp/usr/bin/sdl-config debian/libsdl1.2-dev/usr/lib/$(DEB_HOST_MULTIARCH)/sdl/sdl-config
+ cp -a debian/sdl-config debian/libsdl1.2-dev/usr/bin/
dh_install --sourcedir=builddir/udeb/ -plibsdl1.2debian-udeb build/.libs/*.so.* usr/lib/;
rm -rf debian/libsdl1.2debian/usr/include
dh_strip
diff -u libsdl1.2-1.2.14/debian/libsdl1.2-dev.install libsdl1.2-1.2.14/debian/libsdl1.2-dev.install
--- libsdl1.2-1.2.14/debian/libsdl1.2-dev.install
+++ libsdl1.2-1.2.14/debian/libsdl1.2-dev.install
@@ -1,7 +1,6 @@
usr/include/SDL
-usr/lib/*.a
-usr/lib/*.so
-usr/lib/*.la
-usr/lib/pkgconfig
-usr/bin/sdl-config
+usr/lib/*/*.a
+usr/lib/*/*.so
+usr/lib/*/*.la
+usr/lib/*/pkgconfig
usr/share/aclocal/*
only in patch2:
unchanged:
--- libsdl1.2-1.2.14.orig/debian/sdl-config
+++ libsdl1.2-1.2.14/debian/sdl-config
@@ -0,0 +1,5 @@
+#!/bin/sh
+# Generic multiarch wrapper for sdl-config
+# Copyright (c) 2011 Riku Voipio <riku.voi...@linaro.org>
+
+/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/sdl/sdl-config "$@"
