All of the argument parsing having been moved to use the internal argpar
library, we can now stop linking with popt. And since it was the last
use of popt in the repo, remove anything related to it.
Change-Id: Id2aee4869780e586833d6b6646e12e19c6d78f6a
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1795
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
----
$ G_SLICE=always-malloc G_DEBUG=gc-friendly PYTHONMALLOC=malloc \
----
$ G_SLICE=always-malloc G_DEBUG=gc-friendly PYTHONMALLOC=malloc \
- LIBBABELTRACE2_NO_DLCLOSE=1 valgrind --leak-check=full \
- --suppressions=/path/to/babeltrace/extras/valgrind/popt.supp app
+ LIBBABELTRACE2_NO_DLCLOSE=1 valgrind --leak-check=full app
----
`G_SLICE=always-malloc` and `G_DEBUG=gc-friendly` is for GLib and
----
`G_SLICE=always-malloc` and `G_DEBUG=gc-friendly` is for GLib and
-# Directories added to EXTRA_DIST will be recursively copied to the distribution.
-EXTRA_DIST = \
- extras
-
dist_doc_DATA = ChangeLog LICENSE mit-license.txt gpl-2.0.txt \
std-ext-lib.txt README CONTRIBUTING.adoc
dist_doc_DATA = ChangeLog LICENSE mit-license.txt gpl-2.0.txt \
std-ext-lib.txt README CONTRIBUTING.adoc
glib 2.22 or better development libraries
(Debian : libglib2.0-0, libglib2.0-dev)
(Fedora : glib2, glib2-devel)
glib 2.22 or better development libraries
(Debian : libglib2.0-0, libglib2.0-dev)
(Fedora : glib2, glib2-devel)
- libpopt >= 1.13 development libraries
- (Debian : libpopt-dev)
- (Fedora : popt)
elfutils >= 0.154 development libraries (optional)
(Debian : libelf-dev, libdw-dev)
(Fedora : elfutils-devel, elfutils-libelf-devel)
elfutils >= 0.154 development libraries (optional)
(Debian : libelf-dev, libdw-dev)
(Fedora : elfutils-devel, elfutils-libelf-devel)
[AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_POSIX_FALLOCATE], 1, [Has posix_fallocate support.])]
)
[AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_POSIX_FALLOCATE], 1, [Has posix_fallocate support.])]
)
-# Check libpopt
-PKG_CHECK_MODULES([POPT], [popt],
- [
- dnl PKG_CHECK_MODULES defines POPT_LIBS
- ],
- [
- AC_MSG_WARN([pkg-config was unable to find a valid .pc for libpopt. Set PKG_CONFIG_PATH to specify the pkgconfig configuration file location])
- AC_MSG_WARN([Finding libpopt without pkg-config.])
- AC_CHECK_LIB([popt],
- [poptGetContext],
- [POPT_LIBS="-lpopt"],
- [
- AC_MSG_FAILURE([Cannot find libpopt. Either set PKG_CONFIG_PATH to the configuration file location or use LDFLAGS=-Ldir to specify the library location])
- ]
- )
- ]
-)
-AC_SUBST(POPT_LIBS)
-
-
## ##
## User variables ##
## ##
## ##
## User variables ##
## ##
+++ /dev/null
-{
- <poptGetArg-within-popt>
- Memcheck:Leak
- fun:malloc
- fun:poptGetNextOpt
- fun:main
-}
-
$(top_builddir)/src/compat/libcompat.la \
$(top_builddir)/src/common/libbabeltrace2-common.la \
$(top_builddir)/src/logging/libbabeltrace2-logging.la \
$(top_builddir)/src/compat/libcompat.la \
$(top_builddir)/src/common/libbabeltrace2-common.la \
$(top_builddir)/src/logging/libbabeltrace2-logging.la \
- $(top_builddir)/src/ctfser/libbabeltrace2-ctfser.la \
- $(POPT_LIBS)
+ $(top_builddir)/src/ctfser/libbabeltrace2-ctfser.la
if ENABLE_BUILT_IN_PLUGINS
# Takes a plugin name and outputs the needed LDFLAGS to embed it.
if ENABLE_BUILT_IN_PLUGINS
# Takes a plugin name and outputs the needed LDFLAGS to embed it.
#include <inttypes.h>
#include <babeltrace2/babeltrace.h>
#include "common/common.h"
#include <inttypes.h>
#include <babeltrace2/babeltrace.h>
#include "common/common.h"
#include <glib.h>
#include <sys/types.h>
#include "argpar/argpar.h"
#include <glib.h>
#include <sys/types.h>
#include "argpar/argpar.h"
enum {
OPT_NONE = 0,
OPT_BASE_PARAMS,
enum {
OPT_NONE = 0,
OPT_BASE_PARAMS,
#include <inttypes.h>
#include <babeltrace2/babeltrace.h>
#include "common/common.h"
#include <inttypes.h>
#include <babeltrace2/babeltrace.h>
#include "common/common.h"
#include <glib.h>
#include <sys/types.h>
#include "babeltrace2-cfg.h"
#include <glib.h>
#include <sys/types.h>
#include "babeltrace2-cfg.h"
#include "common/common.h"
#include <unistd.h>
#include <stdlib.h>
#include "common/common.h"
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <glib.h>
#include <string.h>
#include <stdio.h>
#include <glib.h>
ctf-meta-configure-ir-trace.h
if BABELTRACE_BUILD_WITH_MINGW
ctf-meta-configure-ir-trace.h
if BABELTRACE_BUILD_WITH_MINGW
-libctf_ast_la_LIBADD = -lintl -liconv -lole32 $(POPT_LIBS)
+libctf_ast_la_LIBADD = -lintl -liconv -lole32
endif
# start with empty files to clean
endif
# start with empty files to clean