Skip to content

Commit

Permalink
Merge branch 'release-0.6.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
acolomb committed Nov 15, 2021
2 parents 519f10d + fa2179d commit 6757143
Show file tree
Hide file tree
Showing 8 changed files with 235 additions and 119 deletions.
7 changes: 7 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
2021-11-15 André Colomb <[email protected]>

* Update pointers to available libelf implementations.
* Minor build system updates.

* Release version 0.6.2

2019-10-21 André Colomb <[email protected]>

* Fix cross-compilation error related to undefined rpl_malloc and
Expand Down
247 changes: 167 additions & 80 deletions Doxyfile.in

Large diffs are not rendered by default.

37 changes: 20 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@ additional developer tools installed. The following versions are
tested:

- GNU autoconf 2.69
- GNU automake 1.15
- GNU automake 1.16
- GNU libtool 2.4.6
- GNU gettext 0.19.7
- GNU gettext 0.19.8

To fully generate the build system, run these three commands in order:

Expand Down Expand Up @@ -143,27 +143,30 @@ Dealing with ELF files is done through the standard *libelf* library,
therefore a compatible version must be present. Several different
implementations are available, with varying licenses.

Michael Riepe has written an excellent *LGPL*-licensed implementation,
found at [www.mr511.de][libelf-lgpl]. It is [included][libelfg0] in
most *Debian*-based Linux distributions as well as *Cygwin* and can be
compiled under Win32 using *MinGW*.

[libelf-lgpl]: http://www.mr511.de/software/ "libelf LGPL'ed"
[libelfg0]: https://packages.debian.org/stable/libelfg0-dev "libelf in Debian"

Another implementation is maintained at [fedorahosted.org][elfutils],
as part of the *elfutils* suite, and is mainly *GPLv3*-licensed. It
is also [packaged][elfutils-deb] in *Debian*.
A pretty stable implementation is maintained at
[sourceware.org][elfutils], as part of the *elfutils* suite, and is
dual-licensed under the *GPLv2+* / *LGPLv3+*. It is
[packaged][elfutils-deb] in most *Debian*-based Linux distributions
and can be compiled under Win32 using *MinGW*.

[elfutils]: https://fedorahosted.org/elfutils/
[elfutils-deb]: https://packages.debian.org/stable/libelf-dev
[elfutils]: https://sourceware.org/elfutils/
[elfutils-deb]: https://tracker.debian.org/pkg/elfutils

The [ELF Tool Chain Project][elftoolchain] includes another *libelf*
implementation which is *BSD*-licensed. A corresponding *Debian*
[package][libelf-freebsd] is built from their sources.

[elftoolchain]: http://sourceforge.net/projects/elftoolchain/
[libelf-freebsd]: https://packages.debian.org/jessie/libelf-freebsd-dev
[elftoolchain]: https://sourceforge.net/projects/elftoolchain/
[libelf-freebsd]: https://packages.debian.org/unstable/libelf-freebsd-dev

Up until about 2019, an excellent *LGPL*-licensed implementation,
written by Michael Riepe, used to be found at
[www.mr511.de][libelf-lgpl]. It was [included][libelfg0] in most
*Debian*-based Linux distributions as well as *Cygwin* and can be
compiled under Win32 using *MinGW*.

[libelf-lgpl]: http://www.mr511.de/software/ "libelf LGPL'ed"
[libelfg0]: https://tracker.debian.org/pkg/libelf "libelf in Debian"

Either implementation should work if it supports the BSD *GElf* API.
Just make sure the compiler finds the required headers and library.
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# <http://www.gnu.org/licenses/>.


AC_INIT([elf-mangle], [0.6.1], [[email protected]])
AC_INIT([elf-mangle], [0.6.2], [[email protected]])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR([src/elf-mangle.c])
AC_CONFIG_AUX_DIR([.])
Expand Down
28 changes: 19 additions & 9 deletions gnulib/.gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/.deps
/.libs
/Makefile.am
/_Noreturn.h
/alloca.c
/alloca.h
/alloca.in.h
Expand All @@ -9,34 +10,43 @@
/argp-fmtstream.c
/argp-fmtstream.h
/argp-fs-xinl.c
/argp.h
/argp-help.c
/argp-namefrob.h
/argp-parse.c
/argp-pin.c
/argp-pv.c
/argp-pvh.c
/argp-xinl.c
/argp.h
/asnprintf.c
/basename-lgpl.c
/c++defs.h
/dirname.h
/dirname-lgpl.c
/dirname.h
/dosname.h
/errno.in.h
/float.c
/float+.h
/float.c
/float.in.h
/getopt1.c
/getopt-cdefs.h
/getopt-cdefs.in.h
/getopt-core.h
/getopt-ext.h
/getopt-pfx-core.h
/getopt-pfx-ext.h
/getopt.c
/getopt.h
/getopt.in.h
/getopt1.c
/getopt_int.h
/getsubopt.c
/gettext.h
/intprops.h
/inttypes.h
/inttypes.in.h
/itold.c
/Makefile.am
/limits.h
/limits.in.h
/malloc.c
/memchr.c
/memchr.valgrind
Expand All @@ -60,20 +70,20 @@
/strcasecmp.c
/strchrnul.c
/strchrnul.valgrind
/strerror.c
/strerror-override.c
/strerror-override.h
/string.h
/strerror.c
/string.in.h
/strings.h
/strings.in.h
/stripslash.c
/strncasecmp.c
/strndup.c
/strnlen.c
/sysexits.in.h
/sys/types.h
/sys_types.in.h
/sysexits.in.h
/unistd.c
/unistd.h
/unistd.in.h
Expand All @@ -82,7 +92,7 @@
/verify.h
/vsnprintf.c
/warn-on-use.h
/wchar.h
/wchar.in.h
/xsize.c
/xsize.h
/limits.in.h
11 changes: 6 additions & 5 deletions m4/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
/intlmacosx.m4
/intmax.m4
/intmax_t.m4
/inttypes.m4
/inttypes_h.m4
/inttypes-pri.m4
/lcmessage.m4
Expand All @@ -35,11 +36,12 @@
/lib-prefix.m4
/libtool.m4
/lock.m4
/longlong.m4
/ltoptions.m4
/ltsugar.m4
/ltversion.m4
/lt~obsolete.m4
/limits-h.m4
/longlong.m4
/malloc.m4
/math_h.m4
/memchr.m4
Expand All @@ -49,7 +51,6 @@
/nls.m4
/nocrash.m4
/off_t.m4
/onceonly.m4
/po.m4
/printf.m4
/printf-posix.m4
Expand All @@ -61,8 +62,8 @@
/stdalign.m4
/stdbool.m4
/stddef_h.m4
/stdint_h.m4
/stdint.m4
/stdint_h.m4
/stdio_h.m4
/stdlib_h.m4
/strcase.m4
Expand All @@ -72,11 +73,11 @@
/strings_h.m4
/strndup.m4
/strnlen.m4
/sysexits.m4
/sys_socket_h.m4
/sys_types_h.m4
/threadlib.m4
/uintmax_t.m4
/sysexits.m4
/unistd_h.m4
/vasnprintf.m4
/visibility.m4
Expand All @@ -86,4 +87,4 @@
/wchar_t.m4
/wint_t.m4
/xsize.m4
/limits-h.m4
/zzgnulib.m4
18 changes: 15 additions & 3 deletions m4/gnulib-cache.m4
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2002-2014 Free Software Foundation, Inc.
# Copyright (C) 2002-2020 Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand All @@ -11,7 +11,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this file. If not, see <http://www.gnu.org/licenses/>.
# along with this file. If not, see <https://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License,
# this file may be distributed as part of a program that
Expand All @@ -27,7 +27,19 @@


# Specification in the form of a command-line invocation:
# gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --lgpl --conditional-dependencies --libtool --macro-prefix=gl argp getsubopt
# gnulib-tool --import \
# --lib=libgnu \
# --source-base=gnulib \
# --m4-base=m4 \
# --doc-base=doc \
# --tests-base=tests \
# --aux-dir=. \
# --lgpl \
# --conditional-dependencies \
# --libtool \
# --macro-prefix=gl \
# argp \
# getsubopt

# Specification in the form of a few gnulib-tool.m4 macro invocations:
gl_LOCAL_DIR([])
Expand Down
4 changes: 0 additions & 4 deletions snippet/.gitignore

This file was deleted.

0 comments on commit 6757143

Please sign in to comment.