Remove popt from project's dependencies

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>

diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc
index be9688a313beeb2c256c066a9ae25cd8c132a374..72434e89346dc4ef7dcd15e306ae095898a87794 100644 (file)
--- a/CONTRIBUTING.adoc
+++ b/CONTRIBUTING.adoc
@@ -1489,8 +1489,7 @@ loads libbabeltrace2, use:
 
 ----
 $ 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

diff --git a/Makefile.am b/Makefile.am
index 1c224213114ce984027b68bd12e173504ba7fabb..cb1ec0f7171ab9180f7f4b3c980ecc77a11df6cd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,10 +6,6 @@ SUBDIRS = \
        doc \
        tests
 
-# 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
 

diff --git a/README b/README
index 5e0e76647f81758f936a3aa795b4f85774fc17b9..2f304636c66dd7a18191bab7b6dbc5e5b57ff4d6 100644 (file)
--- a/README
+++ b/README
@@ -43,9 +43,6 @@ To compile Babeltrace, you will need:
        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)

diff --git a/configure.ac b/configure.ac
index e4a0c86dcc8229119cfdd627617f7ca40eb17509..30f72647e654f96db43aa7345780e7eb8956cdd5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -307,26 +307,6 @@ AC_CHECK_LIB([c], [posix_fallocate],
   [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  ##
 ##                 ##

diff --git a/extras/valgrind/popt.supp b/extras/valgrind/popt.supp
deleted file mode 100644 (file)
index 61b5465..0000000
--- a/extras/valgrind/popt.supp
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-       <poptGetArg-within-popt>
-       Memcheck:Leak
-       fun:malloc
-       fun:poptGetNextOpt
-       fun:main
-}
-

diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index 338a85faa8c1060425fbe8d54dba98e01c79974c..0f0884af379186c65ac076f40085a58cb73efacb 100644 (file)
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -59,8 +59,7 @@ babeltrace2_bin_LDADD = \
        $(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.

diff --git a/src/cli/babeltrace2-cfg-cli-args.c b/src/cli/babeltrace2-cfg-cli-args.c
index dd7f4725a80e55f8b4474785c19615530c64e150..617bd51a27d4bbff27aec165bb7f1771a92f75c4 100644 (file)
--- a/src/cli/babeltrace2-cfg-cli-args.c
+++ b/src/cli/babeltrace2-cfg-cli-args.c
@@ -34,7 +34,6 @@
 #include <inttypes.h>
 #include <babeltrace2/babeltrace.h>
 #include "common/common.h"
-#include <popt.h>
 #include <glib.h>
 #include <sys/types.h>
 #include "argpar/argpar.h"
@@ -856,7 +855,7 @@ end:
        return ret;
 }
 
-/* popt options */
+/* argpar options */
 enum {
        OPT_NONE = 0,
        OPT_BASE_PARAMS,

diff --git a/src/cli/babeltrace2-cfg-cli-params-arg.c b/src/cli/babeltrace2-cfg-cli-params-arg.c
index b13172d0e7d9ae153bbc68d85651b5eec9e76e59..e5662c698f247763116a89c6d821034d885641d1 100644 (file)
--- a/src/cli/babeltrace2-cfg-cli-params-arg.c
+++ b/src/cli/babeltrace2-cfg-cli-params-arg.c
@@ -29,7 +29,6 @@
 #include <inttypes.h>
 #include <babeltrace2/babeltrace.h>
 #include "common/common.h"
-#include <popt.h>
 #include <glib.h>
 #include <sys/types.h>
 #include "babeltrace2-cfg.h"

diff --git a/src/cli/babeltrace2.c b/src/cli/babeltrace2.c
index 6a3440242049e9102d395a18aed2ffb1f0a81c2a..1675446eaee7f6e772eec48fead761d3ad56879a 100644 (file)
--- a/src/cli/babeltrace2.c
+++ b/src/cli/babeltrace2.c
@@ -29,7 +29,6 @@
 #include "common/common.h"
 #include <unistd.h>
 #include <stdlib.h>
-#include <popt.h>
 #include <string.h>
 #include <stdio.h>
 #include <glib.h>

diff --git a/src/plugins/ctf/common/metadata/Makefile.am b/src/plugins/ctf/common/metadata/Makefile.am
index 4d1c6358251fee61414d922d16091df772cb194f..aa3b4490081f20498d35750152cea21efddc1d9d 100644 (file)
--- a/src/plugins/ctf/common/metadata/Makefile.am
+++ b/src/plugins/ctf/common/metadata/Makefile.am
@@ -42,7 +42,7 @@ libctf_ast_la_SOURCES = \
        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