[Glibc-bsd-commits] r5210 - in trunk/zfsutils/debian: . patches

rmh at alioth.debian.org rmh at alioth.debian.org
Sun Dec 1 13:03:12 UTC 2013 

Author: rmh
Date: 2013-12-01 13:03:11 +0000 (Sun, 01 Dec 2013)
New Revision: 5210

Removed:
   trunk/zfsutils/debian/patches/libmd_static.diff
Modified:
   trunk/zfsutils/debian/changelog
   trunk/zfsutils/debian/patches/makefile.diff
   trunk/zfsutils/debian/patches/series
   trunk/zfsutils/debian/rules
   trunk/zfsutils/debian/zfsutils-udeb.install
   trunk/zfsutils/debian/zfsutils.install
Log:
Library dependency cleanup: Remove gratuitous dependencies, add missing dependencies and build libavl as a shared object.

Modified: trunk/zfsutils/debian/changelog
===================================================================
--- trunk/zfsutils/debian/changelog	2013-12-01 12:54:07 UTC (rev 5209)
+++ trunk/zfsutils/debian/changelog	2013-12-01 13:03:11 UTC (rev 5210)
@@ -1,3 +1,10 @@
+zfsutils (9.2-5) UNRELEASED; urgency=low
+
+  * Library dependency cleanup: Remove gratuitous dependencies, add
+    missing dependencies and build libavl as a shared object.
+
+ -- Robert Millan <rmh at debian.org>  Sun, 01 Dec 2013 14:03:01 +0100
+
 zfsutils (9.2-4) unstable; urgency=critical
 
   * Make 14_bootloader_advice.diff more pallatable to upstream.

Deleted: trunk/zfsutils/debian/patches/libmd_static.diff
===================================================================
--- trunk/zfsutils/debian/patches/libmd_static.diff	2013-12-01 12:54:07 UTC (rev 5209)
+++ trunk/zfsutils/debian/patches/libmd_static.diff	2013-12-01 13:03:11 UTC (rev 5210)
@@ -1,37 +0,0 @@
---- a/cddl/lib/libzfs/Makefile
-+++ b/cddl/lib/libzfs/Makefile
-@@ -8,7 +8,7 @@
- LIB=	zfs
- DPADD=	${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \
- 	${LIBZFS_CORE}
--LDADD=	-lmd -lpthread -lumem -lzfs_core
-+LDADD=	${.CURDIR}/../../../lib/libmd/libmd.a -lpthread -lumem -lzfs_core
- 
- LDADD+= -lbsd -lm
- LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs_core
-@@ -61,5 +61,6 @@
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common
-+CFLAGS+= -I${.CURDIR}/../../../lib/libmd
- 
- .include <bsd.lib.mk>
---- a/cddl/lib/libzpool/Makefile
-+++ b/cddl/lib/libzpool/Makefile
-@@ -57,12 +57,15 @@
- CFLAGS+=	-I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include
- 
- DPADD=		${LIBMD} ${LIBPTHREAD} ${LIBZ}
--LDADD=		-lmd -lpthread -lz -lumem -lnvpair -lbsd -lrt
-+LDADD=		     -lpthread -lz -lumem -lnvpair -lbsd -lrt
- 
- LDADD+= -L${.CURDIR}/../../../cddl/lib/libumem
- LDADD+= -L${.CURDIR}/../../../cddl/lib/libnvpair
- LDADD+= ${.CURDIR}/../../../cddl/lib/libavl/libavl.a
- 
-+CFLAGS+= -I${.CURDIR}/../../../lib/libmd
-+LDADD+= ${.CURDIR}/../../../lib/libmd/libmd.a
-+
- # atomic.S doesn't like profiling.
- NO_PROFILE=
- 

Modified: trunk/zfsutils/debian/patches/makefile.diff
===================================================================
--- trunk/zfsutils/debian/patches/makefile.diff	2013-12-01 12:54:07 UTC (rev 5209)
+++ trunk/zfsutils/debian/patches/makefile.diff	2013-12-01 13:03:11 UTC (rev 5210)
@@ -11,45 +11,56 @@
  CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
 --- a/cddl/lib/libzfs/Makefile
 +++ b/cddl/lib/libzfs/Makefile
-@@ -8,7 +8,11 @@
+@@ -8,7 +8,13 @@
  LIB=	zfs
  DPADD=	${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \
  	${LIBZFS_CORE}
 -LDADD=	-lmd -lpthread -lumem -lutil -lzfs_core
-+LDADD=	-lmd -lpthread -lumem -lzfs_core
++LDADD=	${.CURDIR}/../../../lib/libmd/libmd.a -lpthread -lumem -lzfs_core
 +
-+LDADD+= -lbsd -lm
++LDADD+= -lbsd -lm -luutil -lnvpair -lgeom
 +LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs_core
 +LDADD+= -L${.CURDIR}/../../../cddl/lib/libumem
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libnvpair
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libuutil
  
  SRCS=	deviceid.c \
  	fsshare.c \
+@@ -57,5 +63,6 @@
+ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
+ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
+ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common
++CFLAGS+= -I${.CURDIR}/../../../lib/libmd
+ 
+ .include <bsd.lib.mk>
 --- a/cddl/lib/libzpool/Makefile
 +++ b/cddl/lib/libzpool/Makefile
-@@ -57,7 +57,11 @@
+@@ -57,7 +57,14 @@
  CFLAGS+=	-I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include
  
  DPADD=		${LIBMD} ${LIBPTHREAD} ${LIBZ}
 -LDADD=		-lmd -lpthread -lz -lumem -lnvpair -lavl
-+LDADD=		-lmd -lpthread -lz -lumem -lnvpair -lbsd -lrt
++LDADD=		     -lpthread -lz -lumem -lnvpair -lavl-illumos -lbsd -lrt
 +
 +LDADD+= -L${.CURDIR}/../../../cddl/lib/libumem
 +LDADD+= -L${.CURDIR}/../../../cddl/lib/libnvpair
-+LDADD+= ${.CURDIR}/../../../cddl/lib/libavl/libavl.a
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libavl
++
++CFLAGS+= -I${.CURDIR}/../../../lib/libmd
++LDADD+= ${.CURDIR}/../../../lib/libmd/libmd.a
  
  # atomic.S doesn't like profiling.
  NO_PROFILE=
 --- a/cddl/sbin/zfs/Makefile
 +++ b/cddl/sbin/zfs/Makefile
-@@ -26,7 +26,13 @@
+@@ -26,7 +26,12 @@
  
  DPADD=	${LIBGEOM} ${LIBNVPAIR} ${LIBUMEM} \
  	${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS}
 -LDADD=	-lgeom -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs
-+LDADD=	-lgeom -lnvpair -lumem -lbsd  -luutil -lzfs_core -lzfs
++LDADD=	-lgeom -lnvpair -lbsd  -luutil -lzfs_core -lzfs
 +
 +LDADD+= -L${.CURDIR}/../../../cddl/lib/libnvpair
-+LDADD+= -L${.CURDIR}/../../../cddl/lib/libumem
 +LDADD+= -L${.CURDIR}/../../../cddl/lib/libuutil
 +LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs
 +LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs_core
@@ -58,20 +69,18 @@
  CFLAGS+= -DJAIL
 --- a/cddl/sbin/zpool/Makefile
 +++ b/cddl/sbin/zpool/Makefile
-@@ -28,6 +28,14 @@
+@@ -28,6 +28,12 @@
  
  DPADD=	${LIBAVL} ${LIBGEOM} ${LIBNVPAIR} \
  	${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS}
 -LDADD=	-lavl -lgeom -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs
-+LDADD=	-lgeom -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs
++LDADD=	-lgeom -lnvpair -luutil -lzfs_core -lzfs
 +
 +LDADD+=	-lbsd
 +LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs
 +LDADD+= -L${.CURDIR}/../../../cddl/lib/libnvpair
-+LDADD+= -L${.CURDIR}/../../../cddl/lib/libumem
 +LDADD+= -L${.CURDIR}/../../../cddl/lib/libuutil
 +LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs_core
-+LDADD+= ${.CURDIR}/../../../cddl/lib/libavl/libavl.a
  
  .include <bsd.prog.mk>
 --- a/cddl/usr.bin/zinject/Makefile
@@ -91,7 +100,7 @@
  .include <bsd.prog.mk>
 --- a/cddl/usr.bin/ztest/Makefile
 +++ b/cddl/usr.bin/ztest/Makefile
-@@ -20,9 +20,18 @@
+@@ -20,9 +20,17 @@
  
  DPADD=	${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
  	${LIBPTHREAD} ${LIBAVL} ${LIBZFS_CORE} ${LIBZFS} ${LIBUUTIL}
@@ -106,7 +115,6 @@
 +LDADD+= -L${.CURDIR}/../../../cddl/lib/libzpool
 +LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs
 +LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs_core
-+LDADD+= ${.CURDIR}/../../../cddl/lib/libavl/libavl.a
 +
  CSTD=	c99
  
@@ -130,12 +138,24 @@
  
 --- a/cddl/lib/libzfs_core/Makefile
 +++ b/cddl/lib/libzfs_core/Makefile
-@@ -10,6 +10,8 @@
+@@ -10,6 +10,9 @@
  DPADD=	${LIBNVPAIR}
  LDADD=	-lnvpair
  
 +LDADD+= -L${.CURDIR}/../../../cddl/lib/libnvpair
++LDADD+= -lbsd
 +
  SRCS=	libzfs_core.c \
  	libzfs_core_compat.c
  
+--- a/cddl/lib/libavl/Makefile
++++ b/cddl/lib/libavl/Makefile
+@@ -2,7 +2,7 @@
+ 
+ .PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/avl
+ 
+-LIB=	avl
++LIB=	avl-illumos
+ SRCS=	avl.c
+ WARNS?=	0
+ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris

Modified: trunk/zfsutils/debian/patches/series
===================================================================
--- trunk/zfsutils/debian/patches/series	2013-12-01 12:54:07 UTC (rev 5209)
+++ trunk/zfsutils/debian/patches/series	2013-12-01 13:03:11 UTC (rev 5210)
@@ -17,7 +17,6 @@
 15_pthread_compat.diff
 
 # Patches that are likely to be Debian-specific
-makefile.diff
 #manpage_debian_specifics.diff
-libmd_static.diff
 fix_realpath_abuse.diff
+makefile.diff

Modified: trunk/zfsutils/debian/rules
===================================================================
--- trunk/zfsutils/debian/rules	2013-12-01 12:54:07 UTC (rev 5209)
+++ trunk/zfsutils/debian/rules	2013-12-01 13:03:11 UTC (rev 5210)
@@ -111,7 +111,11 @@
 	touch $@
 
 build-libzfs: build-libzfs-stamp
-build-libzfs-stamp: build-libumem build-libzfs_core
+build-libzfs-stamp: \
+		build-libnvpair \
+		build-libumem \
+		build-libuutil \
+		build-libzfs_core
 	$(PMAKE) -C $(CURDIR)/cddl/lib/libzfs
 	touch $@
 

Modified: trunk/zfsutils/debian/zfsutils-udeb.install
===================================================================
--- trunk/zfsutils/debian/zfsutils-udeb.install	2013-12-01 12:54:07 UTC (rev 5209)
+++ trunk/zfsutils/debian/zfsutils-udeb.install	2013-12-01 13:03:11 UTC (rev 5210)
@@ -1,4 +1,5 @@
 cddl/lib/libzfs_core/libzfs_core.so.*		/lib
+cddl/lib/libavl/libavl-illumos.so.*		/lib
 
 cddl/sbin/zpool/zpool	/sbin
 cddl/sbin/zfs/zfs	/sbin

Modified: trunk/zfsutils/debian/zfsutils.install
===================================================================
--- trunk/zfsutils/debian/zfsutils.install	2013-12-01 12:54:07 UTC (rev 5209)
+++ trunk/zfsutils/debian/zfsutils.install	2013-12-01 13:03:11 UTC (rev 5210)
@@ -1,4 +1,5 @@
 cddl/lib/libzfs_core/libzfs_core.so.*		/lib
+cddl/lib/libavl/libavl-illumos.so.*		/lib
 
 cddl/sbin/zpool/zpool				/sbin
 cddl/sbin/zfs/zfs				/sbin

More information about the Glibc-bsd-commits mailing list