[Glibc-bsd-commits] r3525 - in trunk/freebsd-utils/debian: . patches

[Robert Millan]

Author: rmh
Date: 2011-07-03 13:33:31 +0000 (Sun, 03 Jul 2011)
New Revision: 3525

Added:
   trunk/freebsd-utils/debian/patches/037_mount_autofs.diff
Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/patches/004_kldconfig.diff
   trunk/freebsd-utils/debian/patches/series
   trunk/freebsd-utils/debian/rules
Log:
Add __FreeBSD_version to CFLAGS.  This enables code in a few places that was previously disabled (or old version used instead).

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2011-07-03 11:53:34 UTC (rev 3524)
+++ trunk/freebsd-utils/debian/changelog	2011-07-03 13:33:31 UTC (rev 3525)
@@ -1,8 +1,10 @@
 freebsd-utils (8.2+ds2-1) UNRELEASED; urgency=low
 
   * Add NFS client and server support packages.  (Closes: #629543)
+  * Add __FreeBSD_version to CFLAGS.  This enables code in a few places
+    that was previously disabled (or old version used instead).
 
- -- Robert Millan <rmh at debian.org>  Wed, 29 Jun 2011 17:14:59 +0200
+ -- Robert Millan <rmh at debian.org>  Sun, 03 Jul 2011 15:25:38 +0200
 
 freebsd-utils (8.2+ds1-2) unstable; urgency=low
 

Modified: trunk/freebsd-utils/debian/patches/004_kldconfig.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/004_kldconfig.diff	2011-07-03 11:53:34 UTC (rev 3524)
+++ trunk/freebsd-utils/debian/patches/004_kldconfig.diff	2011-07-03 13:33:31 UTC (rev 3525)
@@ -1,30 +1,7 @@
----
- sbin/kldconfig/Makefile    |    1 +
- sbin/kldconfig/kldconfig.c |   12 +++---------
- sbin/kldload/Makefile      |    1 +
- sbin/kldunload/Makefile    |    1 +
- 4 files changed, 6 insertions(+), 9 deletions(-)
-
 --- a/sbin/kldconfig/kldconfig.c
 +++ b/sbin/kldconfig/kldconfig.c
-@@ -40,15 +40,6 @@
- #include <string.h>
- #include <unistd.h>
+@@ -208,7 +208,7 @@
  
--#if defined(__FreeBSD_version)
--#if __FreeBSD_version < 500000
--#define NEED_SLASHTERM
--#endif /* < 500000 */
--#else  /* defined(__FreeBSD_version) */
--/* just in case.. */
--#define NEED_SLASHTERM
--#endif /* defined(__FreeBSD_version) */
--
- /* the default sysctl name */
- #define PATHCTL	"kern.module_path"
- 
-@@ -208,7 +199,7 @@
- 
  /* Remove a path component from the module search path */
  static void
 -rempath(struct pathhead *pathq, char *path, int force, int insert __unused)

Added: trunk/freebsd-utils/debian/patches/037_mount_autofs.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/037_mount_autofs.diff	                        (rev 0)
+++ trunk/freebsd-utils/debian/patches/037_mount_autofs.diff	2011-07-03 13:33:31 UTC (rev 3525)
@@ -0,0 +1,13 @@
+--- a/sbin/mount_autofs/mount_autofs.c
++++ b/sbin/mount_autofs/mount_autofs.c
+@@ -69,8 +69,8 @@
+ mymount(
+ 	const char *type,
+ 	const char *dir,
+-	int flags __unused,
+-	void *data __unused
++	int flags,
++	void *data
+ )
+ {
+ 	struct iovec iov[4], *iovp;

Modified: trunk/freebsd-utils/debian/patches/series
===================================================================
--- trunk/freebsd-utils/debian/patches/series	2011-07-03 11:53:34 UTC (rev 3524)
+++ trunk/freebsd-utils/debian/patches/series	2011-07-03 13:33:31 UTC (rev 3525)
@@ -33,3 +33,4 @@
 034_devd_pci.diff
 035_nfs.diff
 036_nfs_glibc.diff
+037_mount_autofs.diff

Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules	2011-07-03 11:53:34 UTC (rev 3524)
+++ trunk/freebsd-utils/debian/rules	2011-07-03 13:33:31 UTC (rev 3525)
@@ -6,7 +6,8 @@
 #export DH_VERBOSE=1
 
 CFLAGS = -Wall -g -pipe -fPIC -I. -D_GNU_SOURCE -D__va_list=__builtin_va_list \
-	$(shell pkg-config --cflags libbsd-overlay) -isystem /usr/include/tirpc
+	$(shell pkg-config --cflags libbsd-overlay) -isystem /usr/include/tirpc \
+	-D__FreeBSD_version=802000
 CXXFLAGS = $(CFLAGS)
 
 ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))