Andreas Boll pushed to branch debian-unstable at X Strike Force / lib / libpthread-stubs
Commits:
-
928ec881
by Julien Cristau at 2013-09-22T14:51:53Z
-
a35f3979
by Julien Cristau at 2013-09-22T14:58:20Z
5 changed files:
- debian/changelog
- debian/control
- − debian/libpthread-stubs0-udeb.install
- − debian/libpthread-stubs0.install
- debian/rules
Changes:
1 |
-libpthread-stubs (0.3-4) UNRELEASED; urgency=low
|
|
1 |
+libpthread-stubs (0.3-4) unstable; urgency=low
|
|
2 | 2 |
|
3 |
- * Stop building libpthread-stubs0{,-udeb} on non-hurd-i386.
|
|
3 |
+ * Stop building libpthread-stubs0{,-udeb} (closes: 706865).
|
|
4 | 4 |
|
5 |
- -- Julien Cristau <jcristau@debian.org> Fri, 11 Nov 2011 23:31:45 +0100
|
|
5 |
+ -- Julien Cristau <jcristau@debian.org> Sun, 22 Sep 2013 16:58:17 +0200
|
|
6 | 6 |
|
7 | 7 |
libpthread-stubs (0.3-3) unstable; urgency=low
|
8 | 8 |
|
... | ... | @@ -8,35 +8,11 @@ Standards-Version: 3.8.3 |
8 | 8 |
Vcs-Git: git://anonscm.debian.org/git/collab-maint/libpthread-stubs
|
9 | 9 |
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/libpthread-stubs.git
|
10 | 10 |
|
11 |
-Package: libpthread-stubs0
|
|
12 |
-Section: libs
|
|
13 |
-Architecture: hurd-i386
|
|
14 |
-Multi-Arch: same
|
|
15 |
-Pre-Depends: ${misc:Pre-Depends}
|
|
16 |
-Depends: ${shlibs:Depends}, ${misc:Depends}
|
|
17 |
-Description: pthread stubs not provided by native libc
|
|
18 |
- This library provides weak aliases for pthread functions not provided
|
|
19 |
- in libc or otherwise available by default. Libraries like libxcb rely
|
|
20 |
- on pthread stubs to use pthreads optionally, becoming thread-safe when
|
|
21 |
- linked to libpthread, while avoiding any performance hit when running
|
|
22 |
- single-threaded. libpthread-stubs supports this behavior even on
|
|
23 |
- platforms which do not supply all the necessary pthread stubs. On
|
|
24 |
- platforms which already supply all the necessary pthread stubs, this
|
|
25 |
- package has no content.
|
|
26 |
- |
|
27 |
-Package: libpthread-stubs0-udeb
|
|
28 |
-Section: debian-installer
|
|
29 |
-Architecture: hurd-i386
|
|
30 |
-Depends: ${shlibs:Depends}, ${misc:Depends}
|
|
31 |
-Package-Type: udeb
|
|
32 |
-Description: pthread stubs not provided by native libc - udeb
|
|
33 |
- This is a udeb, or a microdeb, for the debian-installer.
|
|
34 |
- |
|
35 | 11 |
Package: libpthread-stubs0-dev
|
36 | 12 |
Section: libdevel
|
37 | 13 |
Architecture: any
|
38 | 14 |
Multi-Arch: same
|
39 |
-Depends: ${misc:Depends}, libpthread-stubs0 (= ${binary:Version}) [hurd-i386]
|
|
15 |
+Depends: ${misc:Depends}
|
|
40 | 16 |
Description: pthread stubs not provided by native libc, development files
|
41 | 17 |
This library provides weak aliases for pthread functions not provided
|
42 | 18 |
in libc or otherwise available by default. Libraries like libxcb rely
|
1 |
-lib/i386-gnu lib
|
1 |
-lib
|
... | ... | @@ -7,29 +7,11 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) |
7 | 7 |
dh $@ --with autoreconf --builddirectory=build
|
8 | 8 |
|
9 | 9 |
override_dh_auto_configure: debian/copyright
|
10 |
-ifeq ($(DEB_HOST_ARCH_OS), hurd)
|
|
11 |
- # libc.so pulls in libpthread-stubs.so, defeating our configure checks
|
|
12 |
- # by making them think the stubs are already in libc. Point ld at an
|
|
13 |
- # empty libpthread-stubs instead.
|
|
14 |
- echo 'OUTPUT_FORMAT(elf32-i386)' > debian/libpthread-stubs.so
|
|
15 |
- LDFLAGS='-L$(CURDIR)/debian' dh_auto_configure --builddirectory=build
|
|
16 |
-else
|
|
17 | 10 |
dh_auto_configure --builddirectory=build
|
18 |
-endif
|
|
19 |
- |
|
20 |
-override_dh_makeshlibs:
|
|
21 |
-ifeq ($(DEB_HOST_ARCH_OS), hurd)
|
|
22 |
- dh_makeshlibs -plibpthread-stubs0 --add-udeb=libpthread-stubs0-udeb
|
|
23 |
-endif
|
|
24 | 11 |
|
25 | 12 |
override_dh_auto_install:
|
26 |
- dh_auto_install --builddirectory=build
|
|
13 |
+ dh_auto_install --builddirectory=build --destdir=debian/tmp
|
|
27 | 14 |
find debian/tmp -name '*.la' -delete
|
28 |
-ifeq ($(DEB_HOST_ARCH_OS), hurd)
|
|
29 |
- install -d debian/tmp/lib/$(DEB_HOST_MULTIARCH)
|
|
30 |
- mv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libpthread-stubs.so.0* debian/tmp/lib/$(DEB_HOST_MULTIARCH)
|
|
31 |
- ln -sf /lib/$(DEB_HOST_MULTIARCH)/libpthread-stubs.so.0 debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libpthread-stubs.so
|
|
32 |
-endif
|
|
33 | 15 |
|
34 | 16 |
debian/copyright: debian/copyright.debian COPYING
|
35 | 17 |
cat $+ > $@
|