From: Tollef Fog Heen <tfheen@err.no>
Date: Wed, 16 Jul 2014 18:56:27 +0000 (+0200)
Subject: s/ifdef HAVE_LINUX/if in sash.c for freebsd
X-Git-Tag: debian/3.8-2~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8cda1ebbea43e7612a6439bf0454333a672904a;p=sash

s/ifdef HAVE_LINUX/if in sash.c for freebsd
---

diff --git a/debian/patches/freebsd_build b/debian/patches/freebsd_build
index b955802..babb8e0 100644
--- a/debian/patches/freebsd_build
+++ b/debian/patches/freebsd_build
@@ -4,8 +4,8 @@ Bug-Debian: #565539
 Last-updated: 2010-04-04
 Index: git/Makefile
 ===================================================================
---- git.orig/Makefile	2014-04-20 08:52:12.397361252 +0200
-+++ git/Makefile	2014-04-20 08:53:32.416679945 +0200
+--- git.orig/Makefile
++++ git/Makefile
 @@ -19,6 +19,7 @@
  #
  
@@ -14,7 +14,7 @@ Index: git/Makefile
  HAVE_LINUX_ATTR		= 1
  HAVE_LINUX_CHROOT	= 1
  HAVE_LINUX_LOSETUP	= 1
-@@ -26,6 +27,16 @@
+@@ -26,6 +27,16 @@ HAVE_LINUX_PIVOT	= 1
  HAVE_LINUX_MOUNT	= 1
  HAVE_BSD_MOUNT		= 0
  MOUNT_TYPE		= '"ext3"'
@@ -33,8 +33,8 @@ Index: git/Makefile
  
 Index: git/cmds.c
 ===================================================================
---- git.orig/cmds.c	2014-04-20 08:52:12.397361252 +0200
-+++ git/cmds.c	2014-04-20 08:52:12.397361252 +0200
+--- git.orig/cmds.c
++++ git/cmds.c
 @@ -19,6 +19,10 @@
  
  #if	HAVE_LINUX_MOUNT
@@ -46,3 +46,34 @@ Index: git/cmds.c
  #endif
  
  /* Need to tell loop.h what the actual dev_t type is. */
+Index: git/sash.c
+===================================================================
+--- git.orig/sash.c
++++ git/sash.c
+@@ -107,7 +107,7 @@ static const CommandEntry	commandEntryTa
+ 		"srcName ... destName"
+ 	},
+ 
+-#ifdef	HAVE_LINUX_CHROOT
++#if	HAVE_LINUX_CHROOT
+ 	{
+ 		"-chroot",	do_chroot,	2,	2,
+ 		"change root file system",
+@@ -189,7 +189,7 @@ static const CommandEntry	commandEntryTa
+ 		"[-sig] pid ..."
+ 	},
+ 
+-#ifdef	HAVE_LINUX_LOSETUP
++#if	HAVE_LINUX_LOSETUP
+ 	{
+ 		"-losetup",	do_losetup,	3,	3,
+ 		"Associate a loopback device with a file",
+@@ -253,7 +253,7 @@ static const CommandEntry	commandEntryTa
+ 		"srcName ... destName"
+ 	},
+ 
+-#ifdef	HAVE_LINUX_PIVOT
++#if	HAVE_LINUX_PIVOT
+ 	{
+ 		"-pivot_root",	do_pivot_root,	3,	3,
+ 		"pivot the root file system",