[Glibc-bsd-commits] r5103 - trunk/freebsd-libs/debian

[Robert Millan]

Author: rmh
Date: 2013-10-28 00:51:18 +0000 (Mon, 28 Oct 2013)
New Revision: 5103

Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/rules
Log:
Exclude libelf and libdwarf from debian/rules as well...

Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2013-10-27 22:59:02 UTC (rev 5102)
+++ trunk/freebsd-libs/debian/changelog	2013-10-28 00:51:18 UTC (rev 5103)
@@ -1,3 +1,9 @@
+freebsd-libs (9.2+ds1-4) unstable; urgency=low
+
+  * Exclude libelf and libdwarf from debian/rules as well...
+
+ -- Robert Millan <rmh at debian.org>  Mon, 28 Oct 2013 01:43:54 +0100
+
 freebsd-libs (9.2+ds1-3) unstable; urgency=low
 
   * Make libelf and libdwarf kfreebsd-any.

Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules	2013-10-27 22:59:02 UTC (rev 5102)
+++ trunk/freebsd-libs/debian/rules	2013-10-28 00:51:18 UTC (rev 5103)
@@ -70,11 +70,13 @@
 	tar --numeric-owner --owner 0 --group 0 -czf ../$(TARNAME) $(ORIGDIR)
 	rm -rf $(ORIGDIR)
 
-BUILD_ARCH_TARGETS = build-sbuf build-dwarf build-elf
+BUILD_ARCH_TARGETS = build-sbuf
 
 ifeq ($(kernel), kfreebsd)
 BUILD_ARCH_TARGETS += \
 	build-cam \
+	build-dwarf \
+	build-elf \
 	build-geom \
 	build-ipx \
 	build-kiconv \
@@ -171,10 +173,10 @@
 	dh_testdir
 	dh_testroot
 	$(PMAKE) -C $(CURDIR)/lib/libsbuf clean
+ifeq ($(kernel), kfreebsd)
+	$(PMAKE) -C $(CURDIR)/lib/libcam clean
 	$(PMAKE) -C $(CURDIR)/lib/libdwarf clean
 	$(PMAKE) -C $(CURDIR)/lib/libelf clean
-ifeq ($(kernel), kfreebsd)
-	$(PMAKE) -C $(CURDIR)/lib/libcam clean
 	$(PMAKE) -C $(CURDIR)/lib/libnetgraph clean
 	$(PMAKE) -C $(CURDIR)/lib/libdevstat clean
 	$(PMAKE) -C $(CURDIR)/lib/libmemstat clean
@@ -207,9 +209,9 @@
 
 	mkdir -p $(DESTDIR)/lib $(DESTDIR)/usr/lib $(DESTDIR)/usr/include $(DESTDIR)/usr/share/man/man3
 	$(PMAKE) -C $(CURDIR)/lib/libsbuf install SHLIBDIR=/lib
+ifeq ($(kernel), kfreebsd)
 	$(PMAKE) -C $(CURDIR)/lib/libdwarf install SHLIBDIR=/usr/lib
 	$(PMAKE) -C $(CURDIR)/lib/libelf install SHLIBDIR=/usr/lib
-ifeq ($(kernel), kfreebsd)
 	$(PMAKE) -C $(CURDIR)/lib/libcam install SHLIBDIR=/usr/lib
 	$(PMAKE) -C $(CURDIR)/lib/libgeom install SHLIBDIR=/lib
 	$(PMAKE) -C $(CURDIR)/lib/libipx install SHLIBDIR=/lib