[Glibc-bsd-commits] r4754 - in trunk/freebsd-libs/debian: . patches

[Robert Millan]

Author: rmh
Date: 2013-07-16 10:17:47 +0000 (Tue, 16 Jul 2013)
New Revision: 4754

Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/control
   trunk/freebsd-libs/debian/patches/series
   trunk/freebsd-libs/debian/rules
Log:
Temporarily remove libelf and libdwarf, until namespace issues are fixed.

Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2013-07-15 22:15:33 UTC (rev 4753)
+++ trunk/freebsd-libs/debian/changelog	2013-07-16 10:17:47 UTC (rev 4754)
@@ -1,3 +1,10 @@
+freebsd-libs (9.1-2) UNRELEASED; urgency=low
+
+  * Temporarily remove libelf and libdwarf, until namespace issues are
+    fixed.
+
+ -- Robert Millan <rmh at debian.org>  Tue, 16 Jul 2013 12:17:26 +0200
+
 freebsd-libs (9.1-1) experimental; urgency=low
 
   * New upstream release.

Modified: trunk/freebsd-libs/debian/control
===================================================================
--- trunk/freebsd-libs/debian/control	2013-07-15 22:15:33 UTC (rev 4753)
+++ trunk/freebsd-libs/debian/control	2013-07-16 10:17:47 UTC (rev 4754)
@@ -47,39 +47,39 @@
  This package contains the header files and static library needed to
  compile applications that use libsbuf.
 
-Package: libdwarf3
-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
- and writing/producer of DWARF debugging information from object files, shared
- libraries, and executables.
+#Package: libdwarf3
+#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
+# and writing/producer of DWARF debugging information from object files, shared
+# libraries, and executables.
 
-Package: libdwarf3-dev
-Section: libdevel
-Architecture: any
-Depends: libdwarf3 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-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: libdwarf3-dev
+#Section: libdevel
+#Architecture: any
+#Depends: libdwarf3 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-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: 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
- and writing/producer of DWARF debugging information from object files, shared
- libraries, and executables.
+#Package: libelf-freebsd-1
+#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
+# and writing/producer of DWARF debugging information from object files, shared
+# libraries, and executables.
 
-Package: libelf-freebsd-dev
-Section: libdevel
-Architecture: any
-Depends: libelf-freebsd-1 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev
-Conflicts: libelf-dev, libelfg0-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-dev
+#Section: libdevel
+#Architecture: any
+#Depends: libelf-freebsd-1 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev
+#Conflicts: libelf-dev, libelfg0-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: libcam6
 Architecture: kfreebsd-any

Modified: trunk/freebsd-libs/debian/patches/series
===================================================================
--- trunk/freebsd-libs/debian/patches/series	2013-07-15 22:15:33 UTC (rev 4753)
+++ trunk/freebsd-libs/debian/patches/series	2013-07-16 10:17:47 UTC (rev 4754)
@@ -1,6 +1,6 @@
 # Patches from (or merged in) upstream
 preserve_libkvm_abi.diff
-missing_static_decl.diff
+#missing_static_decl.diff
 
 # Patches that are in good shape for merging upstream
 
@@ -24,8 +24,8 @@
 libusb_backward.diff
 libbsd_nlist.diff
 kvm_size_t_kludge.diff
-dwarf.diff
-elf.diff
+#dwarf.diff
+#elf.diff
 
 # Patches that are likely to be Debian-specific
 no_kvm_uread_in_freebsd10.diff

Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules	2013-07-15 22:15:33 UTC (rev 4753)
+++ trunk/freebsd-libs/debian/rules	2013-07-16 10:17:47 UTC (rev 4754)
@@ -49,8 +49,8 @@
 	mkdir -p $(ORIGDIR)/sys/kern
 	mkdir -p $(ORIGDIR)/sys/sys
 	for i in lib/libcam lib/libdevstat lib/libgeom lib/libipx \
-		lib/libelf \
-		lib/libdwarf \
+		$(shell # lib/libelf ) \
+		$(shell # lib/libdwarf ) \
 	         lib/libkiconv lib/libnetgraph lib/libjail \
 	         lib/libkvm lib/libmemstat lib/libsbuf lib/libusb \
 	         lib/libusbhid sys/cam \
@@ -71,7 +71,7 @@
 	tar --numeric-owner --owner 0 --group 0 -czf ../$(TARNAME) $(ORIGDIR)
 	rm -rf $(ORIGDIR)
 
-BUILD_TARGETS = build-sbuf build-dwarf build-elf
+BUILD_TARGETS = build-sbuf # build-dwarf build-elf
 
 ifeq ($(kernel), kfreebsd)
 BUILD_TARGETS += \