[Glibc-bsd-commits] r5182 - in trunk/freebsd-glue: debian src

[rmh at alioth.debian.org]

Author: rmh
Date: 2013-11-29 17:34:54 +0000 (Fri, 29 Nov 2013)
New Revision: 5182

Modified:
   trunk/freebsd-glue/debian/changelog
   trunk/freebsd-glue/debian/control
   trunk/freebsd-glue/debian/install
   trunk/freebsd-glue/debian/rules
   trunk/freebsd-glue/src/Makefile.inc
Log:
Provide a shared version of libfreebsd-glue

Modified: trunk/freebsd-glue/debian/changelog
===================================================================
--- trunk/freebsd-glue/debian/changelog	2013-11-29 15:24:29 UTC (rev 5181)
+++ trunk/freebsd-glue/debian/changelog	2013-11-29 17:34:54 UTC (rev 5182)
@@ -1,9 +1,15 @@
-freebsd-glue (0.1.16) UNRELEASED; urgency=low
+freebsd-glue (0.2.1) UNRELEASED; urgency=low
 
   * Fix broken external references in mac_set.c.
 
  -- Robert Millan <rmh at debian.org>  Thu, 28 Nov 2013 15:32:45 +0100
 
+freebsd-glue (0.2.0) experimental; urgency=low
+
+  * Provide a shared version of libfreebsd-glue.
+
+ -- Robert Millan <rmh at debian.org>  Fri, 29 Nov 2013 14:05:57 +0100
+
 freebsd-glue (0.1.15) unstable; urgency=low
 
   * Add INADDR_ALLRPTS_GROUP, INADDR_CARP_GROUP, INADDR_PFSYNC_GROUP and

Modified: trunk/freebsd-glue/debian/control
===================================================================
--- trunk/freebsd-glue/debian/control	2013-11-29 15:24:29 UTC (rev 5181)
+++ trunk/freebsd-glue/debian/control	2013-11-29 17:34:54 UTC (rev 5182)
@@ -16,6 +16,7 @@
 Package: freebsd-glue
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
+ libfreebsd-glue-0 (= ${binary:Version}),
  original-awk,
  make,
  libbsd-dev (>= 0.4.0-1~),
@@ -44,3 +45,19 @@
  freebsd-glue strives for bug-for-bug compatibility and will even attempt
  to accommodate for unspecified features (such as implicit header inclusion),
  as long as this doesn't cause breakage in other areas.
+
+Package: libfreebsd-glue-0
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: FreeBSD glue environment (shared objects)
+ Shared objects for the FreeBSD glue environment.
+
+Package: libfreebsd-glue-0-udeb
+Package-Type: udeb
+Section: debian-installer
+Architecture: kfreebsd-any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: FreeBSD glue environment (udeb)
+ Shared objects for the FreeBSD glue environment.
+ .
+ This is a minimal package for use in debian-installer.

Modified: trunk/freebsd-glue/debian/install
===================================================================
--- trunk/freebsd-glue/debian/install	2013-11-29 15:24:29 UTC (rev 5181)
+++ trunk/freebsd-glue/debian/install	2013-11-29 17:34:54 UTC (rev 5182)
@@ -1,2 +1,3 @@
 include/*		usr/include/freebsd
 usr/lib/lib*.a
+usr/lib/lib*.so

Modified: trunk/freebsd-glue/debian/rules
===================================================================
--- trunk/freebsd-glue/debian/rules	2013-11-29 15:24:29 UTC (rev 5181)
+++ trunk/freebsd-glue/debian/rules	2013-11-29 17:34:54 UTC (rev 5182)
@@ -1,12 +1,16 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+export SHELL = bash
+
 DESTDIR = $(CURDIR)/debian/tmp
 PATH := /usr/lib/freebsd:$(PATH)
 PMAKE := DESTDIR="$(DESTDIR)" make
 
 CFLAGS = -Wall -Werror
 
+DEB_HOST_ARCH_OS	?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
 clean:
 	dh_testdir
 	$(PMAKE) clean
@@ -29,7 +33,7 @@
 	dh_testroot
 	dh_prep -a
 	dh_installdirs -a
-	mkdir -p $(DESTDIR)/usr/lib
+	mkdir -p $(DESTDIR)/{usr/,}lib
 	$(PMAKE) install
 	dh_install -a --list-missing
 
@@ -51,6 +55,9 @@
 #	dh_perl
 #	dh_python
 	dh_makeshlibs -a
+ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
+	dh_makeshlibs -plibfreebsd-glue-0 --add-udeb=libfreebsd-glue-0-udeb
+endif
 	dh_installdeb -a
 	dh_shlibdeps -a
 	dh_gencontrol -a

Modified: trunk/freebsd-glue/src/Makefile.inc
===================================================================
--- trunk/freebsd-glue/src/Makefile.inc	2013-11-29 15:24:29 UTC (rev 5181)
+++ trunk/freebsd-glue/src/Makefile.inc	2013-11-29 17:34:54 UTC (rev 5182)
@@ -1,5 +1,5 @@
-#SHLIB_MAJOR = 0
-SHLIBDIR = /lib
+SHLIB_MAJOR ?= 0
+SHLIBDIR ?= /lib
 
 CFLAGS = -Wall -g -pipe -fPIC -D_GNU_SOURCE \
 	-Werror \