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

Wed Apr 19 08:32:58 UTC 2006

Author: rmh
Date: 2006-04-19 08:32:57 +0000 (Wed, 19 Apr 2006)
New Revision: 1455

Added:
   trunk/freebsd-libs/debian/libgeom-dev.links
   trunk/freebsd-libs/debian/libkvm-dev.links
Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/libgeom-dev.install
   trunk/freebsd-libs/debian/libgeom0.install
   trunk/freebsd-libs/debian/libkvm-dev.install
   trunk/freebsd-libs/debian/patches/01_glibc_libcam.diff
   trunk/freebsd-libs/debian/patches/02_glibc_libsbuf.diff
   trunk/freebsd-libs/debian/patches/04_glibc_libkvm.diff
   trunk/freebsd-libs/debian/patches/05_glibc_libipx.diff
   trunk/freebsd-libs/debian/patches/06_libgeom.diff
   trunk/freebsd-libs/debian/rules
Log:
Major patch and variable cleanup/refactor to sanitise SHLIB_MAJOR and SHLIBDIR overrides.
Release.

Modified: trunk/freebsd-libs/debian/changelog
===================================================================

--- trunk/freebsd-libs/debian/changelog	2006-04-18 21:06:42 UTC (rev 1454)
+++ trunk/freebsd-libs/debian/changelog	2006-04-19 08:32:57 UTC (rev 1455)
@@ -1,8 +1,10 @@
-freebsd-libs (5.4+1-1) UNRELEASED; urgency=low
+freebsd-libs (5.4+1-1) unreleased; urgency=low
 
   * Add libgeom.
+  * Major patch and variable cleanup/refactor to sanitise SHLIB_MAJOR and
+    SHLIBDIR overrides.
 
- -- Robert Millan <rmh at aybabtu.com>  Wed, 29 Mar 2006 20:38:39 +0200
+ -- Robert Millan <rmh at aybabtu.com>  Wed, 19 Apr 2006 10:32:23 +0200
 
 freebsd-libs (5.4-8) unreleased; urgency=low
 

Modified: trunk/freebsd-libs/debian/libgeom-dev.install
===================================================================
--- trunk/freebsd-libs/debian/libgeom-dev.install	2006-04-18 21:06:42 UTC (rev 1454)
+++ trunk/freebsd-libs/debian/libgeom-dev.install	2006-04-19 08:32:57 UTC (rev 1455)
@@ -1,4 +1,3 @@
-usr/lib/libgeom*.so
 usr/lib/libgeom*.a
 usr/include/libgeom.h
 usr/share/man/man3/libgeom.3.gz

Added: trunk/freebsd-libs/debian/libgeom-dev.links
===================================================================
--- trunk/freebsd-libs/debian/libgeom-dev.links	2006-04-18 21:06:42 UTC (rev 1454)
+++ trunk/freebsd-libs/debian/libgeom-dev.links	2006-04-19 08:32:57 UTC (rev 1455)
@@ -0,0 +1 @@
+lib/libgeom.so.0		usr/lib/libgeom.so

Modified: trunk/freebsd-libs/debian/libgeom0.install
===================================================================
--- trunk/freebsd-libs/debian/libgeom0.install	2006-04-18 21:06:42 UTC (rev 1454)
+++ trunk/freebsd-libs/debian/libgeom0.install	2006-04-19 08:32:57 UTC (rev 1455)
@@ -1 +1 @@
-usr/lib/libgeom*.so.*
+usr/lib/libgeom*.so.*		lib

Modified: trunk/freebsd-libs/debian/libkvm-dev.install
===================================================================
--- trunk/freebsd-libs/debian/libkvm-dev.install	2006-04-18 21:06:42 UTC (rev 1454)
+++ trunk/freebsd-libs/debian/libkvm-dev.install	2006-04-19 08:32:57 UTC (rev 1455)
@@ -1,4 +1,3 @@
-usr/lib/libkvm*.so
 usr/lib/libkvm*.a
 usr/include/kvm.h
 usr/share/man/man3/kvm.3.gz

Added: trunk/freebsd-libs/debian/libkvm-dev.links
===================================================================
--- trunk/freebsd-libs/debian/libkvm-dev.links	2006-04-18 21:06:42 UTC (rev 1454)
+++ trunk/freebsd-libs/debian/libkvm-dev.links	2006-04-19 08:32:57 UTC (rev 1455)
@@ -0,0 +1 @@
+lib/libkvm.so.0			usr/lib/libkvm.so

Modified: trunk/freebsd-libs/debian/patches/01_glibc_libcam.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/01_glibc_libcam.diff	2006-04-18 21:06:42 UTC (rev 1454)
+++ trunk/freebsd-libs/debian/patches/01_glibc_libcam.diff	2006-04-19 08:32:57 UTC (rev 1455)
@@ -1,13 +1,7 @@
 diff -ur lib.old/libcam/Makefile lib/libcam/Makefile
---- lib.old/libcam/Makefile	2004-02-05 23:44:22.000000000 +0100
-+++ lib/libcam/Makefile	2005-08-13 11:29:33.000000000 +0200
-@@ -1,12 +1,12 @@
- # $FreeBSD: src/lib/libcam/Makefile,v 1.12 2004/02/05 22:44:22 ru Exp $
- 
- LIB=		cam
--SHLIBDIR?=	/lib
-+SHLIB_MAJOR=    0
-+SHLIBDIR?=	/usr/lib
+--- lib.old/libcam/Makefile	2006-04-19 09:40:00.000000000 +0200
++++ lib/libcam/Makefile	2006-04-19 09:40:19.000000000 +0200
+@@ -5,8 +5,7 @@
  SRCS=		camlib.c scsi_cmdparse.c scsi_all.c scsi_da.c scsi_sa.c cam.c
  INCS=		camlib.h
  
@@ -17,7 +11,7 @@
  
  MAN=		cam.3 cam_cdbparse.3
  
-@@ -34,9 +34,11 @@
+@@ -34,9 +33,11 @@
  		cam_cdbparse.3 csio_encode_visit.3 \
  		cam_cdbparse.3 buff_encode_visit.3
  
@@ -31,8 +25,9 @@
  CFLAGS+=	-I${.CURDIR} -I${SDIR}
  
  .include <bsd.lib.mk>
---- lib/libcam/camlib.h~	2006-03-29 19:40:09.000000000 +0200
-+++ lib/libcam/camlib.h	2006-03-29 19:41:25.000000000 +0200
+diff -ur lib.old/libcam/camlib.h lib/libcam/camlib.h
+--- lib.old/libcam/camlib.h	2006-04-19 09:40:00.000000000 +0200
++++ lib/libcam/camlib.h	2006-04-19 09:38:34.000000000 +0200
 @@ -150,13 +150,11 @@
  /*
   * Buffer encoding/decoding routines, from the old SCSI library.

Modified: trunk/freebsd-libs/debian/patches/02_glibc_libsbuf.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/02_glibc_libsbuf.diff	2006-04-18 21:06:42 UTC (rev 1454)
+++ trunk/freebsd-libs/debian/patches/02_glibc_libsbuf.diff	2006-04-19 08:32:57 UTC (rev 1455)
@@ -6,8 +6,8 @@
  
  LIB=	sbuf
 -SHLIBDIR?= /lib
-+SHLIBDIR?= /usr/lib
-+SHLIB_MAJOR= 0
++SHLIBDIR?= /lib
++
  SRCS=	subr_sbuf.c 
  WARNS?= 2
  

Modified: trunk/freebsd-libs/debian/patches/04_glibc_libkvm.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/04_glibc_libkvm.diff	2006-04-18 21:06:42 UTC (rev 1454)
+++ trunk/freebsd-libs/debian/patches/04_glibc_libkvm.diff	2006-04-19 08:32:57 UTC (rev 1455)
@@ -1,7 +1,20 @@
-diff -Nur lib.old/lib/libkvm/kvm.c lib/libkvm/kvm.c
---- lib.old/lib/libkvm/kvm.c	2004-06-08 15:08:19.000000000 +0200
-+++ lib/libkvm/kvm.c	2005-12-20 11:20:23.000000000 +0100
-@@ -51,6 +51,7 @@
+diff -ur lib.old/libkvm/Makefile lib/libkvm/Makefile
+--- lib.old/libkvm/Makefile	2006-04-19 09:43:10.000000000 +0200
++++ lib/libkvm/Makefile	2006-04-19 09:42:15.000000000 +0200
+@@ -2,8 +2,7 @@
+ # $FreeBSD: src/lib/libkvm/Makefile,v 1.14 2003/08/18 15:25:38 obrien Exp $
+ 
+ LIB=	kvm
+-SHLIBDIR?= /lib
+-CFLAGS+=-DLIBC_SCCS -I${.CURDIR}
++SHLIBDIR?= /lib
+ SRCS=	kvm.c kvm_${MACHINE_ARCH}.c kvm_file.c kvm_getloadavg.c \
+ 	kvm_getswapinfo.c kvm_proc.c
+ INCS=	kvm.h
+diff -ur lib.old/libkvm/kvm.c lib/libkvm/kvm.c
+--- lib.old/libkvm/kvm.c	2006-04-19 09:43:10.000000000 +0200
++++ lib/libkvm/kvm.c	2006-04-19 09:38:34.000000000 +0200
+@@ -50,6 +50,7 @@
  #include <sys/stat.h>
  #include <sys/sysctl.h>
  #include <sys/linker.h>
@@ -9,7 +22,7 @@
  
  #include <vm/vm.h>
  #include <vm/vm_param.h>
-@@ -63,11 +64,14 @@
+@@ -62,11 +63,14 @@
  #include <limits.h>
  #include <nlist.h>
  #include <paths.h>
@@ -24,10 +37,10 @@
  #include "kvm_private.h"
  
  /* from src/lib/libc/gen/nlist.c */
-diff -Nur lib.old/lib/libkvm/kvm_file.c lib/libkvm/kvm_file.c
---- lib.old/lib/libkvm/kvm_file.c	2003-07-31 23:44:31.000000000 +0200
-+++ lib/libkvm/kvm_file.c	2005-12-20 11:32:50.000000000 +0100
-@@ -64,7 +64,7 @@
+diff -ur lib.old/libkvm/kvm_file.c lib/libkvm/kvm_file.c
+--- lib.old/libkvm/kvm_file.c	2006-04-19 09:43:10.000000000 +0200
++++ lib/libkvm/kvm_file.c	2006-04-19 09:38:34.000000000 +0200
+@@ -63,7 +63,7 @@
  #include <sys/sysctl.h>
  
  #include <limits.h>
@@ -36,7 +49,7 @@
  #include <paths.h>
  
  #include "kvm_private.h"
-@@ -81,6 +81,7 @@
+@@ -80,6 +80,7 @@
  	int op, arg, nfiles;
  	long filehead_o;
  {
@@ -44,7 +57,7 @@
  	int buflen = kd->arglen, n = 0;
  	struct file *fp;
  	char *where = kd->argspc;
-@@ -118,6 +119,8 @@
+@@ -117,6 +118,8 @@
  		return (0);
  	}
  	return (nfiles);
@@ -53,7 +66,7 @@
  }
  
  char *
-@@ -126,6 +129,7 @@
+@@ -125,6 +128,7 @@
  	int op, arg;
  	int *cnt;
  {
@@ -61,17 +74,17 @@
  	int mib[2], st, nfiles;
  	size_t size;
  	struct file *fp, *fplim;
-@@ -189,4 +193,6 @@
+@@ -188,4 +192,6 @@
  	}
  	*cnt = nfiles;
  	return (kd->argspc);
 +#endif
 +	return 0;
  }
-diff -Nur lib.old/lib/libkvm/kvm_getloadavg.c lib/libkvm/kvm_getloadavg.c
---- lib.old/lib/libkvm/kvm_getloadavg.c	2001-11-20 09:26:37.000000000 +0100
-+++ lib/libkvm/kvm_getloadavg.c	2005-12-20 11:52:23.000000000 +0100
-@@ -48,6 +48,7 @@
+diff -ur lib.old/libkvm/kvm_getloadavg.c lib/libkvm/kvm_getloadavg.c
+--- lib.old/libkvm/kvm_getloadavg.c	2006-04-19 09:43:10.000000000 +0200
++++ lib/libkvm/kvm_getloadavg.c	2006-04-19 09:38:34.000000000 +0200
+@@ -47,6 +47,7 @@
  #include <limits.h>
  #include <nlist.h>
  #include <kvm.h>
@@ -79,7 +92,7 @@
  
  #include "kvm_private.h"
  
-@@ -59,6 +60,11 @@
+@@ -58,6 +59,11 @@
  	{ "" },
  };
  
@@ -91,10 +104,10 @@
  /*
   * kvm_getloadavg() -- Get system load averages, from live or dead kernels.
   *
-diff -Nur lib.old/lib/libkvm/kvm_getswapinfo.c lib/libkvm/kvm_getswapinfo.c
---- lib.old/lib/libkvm/kvm_getswapinfo.c	2004-07-31 20:49:53.000000000 +0200
-+++ lib/libkvm/kvm_getswapinfo.c	2005-12-20 12:00:15.000000000 +0100
-@@ -151,8 +155,10 @@
+diff -ur lib.old/libkvm/kvm_getswapinfo.c lib/libkvm/kvm_getswapinfo.c
+--- lib.old/libkvm/kvm_getswapinfo.c	2006-04-19 09:43:10.000000000 +0200
++++ lib/libkvm/kvm_getswapinfo.c	2006-04-19 09:38:34.000000000 +0200
+@@ -150,8 +150,10 @@
  			swap_ary[unswdev].ksw_total = ttl;
  			swap_ary[unswdev].ksw_used = xsd.xsw_used;
  			swap_ary[unswdev].ksw_flags = xsd.xsw_flags;
@@ -105,9 +118,9 @@
  		}
  		tot.ksw_total += ttl;
  		tot.ksw_used += xsd.xsw_used;
-diff -Nur lib.old/lib/libkvm/kvm_private.h lib/libkvm/kvm_private.h
---- lib.old/lib/libkvm/kvm_private.h	2002-03-22 10:18:38.000000000 +0100
-+++ lib/libkvm/kvm_private.h	2005-12-20 11:13:35.000000000 +0100
+diff -ur lib.old/libkvm/kvm_private.h lib/libkvm/kvm_private.h
+--- lib.old/libkvm/kvm_private.h	2006-04-19 09:43:10.000000000 +0200
++++ lib/libkvm/kvm_private.h	2006-04-19 09:38:34.000000000 +0200
 @@ -70,14 +70,12 @@
  /*
   * Functions used internally by kvm, but across kvm modules.
@@ -125,10 +138,10 @@
 -	    __printflike(3, 4);
 +void	 _kvm_syserr (kvm_t *kd, const char *program, const char *fmt, ...);
  int	 _kvm_uvatop(kvm_t *, const struct proc *, u_long, u_long *);
-diff -Nur lib.old/lib/libkvm/kvm_proc.c lib/libkvm/kvm_proc.c
---- lib.old/lib/libkvm/kvm_proc.c	2005-03-01 10:30:14.000000000 +0100
-+++ lib/libkvm/kvm_proc.c	2005-12-20 12:03:51.000000000 +0100
-@@ -94,6 +96,7 @@
+diff -ur lib.old/libkvm/kvm_proc.c lib/libkvm/kvm_proc.c
+--- lib.old/libkvm/kvm_proc.c	2006-04-19 09:43:10.000000000 +0200
++++ lib/libkvm/kvm_proc.c	2006-04-19 09:38:34.000000000 +0200
+@@ -93,6 +93,7 @@
  	struct kinfo_proc *bp;
  	int maxcnt;
  {
@@ -136,7 +149,7 @@
  	int cnt = 0;
  	struct kinfo_proc kinfo_proc, *kp;
  	struct pgrp pgrp;
-@@ -414,6 +417,8 @@
+@@ -413,6 +414,8 @@
  		++cnt;
  	}
  	return (cnt);
@@ -145,18 +158,3 @@
  }
  
  /*
-diff -Nur lib.old/lib/libkvm/Makefile lib/libkvm/Makefile
---- lib.old/lib/libkvm/Makefile	2003-08-18 17:25:38.000000000 +0200
-+++ lib/libkvm/Makefile	2005-12-20 12:11:11.000000000 +0100
-@@ -2,8 +2,9 @@
- # $FreeBSD: src/lib/libkvm/Makefile,v 1.14 2003/08/18 15:25:38 obrien Exp $
- 
- LIB=	kvm
--SHLIBDIR?= /lib
--CFLAGS+=-DLIBC_SCCS -I${.CURDIR}
-+SHLIB_MAJOR=	0
-+SHLIBDIR?=	/usr/lib
-+LDADD=		-lbsd -lfreebsd
- SRCS=	kvm.c kvm_${MACHINE_ARCH}.c kvm_file.c kvm_getloadavg.c \
- 	kvm_getswapinfo.c kvm_proc.c
- INCS=	kvm.h

Modified: trunk/freebsd-libs/debian/patches/05_glibc_libipx.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/05_glibc_libipx.diff	2006-04-18 21:06:42 UTC (rev 1454)
+++ trunk/freebsd-libs/debian/patches/05_glibc_libipx.diff	2006-04-19 08:32:57 UTC (rev 1455)
@@ -1,13 +1,11 @@
 diff -ur lib.old/libipx/Makefile lib/libipx/Makefile
---- lib.old/libipx/Makefile	2003-08-18 17:25:39.000000000 +0200
-+++ lib/libipx/Makefile	2005-08-13 11:06:10.000000000 +0200
-@@ -1,7 +1,8 @@
+--- lib.old/libipx/Makefile	2006-04-19 09:43:54.000000000 +0200
++++ lib/libipx/Makefile	2006-04-19 09:38:34.000000000 +0200
+@@ -1,6 +1,7 @@
  # $FreeBSD: src/lib/libipx/Makefile,v 1.7 2003/08/18 15:25:38 obrien Exp $
  
  LIB=	ipx
--SHLIBDIR?= /lib
 +SHLIB_MAJOR=    2
-+SHLIBDIR?= /usr/lib
+ SHLIBDIR?= /lib
  SRCS=	ipx_addr.c ipx_ntoa.c
  MAN=	ipx.3
- MLINKS+=ipx.3 ipx_addr.3 ipx.3 ipx_ntoa.3

Modified: trunk/freebsd-libs/debian/patches/06_libgeom.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/06_libgeom.diff	2006-04-18 21:06:42 UTC (rev 1454)
+++ trunk/freebsd-libs/debian/patches/06_libgeom.diff	2006-04-19 08:32:57 UTC (rev 1455)
@@ -6,7 +6,7 @@
  
  DPADD=	${LIBBSDXML} ${LIBSBUF}
 -LDADD+=	-lbsdxml -lsbuf
-+LDADD+=	-lexpat -lsbuf
++LDADD+=	-lexpat -L../libsbuf/ -lsbuf
  
  MAN=	libgeom.3
  

Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules	2006-04-18 21:06:42 UTC (rev 1454)
+++ trunk/freebsd-libs/debian/rules	2006-04-19 08:32:57 UTC (rev 1455)
@@ -22,6 +22,8 @@
 DESTDIR=$(CURDIR)/debian/tmp
 PMAKE=make COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS)" NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR)
 export LDADD=-lbsd -lfreebsd
+export SHLIB_MAJOR=0
+export SHLIBDIR=/usr/lib
 
 $(SRC_DIR):
 	tar -xzf $(CURDIR)/src.tar.gz
@@ -95,8 +97,6 @@
 	cd $(SRC_DIR)/lib/libgeom && $(PMAKE) install
 	cd $(SRC_DIR)/lib/libipx && $(PMAKE) install
 	cd $(SRC_DIR)/lib/libkvm && $(PMAKE) install
-	# move libkvm.so to /lib
-	ln -sf /lib/libkvm.so.0 $(DESTDIR)/usr/lib/libkvm.so
 	cd $(SRC_DIR)/lib/libusbhid && $(PMAKE) install
 
 	dh_install -s --list-missing --sourcedir=debian/tmp
@@ -138,7 +138,7 @@
 
 # Build architecture dependant packages using the common target.
 binary-arch: build-arch install-arch
-	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
 
 binary: binary-arch binary-indep
 .PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure


