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

[rmh at alioth.debian.org]

Author: rmh
Date: 2013-12-03 22:18:09 +0000 (Tue, 03 Dec 2013)
New Revision: 5217

Modified:
   trunk/freebsd-glue/debian/changelog
   trunk/freebsd-glue/debian/libfreebsd-glue-0-udeb.install
   trunk/freebsd-glue/debian/rules
   trunk/freebsd-glue/src/Makefile.inc
   trunk/freebsd-glue/src/freebsd-glue/Makefile
Log:
Split udeb build into a separate target. Exclude getcap.c from that build and its associated -ldb.  (Closes: #731258)

Modified: trunk/freebsd-glue/debian/changelog
===================================================================
--- trunk/freebsd-glue/debian/changelog	2013-12-03 21:28:28 UTC (rev 5216)
+++ trunk/freebsd-glue/debian/changelog	2013-12-03 22:18:09 UTC (rev 5217)
@@ -1,6 +1,8 @@
 freebsd-glue (0.2.5) UNRELEASED; urgency=low
 
   * Include libbsdxml.so in freebsd-glue.
+  * Split udeb build into a separate target. Exclude getcap.c from that
+    build and its associated -ldb.  (Closes: #731258)
 
  -- Robert Millan <rmh at debian.org>  Tue, 03 Dec 2013 22:28:21 +0100
 

Modified: trunk/freebsd-glue/debian/libfreebsd-glue-0-udeb.install
===================================================================
--- trunk/freebsd-glue/debian/libfreebsd-glue-0-udeb.install	2013-12-03 21:28:28 UTC (rev 5216)
+++ trunk/freebsd-glue/debian/libfreebsd-glue-0-udeb.install	2013-12-03 22:18:09 UTC (rev 5217)
@@ -1 +1 @@
-lib/libfreebsd-glue.so.*
+obj-udeb/libfreebsd-glue.so.*	lib

Modified: trunk/freebsd-glue/debian/rules
===================================================================
--- trunk/freebsd-glue/debian/rules	2013-12-03 21:28:28 UTC (rev 5216)
+++ trunk/freebsd-glue/debian/rules	2013-12-03 22:18:09 UTC (rev 5217)
@@ -15,6 +15,7 @@
 clean:
 	dh_testdir
 	$(PMAKE) clean
+	rm -rf obj{,-udeb}
 	rm -f include/machine/__get_elf_arch.h src/get_elf_arch
 	dh_clean
 
@@ -23,9 +24,18 @@
 	$^ > $@
 
 build: build-arch
-build-arch: include/machine/__get_elf_arch.h
-	$(PMAKE)
+build-arch: build-std build-udeb
 
+build-std: include/machine/__get_elf_arch.h
+	mkdir -p obj
+	MAKEOBJDIR=$(CURDIR)/obj \
+		$(PMAKE)
+
+build-udeb: include/machine/__get_elf_arch.h
+	mkdir -p obj-udeb
+	MAKEOBJDIR=$(CURDIR)/obj-udeb \
+		$(PMAKE) RESCUE=yes
+
 build-indep:
 	:
 
@@ -35,8 +45,10 @@
 	dh_prep -a
 	dh_installdirs -a
 	mkdir -p $(DESTDIR)/{usr/,}lib
-	$(PMAKE) install
 
+	MAKEOBJDIR=$(CURDIR)/obj \
+		$(PMAKE) install
+
 	echo "GROUP( libexpat.so )" > \
 		$(DESTDIR)/usr/lib/libbsdxml.so
 	ln -s $(DEB_HOST_GNU_TYPE)/libexpat.a \

Modified: trunk/freebsd-glue/src/Makefile.inc
===================================================================
--- trunk/freebsd-glue/src/Makefile.inc	2013-12-03 21:28:28 UTC (rev 5216)
+++ trunk/freebsd-glue/src/Makefile.inc	2013-12-03 22:18:09 UTC (rev 5217)
@@ -3,6 +3,6 @@
 
 CFLAGS = -Wall -g -pipe -fPIC -D_GNU_SOURCE \
 	-Werror \
-	-isystem ../../include \
+	-isystem ${.CURDIR}/../../include \
 	-D__FREEBSD_LIBC \
 	${NULL}

Modified: trunk/freebsd-glue/src/freebsd-glue/Makefile
===================================================================
--- trunk/freebsd-glue/src/freebsd-glue/Makefile	2013-12-03 21:28:28 UTC (rev 5216)
+++ trunk/freebsd-glue/src/freebsd-glue/Makefile	2013-12-03 22:18:09 UTC (rev 5217)
@@ -4,14 +4,18 @@
 	feature_present.c \
 	fstab.c \
 	funopen.c \
-	getcap.c \
 	getosreldate.c \
 	random.c \
 	strnstr.c \
 	${NULL}
 
-LDADD=	-lbsd -ldb
+LDADD=	-lbsd
 
+.if !defined(RESCUE)
+SRCS+=	getcap.c
+LDADD+= -ldb
+.endif
+
 SYS!=	dpkg-architecture -qDEB_HOST_GNU_SYSTEM
 
 .if ${SYS} == "kfreebsd-gnu"