tags 631468 patch
thanks

There are two issues here

1/ libmount is a linux only feature. Patch 0001 marks the libmount binary
packages linux-any and sets the configure option --enable-libmount-mount only on
linux

2/ agetty needs to link against -lutil on freebsd as it uses login_tty(), i.e.
it needs to be moved out of the
 if !HAVE_LANGINFO clause

This patch needs a build system refresh.

Cheers,
Michael


-- 
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?
From 48ecd88948e9d6be11d022785d32bfaf8154e2a7 Mon Sep 17 00:00:00 2001
From: Michael Biebl <[email protected]>
Date: Sun, 10 Jul 2011 05:14:01 +0200
Subject: [PATCH 1/2] Build libmount on linux only

---
 debian/control |    6 +++---
 debian/rules   |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index a8d87fe..d6d3aa0 100644
--- a/debian/control
+++ b/debian/control
@@ -123,7 +123,7 @@ Package: libmount1
 Section: libs
 Priority: required
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Architecture: any
+Architecture: linux-any
 Description: block device id library
  The device mounting library, used by mount and mount helpers.
 
@@ -132,7 +132,7 @@ XC-Package-Type: udeb
 Section: debian-installer
 Priority: optional
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Architecture: any
+Architecture: linux-any
 Description: block device id library
  The device mounting library, used by mount and mount helpers.
  .
@@ -142,7 +142,7 @@ Package: libmount-dev
 Section: libdevel
 Priority: extra
 Depends: libc6-dev | libc-dev, libmount1 (= ${binary:Version}), uuid-dev, ${misc:Depends}
-Architecture: any
+Architecture: linux-any
 Description: block device id library - headers and static libraries
  The device mounting library, used by mount and mount helpers.
  .
diff --git a/debian/rules b/debian/rules
index 6759c42..06a2aa1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,9 +32,9 @@ export arch = $(DEB_HOST_ARCH)
 version := $(shell sed -e '1{;s|^util-linux (\(.*\))\ .*|\1|;q;}' debian/changelog)
 Upstream := $(shell sed 's/^.*(\(.*\)-.*).*/\1/; q' debian/changelog)
 
-CONFOPTS= --enable-raw --enable-rdev --enable-partx --with-slang --enable-libmount-mount 
+CONFOPTS= --enable-raw --enable-rdev --enable-partx --with-slang
 ifeq ($(DEB_HOST_ARCH_OS),linux)
-CONFOPTS += --with-selinux
+CONFOPTS += --with-selinux --enable-libmount-mount
 endif
 
 build: build-stamp
-- 
1.7.5.4

From 8b3b71dbdad6861086084768789d76eaee5f78b5 Mon Sep 17 00:00:00 2001
From: Michael Biebl <[email protected]>
Date: Sun, 10 Jul 2011 05:14:32 +0200
Subject: [PATCH 2/2] agetty needs to link against -lutil

Otherwise it FTBFS on kfreebsd because of login_tty being undefined.
---
 login-utils/Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/login-utils/Makefile.am b/login-utils/Makefile.am
index 0de72f6..6ae5ddf 100644
--- a/login-utils/Makefile.am
+++ b/login-utils/Makefile.am
@@ -12,9 +12,9 @@ if BUILD_AGETTY
 sbin_PROGRAMS += agetty
 dist_man_MANS += agetty.8
 agetty_SOURCES = agetty.c
+agetty_LDADD = -lutil
 if !HAVE_LANGINFO
 agetty_SOURCES += $(top_srcdir)/lib/langinfo.c
-agetty_LDADD = -lutil
 endif
 endif
 
-- 
1.7.5.4

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to