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

[Robert Millan]

Author: rmh
Date: 2013-10-28 22:12:20 +0000 (Mon, 28 Oct 2013)
New Revision: 5108

Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/control
   trunk/freebsd-libs/debian/rules
Log:
Fix libelf/libdwarf buildability on GNU/Linux.

Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2013-10-28 22:11:10 UTC (rev 5107)
+++ trunk/freebsd-libs/debian/changelog	2013-10-28 22:12:20 UTC (rev 5108)
@@ -1,3 +1,9 @@
+freebsd-libs (9.2+ds1-5) UNRELEASED; urgency=low
+
+  * Fix libelf/libdwarf buildability on GNU/Linux.
+
+ -- Robert Millan <rmh at debian.org>  Mon, 28 Oct 2013 23:11:54 +0100
+
 freebsd-libs (9.2+ds1-4) unstable; urgency=low
 
   * Exclude libelf and libdwarf from debian/rules as well...

Modified: trunk/freebsd-libs/debian/control
===================================================================
--- trunk/freebsd-libs/debian/control	2013-10-28 22:11:10 UTC (rev 5107)
+++ trunk/freebsd-libs/debian/control	2013-10-28 22:12:20 UTC (rev 5108)
@@ -13,7 +13,7 @@
  libexpat-dev [kfreebsd-any],
 # libncurses5-dev: needed by libalias
  libncurses5-dev [kfreebsd-any],
- freebsd-glue (>= 0.0.8~),
+ freebsd-glue (>= 0.0.13~),
 Vcs-Browser: http://anonscm.debian.org/viewvc/glibc-bsd/trunk/freebsd-libs/
 Vcs-Svn: svn://anonscm.debian.org/glibc-bsd/trunk/freebsd-libs/
 Standards-Version: 3.9.4
@@ -48,7 +48,7 @@
  compile applications that use libsbuf.
 
 Package: libdwarf-freebsd-3
-Architecture: kfreebsd-any
+Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: library to consume and produce DWARF debug information (FreeBSD version)
  The libdwarf package provides a shared library which allows reading/consumer
@@ -57,15 +57,16 @@
 
 Package: libdwarf-freebsd-dev
 Section: libdevel
-Architecture: kfreebsd-any
-Depends: libdwarf-freebsd-3 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev
+Architecture: any
+Depends: libdwarf-freebsd-3 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev,
+ libelf-freebsd-dev,
 Conflicts: libdwarf-dev
 Description: Development files for libdwarf (FreeBSD version)
  This package contains the header files and static library needed to
  compile applications that use libdwarf.
 
 Package: libelf-freebsd-1
-Architecture: kfreebsd-any
+Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: library to read and write ELF files
  The libelf package provides a shared library which allows reading and
@@ -73,7 +74,7 @@
 
 Package: libelf-freebsd-dev
 Section: libdevel
-Architecture: kfreebsd-any
+Architecture: any
 Depends: libelf-freebsd-1 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev
 Conflicts: libelf-dev, libelfg0-dev
 Description: Development files for libelf (FreeBSD version)

Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules	2013-10-28 22:11:10 UTC (rev 5107)
+++ trunk/freebsd-libs/debian/rules	2013-10-28 22:12:20 UTC (rev 5108)
@@ -70,13 +70,15 @@
 	tar --numeric-owner --owner 0 --group 0 -czf ../$(TARNAME) $(ORIGDIR)
 	rm -rf $(ORIGDIR)
 
-BUILD_ARCH_TARGETS = build-sbuf
+BUILD_ARCH_TARGETS = \
+	build-sbuf \
+	build-dwarf \
+	build-elf \
+	$(NULL)
 
 ifeq ($(kernel), kfreebsd)
 BUILD_ARCH_TARGETS += \
 	build-cam \
-	build-dwarf \
-	build-elf \
 	build-geom \
 	build-ipx \
 	build-kiconv \
@@ -173,10 +175,10 @@
 	dh_testdir
 	dh_testroot
 	$(PMAKE) -C $(CURDIR)/lib/libsbuf 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/libdwarf clean
-	$(PMAKE) -C $(CURDIR)/lib/libelf clean
 	$(PMAKE) -C $(CURDIR)/lib/libnetgraph clean
 	$(PMAKE) -C $(CURDIR)/lib/libdevstat clean
 	$(PMAKE) -C $(CURDIR)/lib/libmemstat clean
@@ -209,9 +211,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