Bug#608428: Patch to avoid uuid linking in KfreeBSD
Hi Everybody,
First of all, I am not expert, but I try to help ;-) !
I've did a modification of Roger Leigh's patch, please test it in Debian GNU {Linux, KfreeBSD}
+ B-D uuid-dev as Depency in KfreeBSD is unnecessary.
+ Fixed configure to --enable-uuid works
Kind regards,
--
Julián Moreno Patiño
.''`. Debian GNU/{Linux,KfreeBSD}
: :' : Free Operating Systems
`- PGP KEY ID 6168BF60
Registered GNU Linux User ID 488513
--- a/configure 2010-12-30 09:06:55.055223000 -0500
+++ b/configure 2011-01-05 20:11:07.000000000 -0500
@@ -17657,13 +17657,14 @@
$as_echo "no" >&6; }
HAVE_UUID=no
else
- UUID_CFLAGS=$pkg_cv_UUID_CFLAGS
- UUID_LIBS=$pkg_cv_UUID_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- $as_echo "#define HAVE_UUID 1" >>confdefs.h
-
- HAVE_UUID=yes
+ if test "$enable_uuid" = "yes"; then
+ UUID_CFLAGS=$pkg_cv_UUID_CFLAGS
+ UUID_LIBS=$pkg_cv_UUID_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ $as_echo "#define HAVE_UUID 1" >>confdefs.h
+ HAVE_UUID=yes
+ fi
fi
@@ -18113,7 +18114,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build UUID support" >&5
$as_echo_n "checking whether to build UUID support... " >&6; }
BUILD_UUID="yes"
-if test "$enable_uuid" = "yes"; then
+if test "$enable_uuid" = "no"; then
BUILD_UUID="no"
fi
if test "$HAVE_UUID" = "no"; then
--- a/debian/control 2010-12-30 09:06:44.000000000 -0500
+++ b/debian/control 2011-01-05 20:29:09.000000000 -0500
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian buildd-tools Developers <buildd-tools-devel@lists.alioth.debian.org>
Uploaders: Roger Leigh <rleigh@debian.org>
-Build-Depends: debhelper (>= 7.0.0), autotools-dev, pkg-config (>= 0.20), libpam0g-dev (>= 0.79-3.1), uuid-dev, liblockdev1-dev (>= 1.0.2), libboost-dev (>= 1.39.0), libboost-program-options-dev (>= 1.39.0), libboost-regex-dev (>= 1.39.0), libboost-filesystem-dev (>= 1.39.0), gettext, libcppunit-dev
+Build-Depends: debhelper (>= 7.0.0), autotools-dev, pkg-config (>= 0.20), libpam0g-dev (>= 0.79-3.1), uuid-dev[!kfreebsd-any], liblockdev1-dev (>= 1.0.2), libboost-dev (>= 1.39.0), libboost-program-options-dev (>= 1.39.0), libboost-regex-dev (>= 1.39.0), libboost-filesystem-dev (>= 1.39.0), gettext, libcppunit-dev
Build-Depends-Indep: doxygen, graphviz
Standards-Version: 3.9.1
Vcs-Browser: http://git.debian.org/?p=buildd-tools/schroot.git
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,12 @@ else
BTRFSSNAP_OPTIONS = --enable-btrfs-snapshot
endif
+ifneq ($(DEB_HOST_ARCH_OS),kfreebsd)
+ UUID_OPTIONS = --enable-uuid
+else
+ UUID_OPTIONS = --enable-uuid=no
+endif
+
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -44,7 +50,7 @@ debian/build/config.status: configure
--enable-dchroot --enable-dchroot-dsa \
--enable-static --disable-shared \
--with-bash-completion-dir=/etc/bash_completion.d \
- $(LVMSNAP_OPTIONS) $(BTRFSSNAP_OPTIONS) \
+ $(LVMSNAP_OPTIONS) $(BTRFSSNAP_OPTIONS) $(UUID_OPTIONS) \
BTRFS=/sbin/btrfs \
BTRFSCTL=/sbin/btrfsctl \
LVCREATE=/sbin/lvcreate \
Reply to: