Restored building libblkid, findfs and wipefs

8 files changed, 25 insertions, 14 deletions

diff --git a/debian/changelog b/debian/changelog
index 4ba9efcf..8c9e6752 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+util-linux (2.17-0+dyson1) unstable; urgency=low
+
+  * Ported to Dyson
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Sun, 22 Jan 2012 16:43:01 +0300
+
 util-linux (2.17-0) experimental; urgency=low
 
   [Bastian Friedrich]
diff --git a/debian/control b/debian/control
index a7d39b1f..d21e9981 100644
--- a/debian/control
+++ b/debian/control
@@ -81,7 +81,7 @@ Package: libblkid1
 Section: libs
 Priority: required
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Architecture: !illumos-amd64
+Architecture: any
 Description: block device id library
  The blkid library which allows system programs like fsck and
  mount to quickly and easily find block devices by filesystem UUID and
@@ -94,7 +94,7 @@ XC-Package-Type: udeb
 Section: debian-installer
 Priority: optional
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Architecture: !illumos-amd64
+Architecture: any
 Description: block device id library
  The blkid library which allows system programs like fsck and
  mount to quickly and easily find block devices by filesystem UUID and
@@ -108,7 +108,7 @@ Package: libblkid-dev
 Section: libdevel
 Priority: extra
 Depends: libc6-dev | libc-dev, libblkid1 (= ${binary:Version}), uuid-dev, ${shlibs:Depends}, ${misc:Depends}
-Architecture: !illumos-amd64
+Architecture: any
 Description: block device id library - headers and static libraries
  The blkid library which allows system programs like fsck and
  mount to quickly and easily find block devices by filesystem UUID and
diff --git a/debian/libblkid-dev.files b/debian/libblkid-dev.files
index babd18e1..25ca89f4 100644
--- a/debian/libblkid-dev.files
+++ b/debian/libblkid-dev.files
@@ -1,5 +1,5 @@
-usr/lib/libblkid.so
-usr/lib/libblkid.a
+usr/lib/*/libblkid.so
+usr/lib/*/libblkid.a
 usr/include/blkid
 usr/share/man/man3/libblkid.3
-usr/lib/pkgconfig/blkid.pc
+usr/lib/*/pkgconfig/blkid.pc
diff --git a/debian/libblkid1.files b/debian/libblkid1.files
index abab09ca..54ef86de 100644
--- a/debian/libblkid1.files
+++ b/debian/libblkid1.files
@@ -1 +1 @@
-lib/libblkid*.so.*
+lib/*/libblkid*.so.*
diff --git a/debian/rules b/debian/rules
index 668ecb2e..83184b4c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,10 +44,8 @@ ifeq ($(DEB_HOST_ARCH_OS),illumos)
 CPPFLAGS = "-DBYTE_ORDER=LITTLE_ENDIAN -DLITTLE_ENDIAN=1234 -D__sighandler_t=sighandler_t -Difr_hwaddr=ifr_addr -DNGROUPS=NGROUPS_MAX"
 # /bin is a symlink to /usr/bin:
 CONFOPTS += --prefix=/usr
-CONFOPTS += --sbindir=\$${prefix}/sbin
+CONFOPTS += --sbindir=/sbin
 CONFOPTS += --libdir=/lib/$(DEB_HOST_MULTIARCH)
-# No /proc/partitions on Illumos/Solaris:
-CONFOPTS += --disable-libblkid
 CONFOPTS += --disable-mount
 CONFOPTS += --disable-fsck
 CONFOPTS += --disable-agetty
@@ -138,15 +136,13 @@ endif
 	    install -m 644 debian/hwclock.rules debian/util-linux/lib/udev/rules.d/85-hwclock.rules; \
 	    install -m 755 debian/hwclock-set debian/util-linux/lib/udev/hwclock-set; \
 	fi
-ifneq ($(DEB_HOST_ARCH_OS),illumos)
 	# copy blkid library and symlink into udeb
-	ln debian/libblkid1/lib/libblkid.so.1.* debian/libblkid1-udeb/lib/
-	ln debian/libblkid1/lib/libblkid.so.1   debian/libblkid1-udeb/lib/
+	ln debian/libblkid1/lib/$(DEB_HOST_MULTIARCH)/libblkid.so.1.* debian/libblkid1-udeb/lib/
+	ln debian/libblkid1/lib/$(DEB_HOST_MULTIARCH)/libblkid.so.1   debian/libblkid1-udeb/lib/
 	ln debian/util-linux/sbin/blkid debian/util-linux-udeb/sbin/
 	# overwrite copyright
 	install -m 644 debian/libblkid.copyright debian/libblkid1/usr/share/doc/libblkid1/copyright
 	install -m 644 debian/libblkid.copyright debian/libblkid-dev/usr/share/doc/libblkid-dev/copyright
-endif
 	# copy uuid library and symlink into udeb
 	ln debian/libuuid1/lib/$(DEB_HOST_MULTIARCH)/libuuid.so.1.* debian/libuuid1-udeb/lib/
 	ln debian/libuuid1/lib/$(DEB_HOST_MULTIARCH)/libuuid.so.1   debian/libuuid1-udeb/lib/
diff --git a/misc-utils/Makefile.am b/misc-utils/Makefile.am
index cb770e05..ca6fb5ae 100644
--- a/misc-utils/Makefile.am
+++ b/misc-utils/Makefile.am
@@ -49,13 +49,16 @@ dist_man_MANS += blkid.8 findfs.8 wipefs.8
 blkid_SOURCES = blkid.c $(top_srcdir)/lib/ismounted.c \
 		$(top_srcdir)/lib/strutils.c
 blkid_LDADD = $(ul_libblkid_la)
+blkid_LDADD +=  -L$(top_builddir)/gnulib -lgnu
 blkid_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
 
 findfs_LDADD = $(ul_libblkid_la)
+findfs_LDADD +=  -L$(top_builddir)/gnulib -lgnu
 findfs_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
 
 wipefs_SOURCES = wipefs.c $(top_srcdir)/lib/strutils.c
 wipefs_LDADD = $(ul_libblkid_la)
+wipefs_LDADD +=  -L$(top_builddir)/gnulib -lgnu
 wipefs_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir)
 
 if LINUX
diff --git a/misc-utils/findfs.c b/misc-utils/findfs.c
index 18608b47..ceb3041b 100644
--- a/misc-utils/findfs.c
+++ b/misc-utils/findfs.c
@@ -9,6 +9,7 @@
 #include <string.h>
 #include <errno.h>
 #include <err.h>
+#include <argp.h>
 
 #include <blkid.h>
 
diff --git a/misc-utils/wipefs.c b/misc-utils/wipefs.c
index 4ab36159..d9bccfdd 100644
--- a/misc-utils/wipefs.c
+++ b/misc-utils/wipefs.c
@@ -30,9 +30,14 @@
 #include <err.h>
 #include <string.h>
 #include <limits.h>
+#include <argp.h>
 
 #include <blkid.h>
 
+#ifndef loff_t
+#define loff_t offset_t
+#endif
+
 #include "nls.h"
 #include "xalloc.h"
 #include "strutils.h"