[Glibc-bsd-commits] r3369 - in trunk/ufsutils/debian: . patches

[Guillem Jover]

Author: guillem
Date: 2011-05-30 22:29:49 +0000 (Mon, 30 May 2011)
New Revision: 3369

Modified:
   trunk/ufsutils/debian/changelog
   trunk/ufsutils/debian/patches/99_makefiles.patch
   trunk/ufsutils/debian/rules
Log:
Always set -I../../sys, even on GNU/kFreeBSD systems


Modified: trunk/ufsutils/debian/changelog
===================================================================
--- trunk/ufsutils/debian/changelog	2011-05-30 21:09:40 UTC (rev 3368)
+++ trunk/ufsutils/debian/changelog	2011-05-30 22:29:49 UTC (rev 3369)
@@ -28,6 +28,7 @@
   * Use dpkg-buildflags to set CPPFLAGS, CFLAGS and LDFLAGS.
     Based on a patch by Peter Pentchev.
   * Remove bogus reference to BSD license in /usr/share/common-licenses.
+  * Always set -I../../sys, even on GNU/kFreeBSD systems.
 
   [ Peter Pentchev ]
   * Remove duplicate section “utils” from ufsutils binary package.

Modified: trunk/ufsutils/debian/patches/99_makefiles.patch
===================================================================
--- trunk/ufsutils/debian/patches/99_makefiles.patch	2011-05-30 21:09:40 UTC (rev 3368)
+++ trunk/ufsutils/debian/patches/99_makefiles.patch	2011-05-30 22:29:49 UTC (rev 3369)
@@ -50,7 +50,7 @@
 +
 +#LDADD += -lbsd
 +CFLAGS ?= -Wall -g -O2
-+ALL_CFLAGS += -I../../port -include port.h -include bsd/bsd.h -D_GNU_SOURCE
++ALL_CFLAGS +=  -I../../sys -I../../port -include port.h -include bsd/bsd.h -D_GNU_SOURCE
 +# -DHAVE_BSD_ERRNO -DHAVE_BSD_SIGNALS -DHAVE_BSD_STATFS -DHAVE_BSD_DISKLABEL -DHAVE_BSD_MOUNT -DHAVE_UFS_SNAPSHOT -DHAVE_BSD_SYSCTL
 +
 +INSTALL = install

Modified: trunk/ufsutils/debian/rules
===================================================================
--- trunk/ufsutils/debian/rules	2011-05-30 21:09:40 UTC (rev 3368)
+++ trunk/ufsutils/debian/rules	2011-05-30 22:29:49 UTC (rev 3369)
@@ -19,7 +19,7 @@
 ifneq (kfreebsd,$(DEB_HOST_ARCH_OS))
 # really only on other systems, as GNU/kFreeBSD already have off_t 64bit
 # on GNU/kFreeBSD it must not be enabled, as it would change size of ino_t
-CFLAGS += -D_FILE_OFFSET_BITS=64 -I$(CURDIR)/sys
+CFLAGS += -D_FILE_OFFSET_BITS=64
 endif
 
 SOURCE = $(shell dpkg-parsechangelog | sed -e '/^Source:/!d' -e 's/^Source: //g')