[Glibc-bsd-commits] r3370 - trunk/ufsutils/debian/patches

[Guillem Jover]

Author: guillem
Date: 2011-05-31 01:48:42 +0000 (Tue, 31 May 2011)
New Revision: 3370

Modified:
   trunk/ufsutils/debian/patches/00_libport.patch
   trunk/ufsutils/debian/patches/02_dump.ufs.patch
   trunk/ufsutils/debian/patches/02_fsck.ufs.patch
   trunk/ufsutils/debian/patches/02_mkfs.ufs.patch
   trunk/ufsutils/debian/patches/99_makefiles.patch
Log:
Move port/ to lib/port/

This allows to cleanly build on all systems, regardless of presence of
FreeBSD kernel /usr/include/sys/ headers. And to not include paths from
outside the build-tree.


Modified: trunk/ufsutils/debian/patches/00_libport.patch
===================================================================
--- trunk/ufsutils/debian/patches/00_libport.patch	2011-05-30 22:29:49 UTC (rev 3369)
+++ trunk/ufsutils/debian/patches/00_libport.patch	2011-05-31 01:48:42 UTC (rev 3370)
@@ -1,13 +1,13 @@
 ---
- port/Makefile       |   12 ++++++
- port/blockdev.c     |   92 ++++++++++++++++++++++++++++++++++++++++++++++++++++
- port/blockdev.h     |    8 ++++
- port/getdisklabel.c |    7 +++
- port/port.h         |   22 ++++++++++++
+ lib/port/Makefile       |   12 ++++++
+ lib/port/blockdev.c     |   92 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ lib/port/blockdev.h     |    8 ++++
+ lib/port/getdisklabel.c |    7 +++
+ lib/port/port.h         |   22 ++++++++++++
  5 files changed, 141 insertions(+)
 
 --- /dev/null
-+++ b/port/getdisklabel.c
++++ b/lib/port/getdisklabel.c
 @@ -0,0 +1,7 @@
 +#include <stdlib.h>
 +#include <sys/disklabel.h>
@@ -17,7 +17,7 @@
 +	return NULL;
 +}
 --- /dev/null
-+++ b/port/port.h
++++ b/lib/port/port.h
 @@ -0,0 +1,22 @@
 +#ifndef LIBPORT_H
 +#define LIBPORT_H
@@ -42,7 +42,7 @@
 +
 +#endif
 --- /dev/null
-+++ b/port/blockdev.c
++++ b/lib/port/blockdev.c
 @@ -0,0 +1,92 @@
 +/*
 + * Copyright (C) 2004 Guillem Jover <guillem at debian.org>
@@ -137,7 +137,7 @@
 +	return size;
 +}
 --- /dev/null
-+++ b/port/blockdev.h
++++ b/lib/port/blockdev.h
 @@ -0,0 +1,8 @@
 +#ifndef LIBPORT_BLOCKDEV_H
 +#define LIBPORT_BLOCKDEV_H
@@ -148,7 +148,7 @@
 +
 +#endif
 --- /dev/null
-+++ b/port/Makefile
++++ b/lib/port/Makefile
 @@ -0,0 +1,12 @@
 +LIB = port
 +LIB_type = static
@@ -161,4 +161,4 @@
 +
 +INCLUDES =
 +
-+include ../Makefile.common
++include ../../Makefile.common

Modified: trunk/ufsutils/debian/patches/02_dump.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_dump.ufs.patch	2011-05-30 22:29:49 UTC (rev 3369)
+++ trunk/ufsutils/debian/patches/02_dump.ufs.patch	2011-05-31 01:48:42 UTC (rev 3370)
@@ -16,7 +16,7 @@
 +
 +ALL_CFLAGS = -DRDUMP
 +
-+LDADD += -L../../lib/libufs -lufs -L../../port -lport
++LDADD += -L../../lib/libufs -lufs -L../../lib/port -lport
 +INCLUDES = -I../../sys -I${CURDIR}/../../libexec/rlogind
 +
 +include ../../Makefile.common

Modified: trunk/ufsutils/debian/patches/02_fsck.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_fsck.ufs.patch	2011-05-30 22:29:49 UTC (rev 3369)
+++ trunk/ufsutils/debian/patches/02_fsck.ufs.patch	2011-05-31 01:48:42 UTC (rev 3370)
@@ -518,7 +518,7 @@
 +	../mount/getmntopts.c
  
 -.PATH:	${.CURDIR}/../../sys/ufs/ffs ${.CURDIR}/../mount
-+LDADD += -L../../port -lport -L. -l$(LIB) -L../../lib/libufs -lufs -lbsd
++LDADD += -L../../lib/port -lport -L. -l$(LIB) -L../../lib/libufs -lufs -lbsd
 +INCLUDES = -I. -I../../lib/libufs -I../mount
 +
 +include ../../Makefile.common

Modified: trunk/ufsutils/debian/patches/02_mkfs.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_mkfs.ufs.patch	2011-05-30 22:29:49 UTC (rev 3369)
+++ trunk/ufsutils/debian/patches/02_mkfs.ufs.patch	2011-05-31 01:48:42 UTC (rev 3370)
@@ -115,8 +115,8 @@
 -MAN=	newfs.8
 +MAN=	newfs.8:mkfs.ufs.8
 +
-+LDADD += -L../../lib/libufs -lufs -L../../port -lport -lbsd
-+INCLUDES = -I../../lib/libufs -include ../../port/blockdev.h
++LDADD += -L../../lib/libufs -lufs -L../../lib/port -lport -lbsd
++INCLUDES = -I../../lib/libufs -include ../../lib/port/blockdev.h
  
 -.include <bsd.prog.mk>
 +include ../../Makefile.common

Modified: trunk/ufsutils/debian/patches/99_makefiles.patch
===================================================================
--- trunk/ufsutils/debian/patches/99_makefiles.patch	2011-05-30 22:29:49 UTC (rev 3369)
+++ trunk/ufsutils/debian/patches/99_makefiles.patch	2011-05-31 01:48:42 UTC (rev 3370)
@@ -11,8 +11,8 @@
 +#
 +
 +#SUBDIRS = sbin/dump
-+SUBDIRS = port lib/libufs sbin/badsect sbin/dumpfs sbin/fsck_ffs sbin/fsdb \
-+	  sbin/growfs sbin/newfs sbin/tunefs sbin/ffsinfo
++SUBDIRS = lib/port lib/libufs sbin/badsect sbin/dumpfs sbin/fsck_ffs \
++	  sbin/fsdb sbin/growfs sbin/newfs sbin/tunefs sbin/ffsinfo
 +
 +clean_targets = $(addsuffix -clean,$(SUBDIRS))
 +install_targets = $(addsuffix -install,$(SUBDIRS))
@@ -50,7 +50,7 @@
 +
 +#LDADD += -lbsd
 +CFLAGS ?= -Wall -g -O2
-+ALL_CFLAGS +=  -I../../sys -I../../port -include port.h -include bsd/bsd.h -D_GNU_SOURCE
++ALL_CFLAGS +=  -I../../sys -I../../lib/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