[Glibc-bsd-commits] r5189 - in trunk/freebsd-utils/debian: . patches
rmh at alioth.debian.org
rmh at alioth.debian.org
Sat Nov 30 00:03:04 UTC 2013
Author: rmh
Date: 2013-11-30 00:03:04 +0000 (Sat, 30 Nov 2013)
New Revision: 5189
Added:
trunk/freebsd-utils/debian/patches/makefiles.diff
Removed:
trunk/freebsd-utils/debian/patches/027_pppctl.diff
trunk/freebsd-utils/debian/patches/029_arp.diff
trunk/freebsd-utils/debian/patches/031_savecore.diff
Modified:
trunk/freebsd-utils/debian/changelog
trunk/freebsd-utils/debian/patches/021_netstat.diff
trunk/freebsd-utils/debian/patches/035_nfs.diff
trunk/freebsd-utils/debian/patches/039_geom.diff
trunk/freebsd-utils/debian/patches/series
trunk/freebsd-utils/debian/rules
Log:
Remove a few gratuitous library dependencies.
Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog 2013-11-29 23:44:19 UTC (rev 5188)
+++ trunk/freebsd-utils/debian/changelog 2013-11-30 00:03:04 UTC (rev 5189)
@@ -7,6 +7,7 @@
* Remove cons25 transition kludge (was only needed for squeeze->wheezy
upgrades).
* Fix permissions for /dev/dri/card* devices.
+ * Remove a few gratuitous library dependencies.
[ Guillem Jover ]
* Remove myself from Uploaders.
Modified: trunk/freebsd-utils/debian/patches/021_netstat.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/021_netstat.diff 2013-11-29 23:44:19 UTC (rev 5188)
+++ trunk/freebsd-utils/debian/patches/021_netstat.diff 2013-11-30 00:03:04 UTC (rev 5189)
@@ -33,13 +33,3 @@
extern int Aflag; /* show addresses of protocol control block */
extern int aflag; /* show all sockets (including servers) */
extern int bflag; /* show i/f total bytes in/out */
---- a/usr.bin/netstat/Makefile
-+++ b/usr.bin/netstat/Makefile
-@@ -30,6 +30,7 @@
- BINMODE=2555
- DPADD= ${LIBKVM} ${LIBMEMSTAT} ${LIBUTIL}
- LDADD= -lkvm -lmemstat -lutil
-+LDADD+= -lrt -lbsd -lfreebsd-glue
-
- .if ${MK_NETGRAPH_SUPPORT} != "no"
- SRCS+= netgraph.c
Deleted: trunk/freebsd-utils/debian/patches/027_pppctl.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/027_pppctl.diff 2013-11-29 23:44:19 UTC (rev 5188)
+++ trunk/freebsd-utils/debian/patches/027_pppctl.diff 2013-11-30 00:03:04 UTC (rev 5189)
@@ -1,15 +0,0 @@
----
- usr.sbin/pppctl/Makefile | 2 +-
- usr.sbin/pppctl/pppctl.c | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
---- a/usr.sbin/pppctl/Makefile
-+++ b/usr.sbin/pppctl/Makefile
-@@ -6,6 +6,6 @@
- WARNS?= 2
-
- DPADD= ${LIBPTHREAD} ${LIBEDIT} ${LIBTERMCAP}
--LDADD= -lpthread -ledit -ltermcap
-+LDADD= -lpthread -ledit -ltermcap -lbsd
-
- .include <bsd.prog.mk>
Deleted: trunk/freebsd-utils/debian/patches/029_arp.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/029_arp.diff 2013-11-29 23:44:19 UTC (rev 5188)
+++ trunk/freebsd-utils/debian/patches/029_arp.diff 2013-11-30 00:03:04 UTC (rev 5189)
@@ -1,10 +0,0 @@
---- a/usr.sbin/arp/Makefile
-+++ b/usr.sbin/arp/Makefile
-@@ -3,6 +3,7 @@
-
- PROG= arp
- MAN= arp.4 arp.8
-+LDADD+= -lrt
-
- WARNS?= 3
-
Deleted: trunk/freebsd-utils/debian/patches/031_savecore.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/031_savecore.diff 2013-11-29 23:44:19 UTC (rev 5188)
+++ trunk/freebsd-utils/debian/patches/031_savecore.diff 2013-11-30 00:03:04 UTC (rev 5189)
@@ -1,13 +0,0 @@
---- a/sbin/savecore/Makefile
-+++ b/sbin/savecore/Makefile
-@@ -1,8 +1,9 @@
- # $FreeBSD$
-
- PROG= savecore
-+SRCS= savecore.c
- DPADD= ${LIBZ}
--LDADD= -lz
-+LDADD= -lz -lfreebsd-glue
- MAN= savecore.8
-
- .include <bsd.prog.mk>
Modified: trunk/freebsd-utils/debian/patches/035_nfs.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/035_nfs.diff 2013-11-29 23:44:19 UTC (rev 5188)
+++ trunk/freebsd-utils/debian/patches/035_nfs.diff 2013-11-30 00:03:04 UTC (rev 5189)
@@ -50,33 +50,6 @@
return (1);
}
---- a/sbin/mount_nfs/Makefile
-+++ b/sbin/mount_nfs/Makefile
-@@ -4,6 +4,7 @@
-
- PROG= mount_nfs
- SRCS= mount_nfs.c getmntopts.c mounttab.c
-+LDADD= -ltirpc -lfreebsd-glue
- MAN= mount_nfs.8
- MLINKS= mount_nfs.8 mount_oldnfs.8
-
---- a/usr.sbin/mountd/Makefile
-+++ b/usr.sbin/mountd/Makefile
-@@ -6,12 +6,12 @@
- MAN= exports.5 netgroup.5 mountd.8
-
- MOUNT= ${.CURDIR}/../../sbin/mount
--CFLAGS+= -I${MOUNT}
-+CFLAGS+= -I${MOUNT} -I${.CURDIR}/../../sys
- WARNS?= 2
-
- .PATH: ${MOUNT}
-
- DPADD= ${LIBUTIL}
--LDADD= -lutil
-+LDADD= -ltirpc -lbsd -lfreebsd-glue
-
- .include <bsd.prog.mk>
--- a/usr.sbin/mountd/mountd.c
+++ b/usr.sbin/mountd/mountd.c
@@ -2118,12 +2118,18 @@
Modified: trunk/freebsd-utils/debian/patches/039_geom.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/039_geom.diff 2013-11-29 23:44:19 UTC (rev 5188)
+++ trunk/freebsd-utils/debian/patches/039_geom.diff 2013-11-30 00:03:04 UTC (rev 5189)
@@ -1,22 +1,3 @@
---- a/sbin/geom/Makefile.inc
-+++ b/sbin/geom/Makefile.inc
-@@ -1,5 +1,3 @@
- # $FreeBSD$
-
- GEOM_CLASS_DIR?=/lib/geom
--
--.include "../Makefile.inc"
---- a/sbin/geom/class/eli/Makefile
-+++ b/sbin/geom/class/eli/Makefile
-@@ -9,7 +9,7 @@
- SRCS+= sha2.c
-
- DPADD= ${LIBMD} ${LIBCRYPTO}
--LDADD= -lmd -lcrypto
-+LDADD= -lcrypto
-
- WARNS?= 3
-
--- a/sbin/geom/misc/subr.c
+++ b/sbin/geom/misc/subr.c
@@ -177,7 +177,7 @@
@@ -28,77 +9,6 @@
return (ERANGE);
number *= mult * unit;
if (number % sectorsize)
---- a/sbin/geom/Makefile
-+++ b/sbin/geom/Makefile
-@@ -15,7 +15,7 @@
- CFLAGS+=-I${.CURDIR} -I${.CURDIR}/core -DSTATIC_GEOM_CLASSES
-
- DPADD= ${LIBGEOM} ${LIBSBUF} ${LIBBSDXML} ${LIBUTIL}
--LDADD= -lgeom -lsbuf -lbsdxml -lutil
-+LDADD= -lgeom -lsbuf -lexpat -lutil
-
- .include <bsd.prog.mk>
-
---- a/sbin/geom/class/Makefile
-+++ b/sbin/geom/class/Makefile
-@@ -7,18 +7,14 @@
- .if ${MK_OPENSSL} != "no"
- SUBDIR+=eli
- .endif
--SUBDIR+=journal
- SUBDIR+=label
- SUBDIR+=mirror
- SUBDIR+=mountver
--SUBDIR+=multipath
- SUBDIR+=nop
--SUBDIR+=part
- SUBDIR+=raid
- SUBDIR+=raid3
- SUBDIR+=sched
- SUBDIR+=shsec
- SUBDIR+=stripe
--SUBDIR+=virstor
-
- .include <bsd.subdir.mk>
---- a/sbin/geom/class/mirror/Makefile
-+++ b/sbin/geom/class/mirror/Makefile
-@@ -5,6 +5,6 @@
- GEOM_CLASS= mirror
-
- DPADD= ${LIBMD}
--LDADD= -lmd
-+#LDADD= -lmd
-
- .include <bsd.lib.mk>
---- a/sbin/geom/class/raid3/Makefile
-+++ b/sbin/geom/class/raid3/Makefile
-@@ -5,6 +5,6 @@
- GEOM_CLASS= raid3
-
- DPADD= ${LIBMD}
--LDADD= -lmd
-+#LDADD= -lmd
-
- .include <bsd.lib.mk>
---- a/sbin/geom/core/Makefile
-+++ b/sbin/geom/core/Makefile
-@@ -4,7 +4,7 @@
-
- PROG= geom
- MAN= geom.8
--SRCS= geom.c subr.c
-+SRCS= geom.c subr.c expand_number.c
-
- NO_SHARED=NO
-
-@@ -12,6 +12,6 @@
- CFLAGS+= -I${.CURDIR}/../../../sys -I${.CURDIR} -I${.CURDIR}/..
-
- DPADD= ${LIBGEOM} ${LIBSBUF} ${LIBBSDXML} ${LIBUTIL}
--LDADD= -lgeom -lsbuf -lbsdxml -lutil
-+LDADD= -lgeom -ldl
-
- .include <bsd.prog.mk>
--- /dev/null
+++ b/sbin/geom/core/expand_number.c
@@ -0,0 +1,101 @@
@@ -217,13 +127,3 @@
#endif
---- a/sbin/geom/class/raid/Makefile
-+++ b/sbin/geom/class/raid/Makefile
-@@ -5,6 +5,6 @@
- GEOM_CLASS= raid
-
- DPADD= ${LIBMD}
--LDADD= -lmd
-+#LDADD= -lmd
-
- .include <bsd.lib.mk>
Added: trunk/freebsd-utils/debian/patches/makefiles.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/makefiles.diff (rev 0)
+++ trunk/freebsd-utils/debian/patches/makefiles.diff 2013-11-30 00:03:04 UTC (rev 5189)
@@ -0,0 +1,201 @@
+--- a/sbin/savecore/Makefile
++++ b/sbin/savecore/Makefile
+@@ -2,7 +2,7 @@
+
+ PROG= savecore
+ DPADD= ${LIBZ}
+-LDADD= -lz
++LDADD= -lz -lz-freebsd -lfreebsd-glue -lbsd
+ MAN= savecore.8
+
+ .include <bsd.prog.mk>
+--- a/sbin/geom/class/raid/Makefile
++++ b/sbin/geom/class/raid/Makefile
+@@ -5,6 +5,6 @@
+ GEOM_CLASS= raid
+
+ DPADD= ${LIBMD}
+-LDADD= -lmd
++#LDADD= -lmd
+
+ .include <bsd.lib.mk>
+--- a/sbin/geom/Makefile.inc
++++ b/sbin/geom/Makefile.inc
+@@ -1,5 +1,3 @@
+ # $FreeBSD$
+
+ GEOM_CLASS_DIR?=/lib/geom
+-
+-.include "../Makefile.inc"
+--- a/sbin/geom/class/eli/Makefile
++++ b/sbin/geom/class/eli/Makefile
+@@ -9,7 +9,7 @@
+ SRCS+= sha2.c
+
+ DPADD= ${LIBMD} ${LIBCRYPTO}
+-LDADD= -lmd -lcrypto
++LDADD= -lcrypto
+
+ WARNS?= 3
+
+--- a/sbin/geom/Makefile
++++ b/sbin/geom/Makefile
+@@ -15,7 +15,7 @@
+ CFLAGS+=-I${.CURDIR} -I${.CURDIR}/core -DSTATIC_GEOM_CLASSES
+
+ DPADD= ${LIBGEOM} ${LIBSBUF} ${LIBBSDXML} ${LIBUTIL}
+-LDADD= -lgeom -lsbuf -lbsdxml -lutil
++LDADD= -lgeom -lsbuf -lexpat -lutil
+
+ .include <bsd.prog.mk>
+
+--- a/sbin/geom/class/Makefile
++++ b/sbin/geom/class/Makefile
+@@ -7,18 +7,14 @@
+ .if ${MK_OPENSSL} != "no"
+ SUBDIR+=eli
+ .endif
+-SUBDIR+=journal
+ SUBDIR+=label
+ SUBDIR+=mirror
+ SUBDIR+=mountver
+-SUBDIR+=multipath
+ SUBDIR+=nop
+-SUBDIR+=part
+ SUBDIR+=raid
+ SUBDIR+=raid3
+ SUBDIR+=sched
+ SUBDIR+=shsec
+ SUBDIR+=stripe
+-SUBDIR+=virstor
+
+ .include <bsd.subdir.mk>
+--- a/sbin/geom/class/mirror/Makefile
++++ b/sbin/geom/class/mirror/Makefile
+@@ -5,6 +5,6 @@
+ GEOM_CLASS= mirror
+
+ DPADD= ${LIBMD}
+-LDADD= -lmd
++#LDADD= -lmd
+
+ .include <bsd.lib.mk>
+--- a/sbin/geom/class/raid3/Makefile
++++ b/sbin/geom/class/raid3/Makefile
+@@ -5,6 +5,6 @@
+ GEOM_CLASS= raid3
+
+ DPADD= ${LIBMD}
+-LDADD= -lmd
++#LDADD= -lmd
+
+ .include <bsd.lib.mk>
+--- a/sbin/geom/core/Makefile
++++ b/sbin/geom/core/Makefile
+@@ -4,7 +4,7 @@
+
+ PROG= geom
+ MAN= geom.8
+-SRCS= geom.c subr.c
++SRCS= geom.c subr.c expand_number.c
+
+ NO_SHARED=NO
+
+@@ -12,6 +12,6 @@
+ CFLAGS+= -I${.CURDIR}/../../../sys -I${.CURDIR} -I${.CURDIR}/..
+
+ DPADD= ${LIBGEOM} ${LIBSBUF} ${LIBBSDXML} ${LIBUTIL}
+-LDADD= -lgeom -lsbuf -lbsdxml -lutil
++LDADD= -lgeom -ldl -lbsd
+
+ .include <bsd.prog.mk>
+--- a/usr.sbin/pppctl/Makefile
++++ b/usr.sbin/pppctl/Makefile
+@@ -6,6 +6,6 @@
+ WARNS?= 2
+
+ DPADD= ${LIBPTHREAD} ${LIBEDIT} ${LIBTERMCAP}
+-LDADD= -lpthread -ledit -ltermcap
++LDADD= -lpthread -ledit -lbsd
+
+ .include <bsd.prog.mk>
+--- a/sbin/mount_nfs/Makefile
++++ b/sbin/mount_nfs/Makefile
+@@ -4,6 +4,7 @@
+
+ PROG= mount_nfs
+ SRCS= mount_nfs.c getmntopts.c mounttab.c
++LDADD= -ltirpc -lfreebsd-glue
+ MAN= mount_nfs.8
+ MLINKS= mount_nfs.8 mount_oldnfs.8
+
+--- a/usr.sbin/mountd/Makefile
++++ b/usr.sbin/mountd/Makefile
+@@ -6,12 +6,12 @@
+ MAN= exports.5 netgroup.5 mountd.8
+
+ MOUNT= ${.CURDIR}/../../sbin/mount
+-CFLAGS+= -I${MOUNT}
++CFLAGS+= -I${MOUNT} -I${.CURDIR}/../../sys
+ WARNS?= 2
+
+ .PATH: ${MOUNT}
+
+ DPADD= ${LIBUTIL}
+-LDADD= -lutil
++LDADD= -ltirpc -lbsd
+
+ .include <bsd.prog.mk>
+--- a/usr.sbin/arp/Makefile
++++ b/usr.sbin/arp/Makefile
+@@ -3,6 +3,7 @@
+
+ PROG= arp
+ MAN= arp.4 arp.8
++LDADD+= -lrt -lfreebsd-glue
+
+ WARNS?= 3
+
+--- a/usr.bin/netstat/Makefile
++++ b/usr.bin/netstat/Makefile
+@@ -29,7 +29,8 @@
+ BINGRP= kmem
+ BINMODE=2555
+ DPADD= ${LIBKVM} ${LIBMEMSTAT} ${LIBUTIL}
+-LDADD= -lkvm -lmemstat -lutil
++LDADD= -lkvm -lmemstat -lutil-freebsd
++LDADD+= -lrt -lfreebsd-glue
+
+ .if ${MK_NETGRAPH_SUPPORT} != "no"
+ SRCS+= netgraph.c
+--- a/sbin/atacontrol/Makefile
++++ b/sbin/atacontrol/Makefile
+@@ -3,4 +3,6 @@
+ PROG= atacontrol
+ MAN= atacontrol.8
+
++LDADD+= -lfreebsd-glue
++
+ .include <bsd.prog.mk>
+--- a/sbin/umount/Makefile
++++ b/sbin/umount/Makefile
+@@ -6,6 +6,8 @@
+ SRCS= umount.c vfslist.c mounttab.c
+ MAN= umount.8
+
++LDADD+= -lfreebsd-glue
++
+ MOUNT= ${.CURDIR}/../mount
+ UMNTALL= ${.CURDIR}/../../usr.sbin/rpc.umntall
+ CFLAGS+= -I${MOUNT} -I${UMNTALL}
+--- a/sbin/route/Makefile
++++ b/sbin/route/Makefile
+@@ -9,6 +9,8 @@
+ WARNS?= 3
+ CLEANFILES+=keywords.h _keywords.tmp
+
++LDADD+= -lfreebsd-glue
++
+ CFLAGS+= -DNS
+
+ .if ${MK_INET6_SUPPORT} != "no"
Modified: trunk/freebsd-utils/debian/patches/series
===================================================================
--- trunk/freebsd-utils/debian/patches/series 2013-11-29 23:44:19 UTC (rev 5188)
+++ trunk/freebsd-utils/debian/patches/series 2013-11-30 00:03:04 UTC (rev 5189)
@@ -32,10 +32,7 @@
024_devfs.diff
025_camcontrol.diff
026_kdump.diff
-027_pppctl.diff
028_vidcontrol.diff
-029_arp.diff
-031_savecore.diff
035_nfs.diff
038_jail.diff
039_geom.diff
@@ -47,3 +44,4 @@
# Patches that are likely to be Debian-specific
ifr_fib_kludge.diff
+makefiles.diff
Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules 2013-11-29 23:44:19 UTC (rev 5188)
+++ trunk/freebsd-utils/debian/rules 2013-11-30 00:03:04 UTC (rev 5189)
@@ -38,7 +38,7 @@
PATH := /usr/lib/freebsd:$(PATH)
DESTDIR = $(CURDIR)/debian/tmp
-PMAKE = COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS)" LDADD="-lfreebsd-glue" \
+PMAKE = COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS)" \
NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO \
DESTDIR=$(DESTDIR) make
More information about the Glibc-bsd-commits
mailing list