[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[hurd] 01/01: Simplify stage3 into building everything that can be
|
From: |
Samuel Thibault |
|
Subject: |
[hurd] 01/01: Simplify stage3 into building everything that can be |
|
Date: |
Sun, 29 Nov 2015 02:08:25 +0000 |
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch master
in repository hurd.
commit 8951626a0b5970e9f8d9c39dd9ba494ac19180a5
Author: Samuel Thibault <address@hidden>
Date: Sun Nov 29 03:08:10 2015 +0100
Simplify stage3 into building everything that can be
---
debian/changelog | 5 ++---
debian/control | 4 ++--
debian/hurd-dev.install.in | 10 +++++-----
debian/patches/external.patch | 46 +++++++++++++++++++++++++------------------
debian/rules | 24 +++++++++-------------
5 files changed, 45 insertions(+), 44 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3ee7d7b..75cca03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,7 @@
hurd (1:0.7-2) UNRELEASED; urgency=medium
- * 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.
+ * control, rules: Add a stage3 which builds everything 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 3a4faf0..579b9d2 100644
--- a/debian/control
+++ b/debian/control
@@ -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 !stage3>
+Build-Profiles: <!stage1 !stage2>
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 !stage3>
+Build-Profiles: <!stage1 !stage2>
Depends: ${misc:Depends}
Suggests: www-browser
Description: GNU Hurd manual
diff --git a/debian/hurd-dev.install.in b/debian/hurd-dev.install.in
index 958b1c5..0463bd6 100755
--- a/debian/hurd-dev.install.in
+++ b/debian/hurd-dev.install.in
@@ -2,11 +2,11 @@
<!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
+<!stage1 !stage2 !stage3> usr/share/libdde_linux26/build
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
include/* usr/include
<!stage1> lib/@DEB_HOST_MULTIARCH@/*.a
<!stage1 !stage2> lib/@DEB_HOST_MULTIARCH@/*.so
-<!stage1 !stage2 !stage3> usr/share/libdde_linux26/build
usr/share/libdde_linux26
diff --git a/debian/patches/external.patch b/debian/patches/external.patch
index c746aac..bb91dc8 100644
--- a/debian/patches/external.patch
+++ b/debian/patches/external.patch
@@ -1,22 +1,22 @@
Include DDE in the build
-TODO: We should turn AC_MSG_WARN into disabling targets
-
-Index: hurd-debian/Makefile
-===================================================================
---- hurd-debian.orig/Makefile
-+++ hurd-debian/Makefile
-@@ -28,7 +28,8 @@ include ./Makeconf
+--- a/Makefile
++++ b/Makefile
+@@ -28,7 +28,12 @@ include ./Makeconf
# Hurd libraries
lib-subdirs = libshouldbeinlibc libihash libiohelp libports libthreads \
libpager libfshelp libdiskfs libtrivfs libps \
- libnetfs libpipe libstore libhurdbugaddr libftpconn libcons
+ libnetfs libpipe libstore libhurdbugaddr libftpconn libcons \
-+ libmachdev libbpf libddekit libhurd-slab eth-filter
eth-multiplexer
++ libbpf libhurd-slab eth-filter eth-multiplexer
++
++ifneq ($(LIBPCIACCESS),no)
++lib-subdirs += libmachdev libddekit
++endif
# Hurd programs
prog-subdirs = auth proc exec term \
-@@ -37,6 +38,7 @@ prog-subdirs = auth proc exec init term
+@@ -42,6 +47,7 @@ prog-subdirs = auth proc exec term \
procfs \
startup \
init \
@@ -24,10 +24,8 @@ Index: hurd-debian/Makefile
ifeq ($(HAVE_SUN_RPC),yes)
prog-subdirs += nfs nfsd
-Index: hurd-debian/Makeconf
-===================================================================
---- hurd-debian.orig/Makeconf
-+++ hurd-debian/Makeconf
+--- a/Makeconf
++++ b/Makeconf
@@ -576,7 +576,7 @@ vpath %.defs $(top_srcdir)/hurd
# These we want to find in the libc include directory...
mach_defs_names = bootstrap exc mach mach4 \
@@ -37,20 +35,30 @@ Index: hurd-debian/Makeconf
gnumach \
task_notify \
-Index: hurd-debian/configure.ac
-===================================================================
---- hurd-debian.orig/configure.ac
-+++ hurd-debian/configure.ac
-@@ -241,6 +241,12 @@ AC_SUBST(boot_store_types)dnl
+--- a/configure.ac
++++ b/configure.ac
+@@ -245,6 +245,12 @@ AC_SUBST(boot_store_types)dnl
AC_MSG_CHECKING(boot store types)
AC_MSG_RESULT($boot_store_types)
+AC_CHECK_LIB(pciaccess, pci_system_init, LIBPCIACCESS=-lpciaccess,
LIBPCIACCESS=no)
+AC_SUBST(LIBPCIACCESS)
+if test "$LIBPCIACCESS" = "no"; then
-+ AC_MSG_WARN([libpciaccess must be install in order to use libddekit])
++ AC_MSG_WARN([libpciaccess must be installed in order to use libddekit])
+fi
+
# Check for ncursesw, which is needed for the console-curses client.
hurd_LIB_NCURSESW
+--- a/config.make.in
++++ b/config.make.in
+@@ -98,6 +98,9 @@ libblkid_LIBS = @libblkid_LIBS@
+ # Whether Sun RPC support is available.
+ HAVE_SUN_RPC = @HAVE_SUN_RPC@
+
++# Whether libpciaccess is available.
++LIBPCIACCESS = @LIBPCIACCESS@
++
+ # Installation tools.
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/debian/rules b/debian/rules
index 7a6f1ea..c3231e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -63,15 +63,10 @@ ifeq (,$(filter stage1 stage2 stage3
noudeb,$(DEB_BUILD_PROFILES)))
endif
override_dh_auto_build:
-ifneq (,$(filter stage1 stage2 stage3,$(DEB_BUILD_PROFILES)))
+ifneq (,$(filter stage1 stage2,$(DEB_BUILD_PROFILES)))
:
- ifneq (,$(filter stage2 stage3,$(DEB_BUILD_PROFILES)))
+ ifneq (,$(filter stage2,$(DEB_BUILD_PROFILES)))
$(MAKE) -C build-deb/libihash libihash.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)))
@@ -79,7 +74,9 @@ else
endif
dh_auto_build -Bbuild-deb
cd build-deb/doc && make && makeinfo --html --split=chapter
../../doc/hurd.texi
+ ifeq (,$(filter stage3,$(DEB_BUILD_PROFILES)))
$(MAKE) -C libdde-linux26 BUILDDIR=$(CURDIR)/build-deb LDFLAGS=
+ endif
endif
override_dh_auto_clean:
@@ -94,22 +91,19 @@ endif
rm -f $(INSTALL_generated)
override_dh_auto_install:
-ifneq (,$(filter stage1 stage2 stage3,$(DEB_BUILD_PROFILES)))
+ifneq (,$(filter stage1 stage2,$(DEB_BUILD_PROFILES)))
$(MAKE) -Cbuild-deb prefix=$(DEB_DESTDIR) install-headers no_deps=t
- ifneq (,$(filter stage2 stage3,$(DEB_BUILD_PROFILES)))
+ ifneq (,$(filter stage2,$(DEB_BUILD_PROFILES)))
$(MAKE) -Cbuild-deb/libihash
libdir=$(DEB_DESTDIR)/lib/$(DEB_HOST_MULTIARCH)
$(DEB_DESTDIR)/lib/$(DEB_HOST_MULTIARCH)/libihash.a
- 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)))
dh_auto_install -Bbuild-udeb -- prefix=$(DEB_DESTDIR_UDEB)
libdir=$(DEB_DESTDIR_UDEB)/lib libexecdir=$(DEB_DESTDIR_UDEB)/lib/hurd
sysconfdir=$(DEB_DESTDIR_UDEB)/etc localstatedir=$(DEB_DESTDIR_UDEB)/var
XKB_BASE=$(DEB_DESTDIR_UDEB)/usr/share/X11/xkb
endif
+ ifeq (,$(filter stage3,$(DEB_BUILD_PROFILES)))
$(MAKE) -C libdde-linux26
INSTALLDIR=$(CURDIR)/debian/tmp/usr/share/libdde_linux26/build/include install
+ endif
# runsystem is managed by update-alternatives
mv debian/tmp/lib/hurd/runsystem debian/tmp/lib/hurd/runsystem.gnu
@@ -163,7 +157,7 @@ endif
override_dh_fixperms:
dh_fixperms
-ifeq (,$(filter stage1 stage2 stage3,$(DEB_BUILD_PROFILES)))
+ifeq (,$(filter stage1 stage2,$(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