[Xcb] Bug#632555: Bug#632555: libpthread-stubs0: Multiarch support

[Julien Cristau]

On Sun, Jul  3, 2011 at 16:27:28 +0200, Samuel Thibault wrote:

> --- libpthread-stubs-0.3/debian/control	2011-07-03 15:24:33.000000000 +0200
> +++ libpthread-stubs-0.3-mine/debian/control	2011-07-03 15:24:18.000000000 +0200
> @@ -12,6 +12,7 @@
>  Section: libs
>  Architecture: any
>  Depends: ${shlibs:Depends}, ${misc:Depends}
> +Multi-Arch: same

missing Pre-Depends, and bumped dependency on cdbs and/or debhelper.

>  Description: pthread stubs not provided by native libc
>   This library provides weak aliases for pthread functions not provided
>   in libc or otherwise available by default.  Libraries like libxcb rely
> --- libpthread-stubs-0.3/debian/rules	2011-07-03 15:24:33.000000000 +0200
> +++ libpthread-stubs-0.3-mine/debian/rules	2011-07-03 15:45:14.000000000 +0200
> @@ -5,7 +5,7 @@
>  include /usr/share/cdbs/1/rules/debhelper.mk
>  include /usr/share/cdbs/1/class/autotools.mk
>  
> -DEB_CONFIGURE_EXTRA_FLAGS=--prefix=/
> +DEB_CONFIGURE_EXTRA_FLAGS=--prefix=/ --libdir=/lib/$(DEB_HOST_MULTIARCH)

may need to set the variable first?

>  DEB_DH_MAKESHLIBS_ARGS_libpthread-stubs0=--add-udeb=libpthread-stubs0-udeb
>  
>  debian/copyright: debian/copyright.debian COPYING
> @@ -17,13 +17,13 @@
>  common-install-prehook-arch common-install-prehook-indep:: debian/copyright
>  
>  install/libpthread-stubs0::
> -	if test -f debian/tmp/lib/libpthread-stubs.so.0.0.0; then dh_install -p$(cdbs_curpkg) debian/tmp/lib/libpthread-stubs.so.0.0.0; fi
> -	if test -L debian/tmp/lib/libpthread-stubs.so.0; then dh_install -p$(cdbs_curpkg) debian/tmp/lib/libpthread-stubs.so.0; fi
> +	if test -f debian/tmp/lib/$(DEB_HOST_MULTIARCH)/libpthread-stubs.so.0.0.0; then dh_install -p$(cdbs_curpkg) debian/tmp/lib/$(DEB_HOST_MULTIARCH)/libpthread-stubs.so.0.0.0; fi
> +	if test -L debian/tmp/lib/$(DEB_HOST_MULTIARCH)/libpthread-stubs.so.0; then dh_install -p$(cdbs_curpkg) debian/tmp/lib/$(DEB_HOST_MULTIARCH)/libpthread-stubs.so.0; fi
>  
>  install/libpthread-stubs0-udeb::
> -	if test -f debian/tmp/lib/libpthread-stubs.so.0.0.0; then dh_install -p$(cdbs_curpkg) debian/tmp/lib/libpthread-stubs.so.0.0.0; fi
> -	if test -L debian/tmp/lib/libpthread-stubs.so.0; then dh_install -p$(cdbs_curpkg) debian/tmp/lib/libpthread-stubs.so.0; fi
> +	if test -f debian/tmp/lib/$(DEB_HOST_MULTIARCH)/libpthread-stubs.so.0.0.0; then dh_install -p$(cdbs_curpkg) debian/tmp/lib/$(DEB_HOST_MULTIARCH)/libpthread-stubs.so.0.0.0; fi
> +	if test -L debian/tmp/lib/$(DEB_HOST_MULTIARCH)/libpthread-stubs.so.0; then dh_install -p$(cdbs_curpkg) debian/tmp/lib/$(DEB_HOST_MULTIARCH)/libpthread-stubs.so.0; fi
>  
>  install/libpthread-stubs0-dev::
> -	if test -f debian/tmp/lib/libpthread-stubs.a; then dh_install -p$(cdbs_curpkg) debian/tmp/lib/libpthread-stubs.a usr/lib; ln -s /lib/libpthread-stubs.so.0.0.0 debian/libpthread-stubs0-dev/usr/lib/libpthread-stubs.so; fi
> -	dh_install -p$(cdbs_curpkg) debian/tmp/lib/pkgconfig/pthread-stubs.pc usr/share/pkgconfig/
> +	if test -f debian/tmp/lib/$(DEB_HOST_MULTIARCH)/libpthread-stubs.a; then dh_install -p$(cdbs_curpkg) debian/tmp/lib/$(DEB_HOST_MULTIARCH)/libpthread-stubs.a usr/lib/$(DEB_HOST_MULTIARCH); ln -s /lib/$(DEB_HOST_MULTIARCH)/libpthread-stubs.so.0.0.0 debian/libpthread-stubs0-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libpthread-stubs.so; fi
> +	dh_install -p$(cdbs_curpkg) debian/tmp/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/pthread-stubs.pc usr/share/pkgconfig/

Cheers,
Julien