[Glibc-bsd-commits] r5026 - in trunk/freebsd-libs/debian: . patches
Robert Millan
rmh at alioth.debian.org
Wed Oct 9 21:50:33 UTC 2013
Author: rmh
Date: 2013-10-09 21:50:33 +0000 (Wed, 09 Oct 2013)
New Revision: 5026
Added:
trunk/freebsd-libs/debian/libdwarf-freebsd-3.install
trunk/freebsd-libs/debian/libdwarf-freebsd-3.symbols
trunk/freebsd-libs/debian/libdwarf-freebsd-dev.install
Removed:
trunk/freebsd-libs/debian/libdwarf3-dev.install
trunk/freebsd-libs/debian/libdwarf3.install
trunk/freebsd-libs/debian/libdwarf3.symbols
Modified:
trunk/freebsd-libs/debian/changelog
trunk/freebsd-libs/debian/control
trunk/freebsd-libs/debian/libelf-freebsd-1.install
trunk/freebsd-libs/debian/libelf-freebsd-1.symbols
trunk/freebsd-libs/debian/libelf-freebsd-dev.install
trunk/freebsd-libs/debian/patches/dwarf.diff
trunk/freebsd-libs/debian/patches/elf.diff
trunk/freebsd-libs/debian/patches/series
trunk/freebsd-libs/debian/rules
Log:
Add libelf and libdwarf, this time changing the SONAME to avoid namespace collisions.
Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog 2013-10-09 05:53:32 UTC (rev 5025)
+++ trunk/freebsd-libs/debian/changelog 2013-10-09 21:50:33 UTC (rev 5026)
@@ -1,3 +1,10 @@
+freebsd-libs (9.2+ds1-1) UNRELEASED; urgency=low
+
+ * Add libelf and libdwarf, this time changing the SONAME to avoid namespace
+ collisions.
+
+ -- Robert Millan <rmh at debian.org> Wed, 09 Oct 2013 23:21:11 +0200
+
freebsd-libs (9.2-1) unstable; urgency=low
* New upstream release.
Modified: trunk/freebsd-libs/debian/control
===================================================================
--- trunk/freebsd-libs/debian/control 2013-10-09 05:53:32 UTC (rev 5025)
+++ trunk/freebsd-libs/debian/control 2013-10-09 21:50:33 UTC (rev 5026)
@@ -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: libdwarf-freebsd-3
+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: libdwarf-freebsd-dev
+Section: libdevel
+Architecture: any
+Depends: libdwarf-freebsd-3 (= ${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
Copied: trunk/freebsd-libs/debian/libdwarf-freebsd-3.install (from rev 4983, trunk/freebsd-libs/debian/libdwarf3.install)
===================================================================
--- trunk/freebsd-libs/debian/libdwarf-freebsd-3.install (rev 0)
+++ trunk/freebsd-libs/debian/libdwarf-freebsd-3.install 2013-10-09 21:50:33 UTC (rev 5026)
@@ -0,0 +1 @@
+usr/lib/libdwarf-freebsd*.so.*
Copied: trunk/freebsd-libs/debian/libdwarf-freebsd-3.symbols (from rev 4983, trunk/freebsd-libs/debian/libdwarf3.symbols)
===================================================================
--- trunk/freebsd-libs/debian/libdwarf-freebsd-3.symbols (rev 0)
+++ trunk/freebsd-libs/debian/libdwarf-freebsd-3.symbols 2013-10-09 21:50:33 UTC (rev 5026)
@@ -0,0 +1,51 @@
+libdwarf-freebsd.so.3 libdwarf-freebsd-3 #MINVER#
+ dwarf_abbrev_add at Base 9.0
+ dwarf_abbrev_find at Base 9.0
+ dwarf_attr at Base 9.0
+ dwarf_attr_add at Base 9.0
+ dwarf_attrval_add at Base 9.0
+ dwarf_attrval_find at Base 9.0
+ dwarf_attrval_flag at Base 9.0
+ dwarf_attrval_signed at Base 9.0
+ dwarf_attrval_string at Base 9.0
+ dwarf_attrval_unsigned at Base 9.0
+ dwarf_build_function_table at Base 9.0
+ dwarf_child at Base 9.0
+ dwarf_dealloc at Base 9.0
+ dwarf_die_add at Base 9.0
+ dwarf_die_find at Base 9.0
+ dwarf_dieoffset at Base 9.0
+ dwarf_dump at Base 9.0
+ dwarf_dump_abbrev at Base 9.0
+ dwarf_dump_av at Base 9.0
+ dwarf_dump_dbgstr at Base 9.0
+ dwarf_dump_die at Base 9.0
+ dwarf_dump_die_at_offset at Base 9.0
+ dwarf_dump_info at Base 9.0
+ dwarf_dump_raw at Base 9.0
+ dwarf_dump_shstrtab at Base 9.0
+ dwarf_dump_strtab at Base 9.0
+ dwarf_dump_symtab at Base 9.0
+ dwarf_dump_tree at Base 9.0
+ dwarf_elf_init at Base 9.0
+ dwarf_errmsg at Base 9.0
+ dwarf_errno at Base 9.0
+ dwarf_find_function_by_name at Base 9.0
+ dwarf_find_function_by_offset at Base 9.0
+ dwarf_finish at Base 9.0
+ dwarf_function_get_addr_range at Base 9.0
+ dwarf_function_is_inlined at Base 9.0
+ dwarf_function_iterate_inlined_instance at Base 9.0
+ dwarf_init at Base 9.0
+ dwarf_inlined_function_get_addr_range at Base 9.0
+ dwarf_locdesc at Base 9.0
+ dwarf_locdesc_free at Base 9.0
+ dwarf_next_cu_header at Base 9.0
+ dwarf_op_num at Base 9.0
+ dwarf_siblingof at Base 9.0
+ dwarf_tag at Base 9.0
+ dwarf_whatform at Base 9.0
+ get_attr_desc at Base 9.2
+ get_form_desc at Base 9.2
+ get_sht_desc at Base 9.2
+ get_tag_desc at Base 9.2
Copied: trunk/freebsd-libs/debian/libdwarf-freebsd-dev.install (from rev 4983, trunk/freebsd-libs/debian/libdwarf3-dev.install)
===================================================================
--- trunk/freebsd-libs/debian/libdwarf-freebsd-dev.install (rev 0)
+++ trunk/freebsd-libs/debian/libdwarf-freebsd-dev.install 2013-10-09 21:50:33 UTC (rev 5026)
@@ -0,0 +1,4 @@
+usr/lib/libdwarf-freebsd.a
+usr/lib/libdwarf-freebsd*.so
+usr/include/dwarf.h
+usr/include/libdwarf.h
Deleted: trunk/freebsd-libs/debian/libdwarf3-dev.install
===================================================================
--- trunk/freebsd-libs/debian/libdwarf3-dev.install 2013-10-09 05:53:32 UTC (rev 5025)
+++ trunk/freebsd-libs/debian/libdwarf3-dev.install 2013-10-09 21:50:33 UTC (rev 5026)
@@ -1,4 +0,0 @@
-usr/lib/libdwarf.a
-usr/lib/libdwarf*.so
-usr/include/dwarf.h
-usr/include/libdwarf.h
Deleted: trunk/freebsd-libs/debian/libdwarf3.install
===================================================================
--- trunk/freebsd-libs/debian/libdwarf3.install 2013-10-09 05:53:32 UTC (rev 5025)
+++ trunk/freebsd-libs/debian/libdwarf3.install 2013-10-09 21:50:33 UTC (rev 5026)
@@ -1 +0,0 @@
-usr/lib/libdwarf*.so.*
Deleted: trunk/freebsd-libs/debian/libdwarf3.symbols
===================================================================
--- trunk/freebsd-libs/debian/libdwarf3.symbols 2013-10-09 05:53:32 UTC (rev 5025)
+++ trunk/freebsd-libs/debian/libdwarf3.symbols 2013-10-09 21:50:33 UTC (rev 5026)
@@ -1,47 +0,0 @@
-libdwarf.so.3 libdwarf3 #MINVER#
- dwarf_abbrev_add at Base 9.0+ds2
- dwarf_abbrev_find at Base 9.0+ds2
- dwarf_attr at Base 9.0+ds2
- dwarf_attr_add at Base 9.0+ds2
- dwarf_attrval_add at Base 9.0+ds2
- dwarf_attrval_find at Base 9.0+ds2
- dwarf_attrval_flag at Base 9.0+ds2
- dwarf_attrval_signed at Base 9.0+ds2
- dwarf_attrval_string at Base 9.0+ds2
- dwarf_attrval_unsigned at Base 9.0+ds2
- dwarf_build_function_table at Base 9.0+ds2
- dwarf_child at Base 9.0+ds2
- dwarf_dealloc at Base 9.0+ds2
- dwarf_die_add at Base 9.0+ds2
- dwarf_die_find at Base 9.0+ds2
- dwarf_dieoffset at Base 9.0+ds2
- dwarf_dump at Base 9.0+ds2
- dwarf_dump_abbrev at Base 9.0+ds2
- dwarf_dump_av at Base 9.0+ds2
- dwarf_dump_dbgstr at Base 9.0+ds2
- dwarf_dump_die at Base 9.0+ds2
- dwarf_dump_die_at_offset at Base 9.0+ds2
- dwarf_dump_info at Base 9.0+ds2
- dwarf_dump_raw at Base 9.0+ds2
- dwarf_dump_shstrtab at Base 9.0+ds2
- dwarf_dump_strtab at Base 9.0+ds2
- dwarf_dump_symtab at Base 9.0+ds2
- dwarf_dump_tree at Base 9.0+ds2
- dwarf_elf_init at Base 9.0+ds2
- dwarf_errmsg at Base 9.0+ds2
- dwarf_errno at Base 9.0+ds2
- dwarf_find_function_by_name at Base 9.0+ds2
- dwarf_find_function_by_offset at Base 9.0+ds2
- dwarf_finish at Base 9.0+ds2
- dwarf_function_get_addr_range at Base 9.0+ds2
- dwarf_function_is_inlined at Base 9.0+ds2
- dwarf_function_iterate_inlined_instance at Base 9.0+ds2
- dwarf_init at Base 9.0+ds2
- dwarf_inlined_function_get_addr_range at Base 9.0+ds2
- dwarf_locdesc at Base 9.0+ds2
- dwarf_locdesc_free at Base 9.0+ds2
- dwarf_next_cu_header at Base 9.0+ds2
- dwarf_op_num at Base 9.0+ds2
- dwarf_siblingof at Base 9.0+ds2
- dwarf_tag at Base 9.0+ds2
- dwarf_whatform at Base 9.0+ds2
Modified: trunk/freebsd-libs/debian/libelf-freebsd-1.install
===================================================================
--- trunk/freebsd-libs/debian/libelf-freebsd-1.install 2013-10-09 05:53:32 UTC (rev 5025)
+++ trunk/freebsd-libs/debian/libelf-freebsd-1.install 2013-10-09 21:50:33 UTC (rev 5026)
@@ -1 +1 @@
-usr/lib/libelf.so.*
+usr/lib/libelf-freebsd.so.*
Modified: trunk/freebsd-libs/debian/libelf-freebsd-1.symbols
===================================================================
--- trunk/freebsd-libs/debian/libelf-freebsd-1.symbols 2013-10-09 05:53:32 UTC (rev 5025)
+++ trunk/freebsd-libs/debian/libelf-freebsd-1.symbols 2013-10-09 21:50:33 UTC (rev 5026)
@@ -1,93 +1,93 @@
-libelf.so.1 libelf-freebsd-1 #MINVER#
- FBSD_1.0 at FBSD_1.0 9.0+ds2
- FBSDprivate_1.0 at FBSDprivate_1.0 9.0+ds2
- _libelf_get_max_error at FBSDprivate_1.0 9.0+ds2
- _libelf_get_no_error_message at FBSDprivate_1.0 9.0+ds2
- _libelf_get_unknown_error_message at FBSDprivate_1.0 9.0+ds2
- _libelf_set_error at FBSDprivate_1.0 9.0+ds2
- elf32_checksum at FBSD_1.0 9.0+ds2
- elf32_fsize at FBSD_1.0 9.0+ds2
- elf32_getehdr at FBSD_1.0 9.0+ds2
- elf32_getphdr at FBSD_1.0 9.0+ds2
- elf32_getshdr at FBSD_1.0 9.0+ds2
- elf32_newehdr at FBSD_1.0 9.0+ds2
- elf32_newphdr at FBSD_1.0 9.0+ds2
- elf32_xlatetof at FBSD_1.0 9.0+ds2
- elf32_xlatetom at FBSD_1.0 9.0+ds2
- elf64_checksum at FBSD_1.0 9.0+ds2
- elf64_fsize at FBSD_1.0 9.0+ds2
- elf64_getehdr at FBSD_1.0 9.0+ds2
- elf64_getphdr at FBSD_1.0 9.0+ds2
- elf64_getshdr at FBSD_1.0 9.0+ds2
- elf64_newehdr at FBSD_1.0 9.0+ds2
- elf64_newphdr at FBSD_1.0 9.0+ds2
- elf64_xlatetof at FBSD_1.0 9.0+ds2
- elf64_xlatetom at FBSD_1.0 9.0+ds2
- elf_begin at FBSD_1.0 9.0+ds2
- elf_cntl at FBSD_1.0 9.0+ds2
- elf_end at FBSD_1.0 9.0+ds2
- elf_errmsg at FBSD_1.0 9.0+ds2
- elf_errno at FBSD_1.0 9.0+ds2
- elf_fill at FBSD_1.0 9.0+ds2
- elf_flagdata at FBSD_1.0 9.0+ds2
- elf_flagehdr at FBSD_1.0 9.0+ds2
- elf_flagelf at FBSD_1.0 9.0+ds2
- elf_flagphdr at FBSD_1.0 9.0+ds2
- elf_flagscn at FBSD_1.0 9.0+ds2
- elf_flagshdr at FBSD_1.0 9.0+ds2
- elf_getarhdr at FBSD_1.0 9.0+ds2
- elf_getarsym at FBSD_1.0 9.0+ds2
- elf_getbase at FBSD_1.0 9.0+ds2
- elf_getdata at FBSD_1.0 9.0+ds2
- elf_getident at FBSD_1.0 9.0+ds2
- elf_getphdrnum at FBSD_1.0 9.0+ds2
- elf_getphnum at FBSD_1.0 9.0+ds2
- elf_getscn at FBSD_1.0 9.0+ds2
- elf_getshdrnum at FBSD_1.0 9.0+ds2
- elf_getshdrstrndx at FBSD_1.0 9.0+ds2
- elf_getshnum at FBSD_1.0 9.0+ds2
- elf_getshstrndx at FBSD_1.0 9.0+ds2
- elf_hash at FBSD_1.0 9.0+ds2
- elf_kind at FBSD_1.0 9.0+ds2
- elf_memory at FBSD_1.0 9.0+ds2
- elf_ndxscn at FBSD_1.0 9.0+ds2
- elf_newdata at FBSD_1.0 9.0+ds2
- elf_newscn at FBSD_1.0 9.0+ds2
- elf_next at FBSD_1.0 9.0+ds2
- elf_nextscn at FBSD_1.0 9.0+ds2
- elf_rand at FBSD_1.0 9.0+ds2
- elf_rawdata at FBSD_1.0 9.0+ds2
- elf_rawfile at FBSD_1.0 9.0+ds2
- elf_setshstrndx at FBSD_1.0 9.0+ds2
- elf_strptr at FBSD_1.0 9.0+ds2
- elf_update at FBSD_1.0 9.0+ds2
- elf_version at FBSD_1.0 9.0+ds2
- gelf_checksum at FBSD_1.0 9.0+ds2
- gelf_fsize at FBSD_1.0 9.0+ds2
+libelf-freebsd.so.1 libelf-freebsd-1 #MINVER#
+ FBSD_1.0 at FBSD_1.0 9.0
+ FBSDprivate_1.0 at FBSDprivate_1.0 9.0
+ _libelf_get_max_error at FBSDprivate_1.0 9.0
+ _libelf_get_no_error_message at FBSDprivate_1.0 9.0
+ _libelf_get_unknown_error_message at FBSDprivate_1.0 9.0
+ _libelf_set_error at FBSDprivate_1.0 9.0
+ elf32_checksum at FBSD_1.0 9.0
+ elf32_fsize at FBSD_1.0 9.0
+ elf32_getehdr at FBSD_1.0 9.0
+ elf32_getphdr at FBSD_1.0 9.0
+ elf32_getshdr at FBSD_1.0 9.0
+ elf32_newehdr at FBSD_1.0 9.0
+ elf32_newphdr at FBSD_1.0 9.0
+ elf32_xlatetof at FBSD_1.0 9.0
+ elf32_xlatetom at FBSD_1.0 9.0
+ elf64_checksum at FBSD_1.0 9.0
+ elf64_fsize at FBSD_1.0 9.0
+ elf64_getehdr at FBSD_1.0 9.0
+ elf64_getphdr at FBSD_1.0 9.0
+ elf64_getshdr at FBSD_1.0 9.0
+ elf64_newehdr at FBSD_1.0 9.0
+ elf64_newphdr at FBSD_1.0 9.0
+ elf64_xlatetof at FBSD_1.0 9.0
+ elf64_xlatetom at FBSD_1.0 9.0
+ elf_begin at FBSD_1.0 9.0
+ elf_cntl at FBSD_1.0 9.0
+ elf_end at FBSD_1.0 9.0
+ elf_errmsg at FBSD_1.0 9.0
+ elf_errno at FBSD_1.0 9.0
+ elf_fill at FBSD_1.0 9.0
+ elf_flagdata at FBSD_1.0 9.0
+ elf_flagehdr at FBSD_1.0 9.0
+ elf_flagelf at FBSD_1.0 9.0
+ elf_flagphdr at FBSD_1.0 9.0
+ elf_flagscn at FBSD_1.0 9.0
+ elf_flagshdr at FBSD_1.0 9.0
+ elf_getarhdr at FBSD_1.0 9.0
+ elf_getarsym at FBSD_1.0 9.0
+ elf_getbase at FBSD_1.0 9.0
+ elf_getdata at FBSD_1.0 9.0
+ elf_getident at FBSD_1.0 9.0
+ elf_getphdrnum at FBSD_1.0 9.0
+ elf_getphnum at FBSD_1.0 9.0
+ elf_getscn at FBSD_1.0 9.0
+ elf_getshdrnum at FBSD_1.0 9.0
+ elf_getshdrstrndx at FBSD_1.0 9.0
+ elf_getshnum at FBSD_1.0 9.0
+ elf_getshstrndx at FBSD_1.0 9.0
+ elf_hash at FBSD_1.0 9.0
+ elf_kind at FBSD_1.0 9.0
+ elf_memory at FBSD_1.0 9.0
+ elf_ndxscn at FBSD_1.0 9.0
+ elf_newdata at FBSD_1.0 9.0
+ elf_newscn at FBSD_1.0 9.0
+ elf_next at FBSD_1.0 9.0
+ elf_nextscn at FBSD_1.0 9.0
+ elf_rand at FBSD_1.0 9.0
+ elf_rawdata at FBSD_1.0 9.0
+ elf_rawfile at FBSD_1.0 9.0
+ elf_setshstrndx at FBSD_1.0 9.0
+ elf_strptr at FBSD_1.0 9.0
+ elf_update at FBSD_1.0 9.0
+ elf_version at FBSD_1.0 9.0
+ gelf_checksum at FBSD_1.0 9.0
+ gelf_fsize at FBSD_1.0 9.0
gelf_getcap at FBSD_1.0 9.1
- gelf_getclass at FBSD_1.0 9.0+ds2
- gelf_getdyn at FBSD_1.0 9.0+ds2
- gelf_getehdr at FBSD_1.0 9.0+ds2
+ gelf_getclass at FBSD_1.0 9.0
+ gelf_getdyn at FBSD_1.0 9.0
+ gelf_getehdr at FBSD_1.0 9.0
gelf_getmove at FBSD_1.0 9.1
- gelf_getphdr at FBSD_1.0 9.0+ds2
- gelf_getrel at FBSD_1.0 9.0+ds2
- gelf_getrela at FBSD_1.0 9.0+ds2
- gelf_getshdr at FBSD_1.0 9.0+ds2
- gelf_getsym at FBSD_1.0 9.0+ds2
+ gelf_getphdr at FBSD_1.0 9.0
+ gelf_getrel at FBSD_1.0 9.0
+ gelf_getrela at FBSD_1.0 9.0
+ gelf_getshdr at FBSD_1.0 9.0
+ gelf_getsym at FBSD_1.0 9.0
gelf_getsyminfo at FBSD_1.0 9.1
- gelf_getsymshndx at FBSD_1.0 9.0+ds2
- gelf_newehdr at FBSD_1.0 9.0+ds2
- gelf_newphdr at FBSD_1.0 9.0+ds2
+ gelf_getsymshndx at FBSD_1.0 9.0
+ gelf_newehdr at FBSD_1.0 9.0
+ gelf_newphdr at FBSD_1.0 9.0
gelf_update_cap at FBSD_1.0 9.1
- gelf_update_dyn at FBSD_1.0 9.0+ds2
- gelf_update_ehdr at FBSD_1.0 9.0+ds2
+ gelf_update_dyn at FBSD_1.0 9.0
+ gelf_update_ehdr at FBSD_1.0 9.0
gelf_update_move at FBSD_1.0 9.1
- gelf_update_phdr at FBSD_1.0 9.0+ds2
- gelf_update_rel at FBSD_1.0 9.0+ds2
- gelf_update_rela at FBSD_1.0 9.0+ds2
- gelf_update_shdr at FBSD_1.0 9.0+ds2
- gelf_update_sym at FBSD_1.0 9.0+ds2
+ gelf_update_phdr at FBSD_1.0 9.0
+ gelf_update_rel at FBSD_1.0 9.0
+ gelf_update_rela at FBSD_1.0 9.0
+ gelf_update_shdr at FBSD_1.0 9.0
+ gelf_update_sym at FBSD_1.0 9.0
gelf_update_syminfo at FBSD_1.0 9.1
- gelf_update_symshndx at FBSD_1.0 9.0+ds2
- gelf_xlatetof at FBSD_1.0 9.0+ds2
- gelf_xlatetom at FBSD_1.0 9.0+ds2
+ gelf_update_symshndx at FBSD_1.0 9.0
+ gelf_xlatetof at FBSD_1.0 9.0
+ gelf_xlatetom at FBSD_1.0 9.0
Modified: trunk/freebsd-libs/debian/libelf-freebsd-dev.install
===================================================================
--- trunk/freebsd-libs/debian/libelf-freebsd-dev.install 2013-10-09 05:53:32 UTC (rev 5025)
+++ trunk/freebsd-libs/debian/libelf-freebsd-dev.install 2013-10-09 21:50:33 UTC (rev 5026)
@@ -1,4 +1,4 @@
-usr/lib/libelf.a
-usr/lib/libelf*.so
+usr/lib/libelf-freebsd.a
+usr/lib/libelf-freebsd*.so
usr/include/gelf.h
usr/include/libelf.h
Modified: trunk/freebsd-libs/debian/patches/dwarf.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/dwarf.diff 2013-10-09 05:53:32 UTC (rev 5025)
+++ trunk/freebsd-libs/debian/patches/dwarf.diff 2013-10-09 21:50:33 UTC (rev 5026)
@@ -1,11 +1,19 @@
--- a/lib/libdwarf/Makefile
+++ b/lib/libdwarf/Makefile
+@@ -1,6 +1,6 @@
+ # $FreeBSD$
+
+-LIB= dwarf
++LIB= dwarf-freebsd
+
+ SRCS= \
+ dwarf_abbrev.c \
@@ -20,7 +20,8 @@
INCS= dwarf.h libdwarf.h
-CFLAGS+= -I${.CURDIR}
-+LDADD+= -L../libelf -lelf
++LDADD+= -L../libelf -lelf-freebsd
+CFLAGS+= -I${.CURDIR} -I../libelf
SHLIB_MAJOR= 3
Modified: trunk/freebsd-libs/debian/patches/elf.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/elf.diff 2013-10-09 05:53:32 UTC (rev 5025)
+++ trunk/freebsd-libs/debian/patches/elf.diff 2013-10-09 21:50:33 UTC (rev 5026)
@@ -1,5 +1,13 @@
--- a/lib/libelf/Makefile
+++ b/lib/libelf/Makefile
+@@ -1,6 +1,6 @@
+ # $FreeBSD$
+
+-LIB= elf
++LIB= elf-freebsd
+
+ SRCS= elf_begin.c \
+ elf_cntl.c \
@@ -158,6 +158,8 @@
libelf_fsize.c: elf_types.m4 libelf_fsize.m4
libelf_msize.c: elf_types.m4 libelf_msize.m4
Modified: trunk/freebsd-libs/debian/patches/series
===================================================================
--- trunk/freebsd-libs/debian/patches/series 2013-10-09 05:53:32 UTC (rev 5025)
+++ trunk/freebsd-libs/debian/patches/series 2013-10-09 21:50:33 UTC (rev 5026)
@@ -1,5 +1,5 @@
# Patches from (or merged in) upstream
-#missing_static_decl.diff
+missing_static_decl.diff
# Patches that are in good shape for merging upstream
@@ -23,8 +23,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
libusb_pthread_condattr_setclock.diff
Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules 2013-10-09 05:53:32 UTC (rev 5025)
+++ trunk/freebsd-libs/debian/rules 2013-10-09 21:50:33 UTC (rev 5026)
@@ -48,8 +48,8 @@
mkdir -p $(ORIGDIR)/sys/kern
mkdir -p $(ORIGDIR)/sys/sys
for i in lib/libcam lib/libdevstat lib/libgeom lib/libipx \
- $(shell # lib/libelf ) \
- $(shell # lib/libdwarf ) \
+ lib/libelf \
+ lib/libdwarf \
lib/libkiconv lib/libnetgraph lib/libjail \
lib/libkvm lib/libmemstat lib/libsbuf lib/libusb \
lib/libusbhid sys/cam \
@@ -70,7 +70,7 @@
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 build-dwarf build-elf
ifeq ($(kernel), kfreebsd)
BUILD_ARCH_TARGETS += \
@@ -171,8 +171,8 @@
dh_testdir
dh_testroot
$(PMAKE) -C $(CURDIR)/lib/libsbuf clean
-# $(PMAKE) -C $(CURDIR)/lib/libdwarf clean
-# $(PMAKE) -C $(CURDIR)/lib/libelf 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
@@ -207,8 +207,8 @@
mkdir -p $(DESTDIR)/lib $(DESTDIR)/usr/lib $(DESTDIR)/usr/include $(DESTDIR)/usr/share/man/man3
$(PMAKE) -C $(CURDIR)/lib/libsbuf install SHLIBDIR=/lib
-# $(PMAKE) -C $(CURDIR)/lib/libdwarf install SHLIBDIR=/usr/lib
-# $(PMAKE) -C $(CURDIR)/lib/libelf install SHLIBDIR=/usr/lib
+ $(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
More information about the Glibc-bsd-commits
mailing list