[Glibc-bsd-commits] r6036 - in trunk/freebsd-libs/debian: . patches

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2016-05-06 09:52:36 +0000 (Fri, 06 May 2016)
New Revision: 6036

Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/libutil-freebsd-9.symbols
   trunk/freebsd-libs/debian/patches/makefiles.diff
Log:
* Build kinfo_getvmobject.c only on kfreebsd host architecture
* Also build kinfo_getvmmap.c (Closes: #823385) and the rest of
  kinfo_* functions, on kfreebsd only


Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2016-05-04 20:57:34 UTC (rev 6035)
+++ trunk/freebsd-libs/debian/changelog	2016-05-06 09:52:36 UTC (rev 6036)
@@ -1,3 +1,11 @@
+freebsd-libs (10.3~svn296373-5) UNRELEASED; urgency=medium
+
+  * Build kinfo_getvmobject.c only on kfreebsd host architecture
+  * Also build kinfo_getvmmap.c (Closes: #823385) and the rest of
+    kinfo_* functions, on kfreebsd only
+
+ -- Steven Chamberlain <steven at pyro.eu.org>  Fri, 06 May 2016 10:36:46 +0100
+
 freebsd-libs (10.3~svn296373-4) experimental; urgency=medium
 
   * Use new preferred hostname for upstream SVN with HTTPS

Modified: trunk/freebsd-libs/debian/libutil-freebsd-9.symbols
===================================================================
--- trunk/freebsd-libs/debian/libutil-freebsd-9.symbols	2016-05-04 20:57:34 UTC (rev 6035)
+++ trunk/freebsd-libs/debian/libutil-freebsd-9.symbols	2016-05-06 09:52:36 UTC (rev 6036)
@@ -18,6 +18,10 @@
  gr_tmp at Base 9.2
  hexdump at Base 9.2
  humanize_number at Base 9.2
+ kinfo_getallproc at Base 10.3~svn296373-5
+ kinfo_getfile at Base 10.3~svn296373-5
+ kinfo_getproc at Base 10.3~svn296373-5
+ kinfo_getvmmap at Base 10.3~svn296373-5
  kinfo_getvmobject at Base 10.3~svn296373-4
  (arch=kfreebsd-any)login_close at Base 9.2
  (arch=kfreebsd-any)login_getcapbool at Base 9.2

Modified: trunk/freebsd-libs/debian/patches/makefiles.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/makefiles.diff	2016-05-04 20:57:34 UTC (rev 6035)
+++ trunk/freebsd-libs/debian/patches/makefiles.diff	2016-05-06 09:52:36 UTC (rev 6036)
@@ -19,7 +19,7 @@
  MLINKS+= \
 --- a/lib/libutil/Makefile
 +++ b/lib/libutil/Makefile
-@@ -5,16 +5,12 @@
+@@ -5,16 +5,11 @@
  
  .include <bsd.own.mk>
  
@@ -35,17 +35,19 @@
 -	login_class.c login_crypt.c login_ok.c login_times.c login_tty.c \
 -	pidfile.c property.c pty.c pw_util.c quotafile.c realhostname.c \
 +	hexdump.c humanize_number.c \
-+	kinfo_getvmobject.c \
  	stub.c trimdomain.c uucplock.c
  INCS=	libutil.h login_cap.h
  
-@@ -26,6 +22,14 @@
+@@ -26,6 +21,17 @@
  
  CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../libc/gen/
  
 +OS!=	dpkg-architecture -qDEB_HOST_GNU_SYSTEM
 +.if ${OS} == "kfreebsd-gnu"
 +SRCS+=	login_cap.c login_class.c \
++	kinfo_getfile.c \
++	kinfo_getallproc.c kinfo_getproc.c kinfo_getvmmap.c \
++	kinfo_getvmobject.c \
 +	pidfile.c
 +.endif
 +