September 2019 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/4] libalpm: fix incorrect documentation
by morganamilo 07 Oct '19

07 Oct '19

--- lib/libalpm/deps.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 71185c68..ce7869c3 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -643,10 +643,9 @@ int _alpm_recursedeps(alpm_db_t *db, alpm_list_t **targs, int include_explicit) * @param dep is the dependency to search for * @param dbs are the databases to search * @param excluding are the packages to exclude from the search - * @param prompt if true, will cause an unresolvable dependency to issue an - * interactive prompt asking whether the package should be removed from - * the transaction or the transaction aborted; if false, simply returns - * an error code without prompting + * @param prompt if true, ask an alpm_question_install_ignorepkg_t to decide + * if ignored packages should be installed; if false, skip ignored + * packages. * @return the resolved package **/ static alpm_pkg_t *resolvedep(alpm_handle_t *handle, alpm_depend_t *dep, @@ -766,8 +765,11 @@ static alpm_pkg_t *resolvedep(alpm_handle_t *handle, alpm_depend_t *dep, /** Find a package satisfying a specified dependency. * First look for a literal, going through each db one by one. Then look for - * providers. The first satisfier found is returned. + * providers. The first satisfier that belongs to an installed package is + * returned. If no providers belong to an installed package then an + * alpm_question_select_provider_t is created to select the provider. * The dependency can include versions with depmod operators. + * * @param handle the context handle * @param dbs an alpm_list_t* of alpm_db_t where the satisfier will be searched * @param depstring package or provision name, versioned or not -- 2.23.0

3 8

[pacman-dev] [PATCH 1/2] pacman-key: when refreshing gpg.conf, don't truncate option checking
by Eli Schwartz 07 Oct '19

07 Oct '19

If an option is a two-part option, we print both (separated by IFS=' '), but when grepping to see if it already exists, we only checked the first component. This means that something like keyserver-options could only check if there were existing keyserver options of any sort, but not which ones. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/pacman-key.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index b05754e5..c3b02850 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -169,7 +169,7 @@ add_gpg_conf_option() { local conffile=$1; shift # looking for the option 'bare', only leading spaces or # chars allowed, # followed by at least one space and any other text or the end of line. - if ! grep -q "^[[:space:]#]*$1$[[:space:]].*$*$" "$conffile" &>/dev/null; then + if ! grep -q "^[[:space:]#]*$*$[[:space:]].*$*$" "$conffile" &>/dev/null; then printf '%s\n' "$*" >> "$conffile" fi } -- 2.22.0

2 6

[pacman-dev] [PATCH v2 1/2] pacman/pacman-conf: removed hputs macro for usage display
by Matthew Sexton 07 Oct '19

07 Oct '19

Signed-off-by: Matthew Sexton <wsdmatty(a)gmail.com> --- src/pacman/pacman-conf.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/src/pacman/pacman-conf.c b/src/pacman/pacman-conf.c index df874029..d9e596b8 100644 --- a/src/pacman/pacman-conf.c +++ b/src/pacman/pacman-conf.c @@ -37,19 +37,17 @@ static void cleanup(void) static void usage(int ret) { FILE *stream = (ret ? stderr : stdout); -#define hputs(x) fputs(x"\n", stream) - hputs("pacman-conf - query pacman's configuration file"); - hputs("usage: pacman-conf [options] [<directive>...]"); - hputs(" pacman-conf (--repo-list|--help|--version)"); - hputs("options:"); - hputs(" -c, --config=<path> set an alternate configuration file"); - hputs(" -R, --rootdir=<path> set an alternate installation root"); - hputs(" -r, --repo=<remote> query options for a specific repo"); - hputs(" -v, --verbose always show directive names"); - hputs(" -l, --repo-list list configured repositories"); - hputs(" -h, --help display this help information"); - hputs(" -V, --version display version information"); -#undef hputs + fputs("pacman-conf - query pacman's configuration file\n", stream); + fputs("usage: pacman-conf [options] [<directive>...]\n", stream); + fputs(" pacman-conf (--repo-list|--help|--version)\n", stream); + fputs("options:\n", stream); + fputs(" -c, --config=<path> set an alternate configuration file\n", stream); + fputs(" -R, --rootdir=<path> set an alternate installation root\n", stream); + fputs(" -r, --repo=<remote> query options for a specific repo\n", stream); + fputs(" -v, --verbose always show directive names\n", stream); + fputs(" -l, --repo-list list configured repositories\n", stream); + fputs(" -h, --help display this help information\n", stream); + fputs(" -V, --version display version information\n", stream); cleanup(); exit(ret); } -- 2.23.0

2 4

[pacman-dev] [PATCH] makepkg: add rust support for *FLAGS and debug-prefix-map
by Eli Schwartz 07 Oct '19

07 Oct '19

The rust language supports $RUSTFLAGS to be used automatically in all rustc invocations. Allow setting this in makepkg.conf (e.g. for optimization or debuginfo support), and teach debug+strip to pass the rustc command line argument necessary to rewrite source file paths in the debugging symbols. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- doc/makepkg.conf.5.asciidoc | 9 +++++++++ etc/makepkg.conf.in | 2 ++ scripts/libmakepkg/buildenv.sh.in | 2 +- scripts/libmakepkg/buildenv/buildflags.sh.in | 2 +- scripts/libmakepkg/buildenv/debugflags.sh.in | 2 ++ scripts/libmakepkg/lint_config/variable.sh.in | 8 ++++---- 6 files changed, 19 insertions(+), 6 deletions(-) diff --git a/doc/makepkg.conf.5.asciidoc b/doc/makepkg.conf.5.asciidoc index 9292b2a6..3f37190d 100644 --- a/doc/makepkg.conf.5.asciidoc +++ b/doc/makepkg.conf.5.asciidoc @@ -72,6 +72,10 @@ Options **CXXFLAGS=**"cxxflags":: Flags used for the C++ compiler; see CFLAGS for more info. +**RUSTFLAGS=**"rustflags":: + Flags used for the Rust compiler, similar in spirit to CFLAGS. Read + linkman:rustc[1] for more details on the available flags. + **LDFLAGS=**"ldflags":: Flags used for the linker. Several options may be specified with common usage resembling ``-Wl,--hash-style=gnu''. Read ld(1) for more details on @@ -89,6 +93,11 @@ Options **DEBUG_CXXFLAGS=**"debug_cxxflags":: Debug flags used for the C++ compiler; see DEBUG_CFLAGS for more info. +**DEBUG_RUSTFLAGS=**"debug_rustflags":: + Additional compiler flags appended to `RUSTFLAGS` for use in debugging. + Usually this would include: ``-C debuginfo=2''. Read linkman:rustc[1] for + more details on the available flags. + **BUILDENV=(**!distcc !color !ccache check !sign**)**:: This array contains options that affect the build environment; the defaults are shown here. All options should always be left in the array; to enable diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 7e5da993..caf5114b 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -40,11 +40,13 @@ CHOST="@CHOST@" #CFLAGS="-O2 -pipe" #CXXFLAGS="-O2 -pipe" #LDFLAGS="" +#RUSTFLAGS="-C opt-level=2" #-- Make Flags: change this for DistCC/SMP systems #MAKEFLAGS="-j2" #-- Debugging flags #DEBUG_CFLAGS="-g" #DEBUG_CXXFLAGS="-g" +#DEBUG_RUSTFLAGS="-C debuginfo=2" ######################################################################### # BUILD ENVIRONMENT diff --git a/scripts/libmakepkg/buildenv.sh.in b/scripts/libmakepkg/buildenv.sh.in index a8d416c8..2ecd741e 100644 --- a/scripts/libmakepkg/buildenv.sh.in +++ b/scripts/libmakepkg/buildenv.sh.in @@ -36,5 +36,5 @@ prepare_buildenv() { done # ensure all necessary build variables are exported - export CPPFLAGS CFLAGS CXXFLAGS LDFLAGS MAKEFLAGS CHOST + export CPPFLAGS CFLAGS CXXFLAGS LDFLAGS RUSTFLAGS MAKEFLAGS CHOST } diff --git a/scripts/libmakepkg/buildenv/buildflags.sh.in b/scripts/libmakepkg/buildenv/buildflags.sh.in index daccc9cc..871d0d69 100644 --- a/scripts/libmakepkg/buildenv/buildflags.sh.in +++ b/scripts/libmakepkg/buildenv/buildflags.sh.in @@ -30,6 +30,6 @@ buildenv_functions+=('buildenv_buildflags') buildenv_buildflags() { if check_option "buildflags" "n"; then - unset CPPFLAGS CFLAGS DEBUG_CFLAGS CXXFLAGS DEBUG_CXXFLAGS LDFLAGS + unset CPPFLAGS CFLAGS DEBUG_CFLAGS CXXFLAGS DEBUG_CXXFLAGS LDFLAGS RUSTFLAGS fi } diff --git a/scripts/libmakepkg/buildenv/debugflags.sh.in b/scripts/libmakepkg/buildenv/debugflags.sh.in index ce9c1556..19c96700 100644 --- a/scripts/libmakepkg/buildenv/debugflags.sh.in +++ b/scripts/libmakepkg/buildenv/debugflags.sh.in @@ -32,7 +32,9 @@ buildenv_debugflags() { if check_option "debug" "y"; then DEBUG_CFLAGS+=" -fdebug-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}" DEBUG_CXXFLAGS+=" -fdebug-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}" + DEBUG_RUSTFLAGS+=" --remap-path-prefix=$srdir=${DBGSRCDIR:-/usr/src/debug}" CFLAGS+=" $DEBUG_CFLAGS" CXXFLAGS+=" $DEBUG_CXXFLAGS" + RUSTFLAGS+=" $DEBUG_RUSTFLAGS" fi } diff --git a/scripts/libmakepkg/lint_config/variable.sh.in b/scripts/libmakepkg/lint_config/variable.sh.in index 55ed6d6d..e73e13de 100644 --- a/scripts/libmakepkg/lint_config/variable.sh.in +++ b/scripts/libmakepkg/lint_config/variable.sh.in @@ -32,10 +32,10 @@ lint_config_variables() { local array=(DLAGENTS VCSCLIENTS BUILDENV OPTIONS INTEGRITY_CHECK MAN_DIRS DOC_DIRS PURGE_TARGETS COMPRESSGZ COMPRESSBZ2 COMPRESSXZ COMPRESSLRZ COMPRESSLZO COMPRESSZ) - local string=(CARCH CHOST CPPFLAGS CFLAGS CXXFLAGS LDFLAGS DEBUG_CFLAGS - DEBUG_CXXFLAGS DISTCC_HOSTS BUILDDIR STRIP_BINARIES STRIP_SHARED - STRIP_STATIC PKGDEST SRCDEST SRCPKGDEST LOGDEST PACKAGER GPGKEY - PKGEXT SRCEXT) + local string=(CARCH CHOST CPPFLAGS CFLAGS CXXFLAGS RUSTFLAGS LDFLAGS DEBUG_CFLAGS + DEBUG_CXXFLAGS DEBUG_RUSTFLAGS DISTCC_HOSTS BUILDDIR STRIP_BINARIES + STRIP_SHARED STRIP_STATIC PKGDEST SRCDEST SRCPKGDEST LOGDEST PACKAGER + GPGKEY PKGEXT SRCEXT) local i keys ret=0 -- 2.22.0

3 5

[pacman-dev] [PATCH 0/2] Building a unified dist tarball for
by Eli Schwartz 04 Oct '19

04 Oct '19

We currently support both autotools and meson, and each one has a mechanism for generating a distribution tarball which we can upload and sign. But using one won't let you build with the other build system (at least currently). autotools simply doesn't distribute meson bits, and meson will distribute anything checked into git, but not the autogen'ed content that users may well rely on. Here is a patch for each build system, which teaches it how to distribute the other's files. Eli Schwartz (2): autotools: distribute meson files meson: generate the autotools distribution files Makefile.am | 9 ++++++++- autogen.sh | 6 +++++- doc/Makefile.am | 1 + lib/libalpm/Makefile.am | 2 ++ meson.build | 2 ++ scripts/Makefile.am | 2 ++ src/common/Makefile.am | 3 ++- src/pacman/Makefile.am | 2 ++ src/util/Makefile.am | 2 ++ test/pacman/Makefile.am | 1 + test/scripts/Makefile.am | 1 + test/util/Makefile.am | 1 + 12 files changed, 29 insertions(+), 3 deletions(-) -- 2.22.1

2 4

[pacman-dev] [PATCH 1/2] meson: fix libcommon being publicly exposed as a static link dependency
by Eli Schwartz 02 Oct '19

02 Oct '19

libcommon isn't even installed, so that means libalpm.a (if installed) is fatally broken as it misses objects. The problem is that meson doesn't handle this case correctly: https://github.com/mesonbuild/meson/issues/3934 https://github.com/mesonbuild/meson/issues/3937 https://github.com/mesonbuild/meson/pull/3939 Work around this by manually extracting libcommon's .o files into the list of objects used to create libalpm. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 389a95b7..5199759f 100644 --- a/meson.build +++ b/meson.build @@ -317,9 +317,10 @@ libcommon = static_library( libalpm_a = static_library( 'alpm', libalpm_sources, + # https://github.com/mesonbuild/meson/issues/3937 + objects : libcommon.extract_all_objects(), include_directories : includes, dependencies : [crypto_provider, libarchive, libcurl, gpgme], - link_with : [libcommon], install : true) if get_option('default_library') != 'static' @@ -336,7 +337,6 @@ install_headers( 'lib/libalpm/alpm.h', 'lib/libalpm/alpm_list.h') -# TODO: libs.private seem quite wrong here pkgconfig = import('pkgconfig') pkgconfig.generate( libalpm, -- 2.23.0

1 2

[pacman-dev] Idea for makepkg. Use notify-send when package finishes compiling. (optional feature)
by igo95862 28 Sep '19

28 Sep '19

Often when compiling large packages I find myself missing the "sudo" promt to install compiled package. I have thought of a solution using notify-send command from community/inotify-tools package that will send a notification when the package finishes compiling. (but before install) Could be implemented as an opt-in option in makepkg.conf If you are interested I can send a patch. -- igo95862 <igo95862(a)yandex.ru>

2 2

[pacman-dev] [PATCH] meson: fix incorrect libalpm version
by Eli Schwartz 19 Sep '19

19 Sep '19

LIB_VERSION is supposed to be something like 11.0.1, not simply reiterate the project version. As a result, we ended up with this: $ pacman -V [...] Pacman v5.1.0 - libalpm v5.1.0 [...] Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 650e599f..f5601ff8 100644 --- a/meson.build +++ b/meson.build @@ -69,7 +69,7 @@ conf.set_quoted('PACKAGE_VERSION', PACKAGE_VERSION) conf.set_quoted('LOCALEDIR', LOCALEDIR) conf.set_quoted('SCRIPTLET_SHELL', get_option('scriptlet-shell')) conf.set_quoted('LDCONFIG', LDCONFIG) -conf.set_quoted('LIB_VERSION', meson.project_version()) +conf.set_quoted('LIB_VERSION', libalpm_version) conf.set_quoted('SYSHOOKDIR', join_paths(DATAROOTDIR, 'libalpm/hooks/')) conf.set_quoted('CONFFILE', join_paths(SYSCONFDIR, 'pacman.conf')) conf.set_quoted('DBPATH', join_paths(LOCALSTATEDIR, 'lib/pacman/')) -- 2.23.0

1 0

[pacman-dev] [PATCH] pacman: better handle -F when file is not found
by morganamilo 10 Sep '19

10 Sep '19

Error messages are now printed. Pacman now returns 1 if any of the files queried are not found. --- src/pacman/files.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/pacman/files.c b/src/pacman/files.c index 8e518486..c4351114 100644 --- a/src/pacman/files.c +++ b/src/pacman/files.c @@ -115,7 +115,6 @@ static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) { if(regex) { if(regcomp(&reg, targ, REG_EXTENDED | REG_NOSUB | REG_ICASE | REG_NEWLINE) != 0) { - /* TODO: error message */ goto notfound; } } @@ -174,13 +173,20 @@ static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) { regfree(&reg); } + if(found) { + continue; + } + notfound: - if(!found) { - ret++; + ret = 1; + if(regex) { + pm_printf(ALPM_LOG_ERROR, _("no files match '%s'\n"), targ); + } else { + pm_printf(ALPM_LOG_ERROR, _("no package owns '%s'\n"), targ); } } - return 0; + return ret; } static void dump_file_list(alpm_pkg_t *pkg) { -- 2.23.0

2 1

[pacman-dev] [PATCH] libmakepkg: fix typo
by morganamilo 09 Sep '19

09 Sep '19

--- scripts/libmakepkg/buildenv.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/libmakepkg/buildenv.sh.in b/scripts/libmakepkg/buildenv.sh.in index a8d416c8..085e1380 100644 --- a/scripts/libmakepkg/buildenv.sh.in +++ b/scripts/libmakepkg/buildenv.sh.in @@ -1,7 +1,7 @@ #!/bin/bash # # buildenv.sh - functions for altering the build environment before -# compiliation +# compilation # # Copyright (c) 2015-2018 Pacman Development Team <pacman-dev(a)archlinux.org> # -- 2.23.0

1 0