[Glibc-bsd-commits] r5220 - trunk/freebsd-glue/debian

[rmh at alioth.debian.org]

Author: rmh
Date: 2013-12-05 19:26:44 +0000 (Thu, 05 Dec 2013)
New Revision: 5220

Modified:
   trunk/freebsd-glue/debian/changelog
   trunk/freebsd-glue/debian/libfreebsd-glue-0-udeb.install
   trunk/freebsd-glue/debian/rules
Log:
Use MAKEOBJDIRPREFIX instead of MAKEOBJDIR, so that each library has its own object directory.

Modified: trunk/freebsd-glue/debian/changelog
===================================================================
--- trunk/freebsd-glue/debian/changelog	2013-12-04 14:40:06 UTC (rev 5219)
+++ trunk/freebsd-glue/debian/changelog	2013-12-05 19:26:44 UTC (rev 5220)
@@ -1,8 +1,10 @@
 freebsd-glue (0.2.6) UNRELEASED; urgency=low
 
   * Use -O2 for normal build and -Os for udeb build.
+  * Use MAKEOBJDIRPREFIX instead of MAKEOBJDIR, so that each library has
+    its own object directory.
 
- -- Robert Millan <rmh at debian.org>  Wed, 04 Dec 2013 12:46:55 +0100
+ -- Robert Millan <rmh at debian.org>  Thu, 05 Dec 2013 20:26:27 +0100
 
 freebsd-glue (0.2.5) unstable; urgency=low
 

Modified: trunk/freebsd-glue/debian/libfreebsd-glue-0-udeb.install
===================================================================
--- trunk/freebsd-glue/debian/libfreebsd-glue-0-udeb.install	2013-12-04 14:40:06 UTC (rev 5219)
+++ trunk/freebsd-glue/debian/libfreebsd-glue-0-udeb.install	2013-12-05 19:26:44 UTC (rev 5220)
@@ -1 +1 @@
-obj-udeb/libfreebsd-glue.so.*	lib
+debian/tmp-udeb/lib/libfreebsd-glue.so.*	lib

Modified: trunk/freebsd-glue/debian/rules
===================================================================
--- trunk/freebsd-glue/debian/rules	2013-12-04 14:40:06 UTC (rev 5219)
+++ trunk/freebsd-glue/debian/rules	2013-12-05 19:26:44 UTC (rev 5220)
@@ -5,15 +5,23 @@
 
 DESTDIR = $(CURDIR)/debian/tmp
 PATH := /usr/lib/freebsd:$(PATH)
-PMAKE := DESTDIR="$(DESTDIR)" make
+PMAKE := \
+	MAKEOBJDIRPREFIX=$(CURDIR)/obj-deb \
+	CFLAGS="$(CFLAGS) -O2" \
+	DESTDIR="$(DESTDIR)" \
+	make
+PMAKE_UDEB := \
+	MAKEOBJDIRPREFIX=$(CURDIR)/obj-udeb \
+	CFLAGS="$(CFLAGS) -Os" \
+	DESTDIR="$(DESTDIR)-udeb" \
+	make RESCUE=yes
 
 DEB_HOST_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_HOST_ARCH_OS	?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
 clean:
 	dh_testdir
-	$(PMAKE) clean
-	rm -rf obj{,-udeb}
+	rm -rf obj-{deb,udeb} debian/tmp-udeb
 	rm -f include/machine/__get_elf_arch.h src/get_elf_arch
 	dh_clean
 
@@ -22,19 +30,15 @@
 	$^ > $@
 
 build: build-arch
-build-arch: build-std build-udeb
+build-arch: build-deb build-udeb
 
-build-std: include/machine/__get_elf_arch.h
-	mkdir -p obj
-	MAKEOBJDIR=$(CURDIR)/obj \
-		CFLAGS="$(CFLAGS) -O2" \
-		$(PMAKE)
+build-deb: include/machine/__get_elf_arch.h
+	$(PMAKE) obj
+	$(PMAKE)
 
 build-udeb: include/machine/__get_elf_arch.h
-	mkdir -p obj-udeb
-	MAKEOBJDIR=$(CURDIR)/obj-udeb \
-		CFLAGS="$(CFLAGS) -Os" \
-		$(PMAKE) RESCUE=yes
+	$(PMAKE_UDEB) obj
+	$(PMAKE_UDEB)
 
 build-indep:
 	:
@@ -44,10 +48,10 @@
 	dh_testroot
 	dh_prep -a
 	dh_installdirs -a
-	mkdir -p $(DESTDIR)/{usr/,}lib
+	mkdir -p $(DESTDIR){,-udeb}/{usr/,}lib
 
-	MAKEOBJDIR=$(CURDIR)/obj \
-		$(PMAKE) install
+	$(PMAKE) install
+	$(PMAKE_UDEB) install
 
 	echo "GROUP( libexpat.so )" > \
 		$(DESTDIR)/usr/lib/libbsdxml.so