[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[hurd] 01/01: Add a stage3 which contains shared libraries
|
From: |
Samuel Thibault |
|
Subject: |
[hurd] 01/01: Add a stage3 which contains shared libraries |
|
Date: |
Sat, 28 Nov 2015 10:52:17 +0000 |
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch master
in repository hurd.
commit e60b7b6b5d8633b4bea71fd0c94a2c8c52faeeef
Author: Samuel Thibault <address@hidden>
Date: Sat Nov 28 11:51:50 2015 +0100
Add a stage3 which contains shared libraries
for libihash, libshouldbeinlibc, and libps. On the long run it will contain
anything that can be built with libc.so.
---
debian/changelog | 4 +++-
debian/control | 18 ++++++++---------
debian/hurd-dev.install.in | 16 +++++++--------
debian/rules | 49 +++++++++++++++++++++++++---------------------
4 files changed, 47 insertions(+), 40 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f2874e3..3ee7d7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
hurd (1:0.7-2) UNRELEASED; urgency=medium
- * rules: Add libshouldbeinlibc.a and libps.a to stage2.
+ * control, rules: Add a stage3 which contains shared libraries for libihash,
+ libshouldbeinlibc, and libps. On the long run it will contain anything that
+ can be built with libc.so.
-- Samuel Thibault <address@hidden> Fri, 27 Nov 2015 21:45:18 +0100
diff --git a/debian/control b/debian/control
index cb19a06..3a4faf0 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,12 @@ Section: admin
Priority: required
Maintainer: GNU Hurd Maintainers <address@hidden>
Standards-Version: 3.9.6
-Build-Depends: mig (>= 1.4-3~) <!stage1 !stage2>, gnumach-dev (>=
1.4+git20141109~) <!stage1 !stage2>,
- libc0.3-dev (>= 2.17-94~) <!stage1>, texinfo, libncursesw5-dev <!stage1
!stage2>,
+Build-Depends: mig (>= 1.4-3~) <!stage1 !stage2 !stage3>, gnumach-dev (>=
1.4+git20141109~) <!stage1 !stage2>,
+ libc0.3-dev (>= 2.17-94~) <!stage1>, texinfo, libncursesw5-dev <!stage1
!stage2 !stage3>,
debhelper (>= 9), dh-exec (>= 0.17), autoconf, dh-autoreconf,
- libparted-dev <!stage1 !stage2>, libpciaccess-dev <!stage1 !stage2>,
libx11-dev <!stage1 !stage2>, x11proto-core-dev <!stage1 !stage2>, pkg-config
<!stage1 !stage2>,
- xkb-data <!stage1 !stage2>, gawk, flex, bison, autotools-dev, libdaemon-dev
<!stage1 !stage2>, libpcap0.8-dev <!stage1 !stage2>,
- zlib1g-dev <!stage1 !stage2>, libbz2-dev <!stage1 !stage2>, uuid-dev <!stage1
!stage2>, libblkid-dev <!stage1 !stage2>
+ libparted-dev <!stage1 !stage2 !stage3>, libpciaccess-dev <!stage1 !stage2
!stage3>, libx11-dev <!stage1 !stage2 !stage3>, x11proto-core-dev <!stage1
!stage2 !stage3>, pkg-config <!stage1 !stage2 !stage3>,
+ xkb-data <!stage1 !stage2 !stage3>, gawk, flex, bison, autotools-dev,
libdaemon-dev <!stage1 !stage2 !stage3>, libpcap0.8-dev <!stage1 !stage2
!stage3>,
+ zlib1g-dev <!stage1 !stage2 !stage3>, libbz2-dev <!stage1 !stage2 !stage3>,
uuid-dev <!stage1 !stage2 !stage3>, libblkid-dev <!stage1 !stage2 !stage3>
Uploaders: Michael Banck <address@hidden>,
Samuel Thibault <address@hidden>
Homepage: http://www.gnu.org/software/hurd/hurd.html
@@ -38,7 +38,7 @@ Provides: makedev, login, console-driver-xkb
Replaces: makedev, login (<< 1:4.0.14-4), random-egd, console-driver-xkb
Conflicts: makedev, login (<< 1:4.0.14-4), console-driver-xkb
Architecture: hurd-any
-Build-Profiles: <!stage1 !stage2>
+Build-Profiles: <!stage1 !stage2 !stage3>
Description: GNU Hurd
This is the GNU Hurd package. It contains essential system software and
libraries.
@@ -67,7 +67,7 @@ Package: hurd-doc
Priority: optional
Section: doc
Architecture: all
-Build-Profiles: <!stage1 !stage2>
+Build-Profiles: <!stage1 !stage2 !stage3>
Depends: ${misc:Depends}
Suggests: www-browser
Description: GNU Hurd manual
@@ -78,7 +78,7 @@ Section: debian-installer
Package-Type: udeb
Priority: optional
Architecture: hurd-any
-Build-Profiles: <!noudeb !stage1 !stage2>
+Build-Profiles: <!noudeb !stage1 !stage2 !stage3>
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: GNU Hurd (libraries) - udeb
This package contains the libraries used by GNU Hurd udeb.
@@ -88,7 +88,7 @@ Package-Type: udeb
Priority: optional
Section: debian-installer
Architecture: hurd-any
-Build-Profiles: <!noudeb !stage1 !stage2>
+Build-Profiles: <!noudeb !stage1 !stage2 !stage3>
Depends: ${misc:Depends}, ${shlibs:Depends}, hurd-libs0.3-udeb (=
${binary:Version}), xkb-data-udeb
Built-Using: ${built-using}
Provides: hurd, ext2-modules, fat-modules, ipv6-modules, isofs-modules,
loop-modules, mouse-modules, nfs-modules, socket-modules
diff --git a/debian/hurd-dev.install.in b/debian/hurd-dev.install.in
index 08001be..958b1c5 100755
--- a/debian/hurd-dev.install.in
+++ b/debian/hurd-dev.install.in
@@ -1,12 +1,12 @@
#! /usr/bin/dh-exec
-<!stage1 !stage2> ../../libdde-linux26/Makeconf* usr/share/libdde_linux26
-<!stage1 !stage2> ../../libdde-linux26/lib/src/libdde_*.a
usr/lib/@DEB_HOST_MULTIARCH@
-<!stage1 !stage2> ../../libdde-linux26/mk usr/share/libdde_linux26
-<!stage1 !stage2> ../local/cdrom.h usr/include/sys
-<!stage1 !stage2> ../local/soundcard.h usr/include/sys
-<!stage1 !stage2> bin/fstests
-<!stage1 !stage2> bin/timertest
+<!stage1 !stage2 !stage3> ../../libdde-linux26/Makeconf*
usr/share/libdde_linux26
+<!stage1 !stage2 !stage3> ../../libdde-linux26/lib/src/libdde_*.a
usr/lib/@DEB_HOST_MULTIARCH@
+<!stage1 !stage2 !stage3> ../../libdde-linux26/mk usr/share/libdde_linux26
+<!stage1 !stage2 !stage3> ../local/cdrom.h usr/include/sys
+<!stage1 !stage2 !stage3> ../local/soundcard.h usr/include/sys
+<!stage1 !stage2 !stage3> bin/fstests
+<!stage1 !stage2 !stage3> bin/timertest
include/* usr/include
<!stage1> lib/@DEB_HOST_MULTIARCH@/*.a
<!stage1 !stage2> lib/@DEB_HOST_MULTIARCH@/*.so
-<!stage1 !stage2> usr/share/libdde_linux26/build usr/share/libdde_linux26
+<!stage1 !stage2 !stage3> usr/share/libdde_linux26/build
usr/share/libdde_linux26
diff --git a/debian/rules b/debian/rules
index 96c589d..7a6f1ea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@
DEB_DESTDIR = $(CURDIR)/debian/tmp
DEB_DESTDIR_UDEB = $(CURDIR)/debian/tmp-udeb
-ifeq (,$(filter stage1 stage2,$(DEB_BUILD_PROFILES)))
+ifeq (,$(filter stage1 stage2 stage3,$(DEB_BUILD_PROFILES)))
CONFIGURE_ARGS = --disable-profile --enable-static-progs='ext2fs,iso9660fs'
else
CONFIGURE_ARGS = \
@@ -31,16 +31,16 @@ CONFIGURE_ARGS = \
# Skip some checks because they expect
# a working glibc causing a circular dependency.
# TODO: rather disable the corresponding features in configure.ac
-export ac_cv_search_clnt_create=no
export ac_cv_lib_pciaccess_pci_system_init=no
+ ifneq (,$(filter stage1 stage2,$(DEB_BUILD_PROFILES)))
+export ac_cv_search_clnt_create=no
export ac_cv_func_file_exec_file_name=no
export ac_cv_func_exec_exec_file_name=no
export ac_cv_func__hurd_exec_file_name=no
export LEX=:
export YACC=:
-endif
-ifeq (stage1,$(filter stage1,$(DEB_BUILD_PROFILES)))
export MIG=:
+ endif
endif
CONFIGURE_ARGS_deb =
CONFIGURE_ARGS_udeb = --without-libdaemon --without-libbz2
@@ -58,31 +58,33 @@ BUILT_USING := $(shell dpkg-query -f '$${source:Package} (=
$${source:Version}),
override_dh_auto_configure:
dh_auto_configure -Bbuild-deb -- $(CONFIGURE_ARGS)
$(CONFIGURE_ARGS_deb) $(shell dpkg-buildflags --export=configure)
-ifeq (,$(filter stage1 stage2 noudeb,$(DEB_BUILD_PROFILES)))
+ifeq (,$(filter stage1 stage2 stage3 noudeb,$(DEB_BUILD_PROFILES)))
dh_auto_configure -Bbuild-udeb -- $(CONFIGURE_ARGS)
$(CONFIGURE_ARGS_udeb) $(shell dpkg-buildflags --export=configure)
endif
override_dh_auto_build:
-ifneq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
+ifneq (,$(filter stage1 stage2 stage3,$(DEB_BUILD_PROFILES)))
:
-else
-ifneq (,$(filter stage2,$(DEB_BUILD_PROFILES)))
+ ifneq (,$(filter stage2 stage3,$(DEB_BUILD_PROFILES)))
$(MAKE) -C build-deb/libihash libihash.a
- $(MAKE) -C build-deb/libshouldbeinlibc libshouldbeinlibc.a
- $(MAKE) -C build-deb/libps libps.a
+ ifneq (,$(filter stage3,$(DEB_BUILD_PROFILES)))
+ $(MAKE) -C build-deb/libihash libihash.so
+ $(MAKE) -C build-deb/libshouldbeinlibc libshouldbeinlibc.so
+ $(MAKE) -C build-deb/libps libps.so
+ endif
+ endif
else
-ifeq (,$(filter noudeb,$(DEB_BUILD_PROFILES)))
+ ifeq (,$(filter noudeb,$(DEB_BUILD_PROFILES)))
dh_auto_build -Bbuild-udeb
-endif
+ endif
dh_auto_build -Bbuild-deb
cd build-deb/doc && make && makeinfo --html --split=chapter
../../doc/hurd.texi
$(MAKE) -C libdde-linux26 BUILDDIR=$(CURDIR)/build-deb LDFLAGS=
endif
-endif
override_dh_auto_clean:
dh_auto_clean -Bbuild-deb
-ifeq (,$(filter stage1 stage2 noudeb,$(DEB_BUILD_PROFILES)))
+ifeq (,$(filter stage1 stage2 stage3 noudeb,$(DEB_BUILD_PROFILES)))
dh_auto_clean -Bbuild-udeb
endif
$(MAKE) -C libdde-linux26 cleanall
@@ -92,13 +94,16 @@ endif
rm -f $(INSTALL_generated)
override_dh_auto_install:
-ifneq (,$(filter stage1 stage2,$(DEB_BUILD_PROFILES)))
+ifneq (,$(filter stage1 stage2 stage3,$(DEB_BUILD_PROFILES)))
$(MAKE) -Cbuild-deb prefix=$(DEB_DESTDIR) install-headers no_deps=t
-ifneq (,$(filter stage2,$(DEB_BUILD_PROFILES)))
+ ifneq (,$(filter stage2 stage3,$(DEB_BUILD_PROFILES)))
$(MAKE) -Cbuild-deb/libihash
libdir=$(DEB_DESTDIR)/lib/$(DEB_HOST_MULTIARCH)
$(DEB_DESTDIR)/lib/$(DEB_HOST_MULTIARCH)/libihash.a
- $(MAKE) -Cbuild-deb/libshouldbeinlibc
libdir=$(DEB_DESTDIR)/lib/$(DEB_HOST_MULTIARCH)
$(DEB_DESTDIR)/lib/$(DEB_HOST_MULTIARCH)/libshouldbeinlibc.a
- $(MAKE) -Cbuild-deb/libps
libdir=$(DEB_DESTDIR)/lib/$(DEB_HOST_MULTIARCH)
$(DEB_DESTDIR)/lib/$(DEB_HOST_MULTIARCH)/libps.a
-endif
+ ifneq (,$(filter stage3,$(DEB_BUILD_PROFILES)))
+ $(MAKE) -Cbuild-deb/libihash
libdir=$(DEB_DESTDIR)/lib/$(DEB_HOST_MULTIARCH)
$(DEB_DESTDIR)/lib/$(DEB_HOST_MULTIARCH)/libihash.so
+ $(MAKE) -Cbuild-deb/libshouldbeinlibc
libdir=$(DEB_DESTDIR)/lib/$(DEB_HOST_MULTIARCH)
$(DEB_DESTDIR)/lib/$(DEB_HOST_MULTIARCH)/libshouldbeinlibc.so
+ $(MAKE) -Cbuild-deb/libps
libdir=$(DEB_DESTDIR)/lib/$(DEB_HOST_MULTIARCH)
$(DEB_DESTDIR)/lib/$(DEB_HOST_MULTIARCH)/libps.so
+ endif
+ endif
else
dh_auto_install -Bbuild-deb -- prefix=$(DEB_DESTDIR)
libdir=$(DEB_DESTDIR)/lib/$(DEB_HOST_MULTIARCH)
libexecdir=$(DEB_DESTDIR)/lib/hurd sysconfdir=$(DEB_DESTDIR)/etc
localstatedir=$(DEB_DESTDIR)/var XKB_BASE=$(DEB_DESTDIR)/usr/share/X11/xkb
ifeq (,$(filter noudeb,$(DEB_BUILD_PROFILES)))
@@ -117,7 +122,7 @@ endif
mv debian/tmp/bin/uptime debian/tmp/usr/bin/uptime-hurd
mv debian/tmp/bin/vmstat debian/tmp/usr/bin/vmstat-hurd
mv debian/tmp/bin/w debian/tmp/usr/bin/w-hurd
-ifeq (,$(filter stage1 stage2 noudeb,$(DEB_BUILD_PROFILES)))
+ifeq (,$(filter stage1 stage2 stage3 noudeb,$(DEB_BUILD_PROFILES)))
mkdir -p debian/tmp-udeb/usr/bin
mv debian/tmp-udeb/bin/ps debian/tmp-udeb/bin/ps-hurd
mv debian/tmp-udeb/bin/uptime debian/tmp-udeb/usr/bin/uptime-hurd
@@ -138,7 +143,7 @@ endif
override_dh_install: $(INSTALL_generated)
dh_install $(addprefix -p,$(filter %-udeb,$(shell dh_listpackages)))
--sourcedir=debian/tmp-udeb
dh_install --remaining-packages --list-missing --sourcedir=debian/tmp
-ifeq (,$(filter stage1 stage2 noudeb,$(DEB_BUILD_PROFILES)))
+ifeq (,$(filter stage1 stage2 stage3 noudeb,$(DEB_BUILD_PROFILES)))
mkdir -p debian/hurd-udeb/usr/share/lintian/overrides
install -p -m644 debian/hurd-udeb.lintian-overrides
debian/hurd-udeb/usr/share/lintian/overrides/hurd-udeb
endif
@@ -158,7 +163,7 @@ endif
override_dh_fixperms:
dh_fixperms
-ifeq (,$(filter stage1 stage2,$(DEB_BUILD_PROFILES)))
+ifeq (,$(filter stage1 stage2 stage3,$(DEB_BUILD_PROFILES)))
chmod u+s $(patsubst %,$(CURDIR)/debian/hurd%,$(SUID_PROGRAMS))
endif
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-hurd/hurd.git