- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Enable additional debug flags/logging with debugoptimized builds
by Dave Reisner 10 Dec '18

10 Dec '18

This lets developers run a local build with optimizations but also the added debug logging that comes with PACMAN_DEBUG being defined. --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 8837816f..394bd1f5 100644 --- a/meson.build +++ b/meson.build @@ -211,7 +211,7 @@ elif conf.has('HAVE_STRUCT_STATFS_F_FLAGS') conf.set('FSSTATSTYPE', 'struct statfs') endif -if get_option('buildtype') == 'debug' +if get_option('buildtype').startswith('debug') extra_cflags = [ '-Wcast-align', '-Wclobbered', -- 2.19.2

4 6

[pacman-dev] (no subject)
by miguel herrera 10 Dec '18

10 Dec '18

Para Aser finanzas chentepancho5(a)gmail.com

1 0

[pacman-dev] [PATCH] check localdb before upgrading package
by Andrew Gregory 04 Dec '18

04 Dec '18

Commit 2ee7a8d89ad693617307260604e1d58757fd2978 replaced a manual check for a local package with a check for the "oldpkg" member, which gets set at the beginning of the transaction. If the package was also in the remove list, such as when a package gets replaced, it would no longer be in the local db and pacman would try to remove it twice, resulting in superfluous error messages. Fixes: FS#50875, FS#5554 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/add.c | 2 +- test/pacman/meson.build | 1 + test/pacman/tests/TESTS | 1 + .../tests/replace-and-upgrade-package.py | 27 +++++++++++++++++++ 4 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 test/pacman/tests/replace-and-upgrade-package.py diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 5a3e06b8..e415bb17 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -427,7 +427,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, ASSERT(trans != NULL, return -1); /* see if this is an upgrade. if so, remove the old package first */ - if((oldpkg = newpkg->oldpkg)) { + if(_alpm_db_get_pkgfromcache(db, newpkg->name) && (oldpkg = newpkg->oldpkg)) { int cmp = _alpm_pkg_compare_versions(newpkg, oldpkg); if(cmp < 0) { log_msg = "downgrading"; diff --git a/test/pacman/meson.build b/test/pacman/meson.build index dbdb429e..90885015 100644 --- a/test/pacman/meson.build +++ b/test/pacman/meson.build @@ -148,6 +148,7 @@ pacman_tests = [ { 'name': 'tests/remove060.py' }, { 'name': 'tests/remove070.py' }, { 'name': 'tests/remove071.py' }, + { 'name': 'tests/replace-and-upgrade-package.py' }, { 'name': 'tests/replace100.py' }, { 'name': 'tests/replace101.py' }, { 'name': 'tests/replace102.py' }, diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index dc0b4ec3..74c8f674 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -144,6 +144,7 @@ TESTS += test/pacman/tests/remove052.py TESTS += test/pacman/tests/remove060.py TESTS += test/pacman/tests/remove070.py TESTS += test/pacman/tests/remove071.py +TESTS += test/pacman/tests/replace-and-upgrade-package.py TESTS += test/pacman/tests/replace100.py TESTS += test/pacman/tests/replace101.py TESTS += test/pacman/tests/replace102.py diff --git a/test/pacman/tests/replace-and-upgrade-package.py b/test/pacman/tests/replace-and-upgrade-package.py new file mode 100644 index 00000000..ef2152a7 --- /dev/null +++ b/test/pacman/tests/replace-and-upgrade-package.py @@ -0,0 +1,27 @@ +self.description = 'Simultaneously replace and upgrade a package' + +# replacement package +sp1 = pmpkg('foo1', '1-2') +sp1.replaces = ['foo=1-1'] +sp1.conflicts = ['foo=1-1'] +self.addpkg2db('sync', sp1) + +# upgrade package +sp2 = pmpkg('foo', '2-1') +self.addpkg2db('sync', sp2) + +# depend on upgraded package to pull it into transaction +sp3 = pmpkg('bar', '1-1') +sp3.depends = [ 'foo=2-1' ] +self.addpkg2db('sync', sp3) + +lp = pmpkg('foo', '1-1') +self.addpkg2db('local', lp) + +self.args = "-Su bar" + +self.addrule('PACMAN_RETCODE=0') +self.addrule('PKG_VERSION=foo1|1-2') +self.addrule('PKG_VERSION=foo|2-1') +self.addrule('PKG_VERSION=bar|1-1') +self.addrule('!PACMAN_OUTPUT=error') -- 2.19.1

3 4

[pacman-dev] [PATCH] libmakepkg/executable: don't rely on scoped value of $ret to flag outcomes
by Eli Schwartz 04 Dec '18

04 Dec '18

Elsewhere, we return 1 if a library dropin fails, and when running functions in a loop, we use `|| ret=1` to preserve scope. This ensures the return value of the function remains useful in isolation. Do the same thing here as well. Drop trivial function which wraps a dropin that also uses $ret, since it's no longer needed. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- scripts/libmakepkg/executable.sh.in | 2 +- scripts/libmakepkg/executable/ccache.sh.in | 2 +- scripts/libmakepkg/executable/distcc.sh.in | 2 +- scripts/libmakepkg/executable/fakeroot.sh.in | 2 +- scripts/libmakepkg/executable/gpg.sh.in | 4 ++++ scripts/libmakepkg/executable/gzip.sh.in | 2 +- scripts/libmakepkg/executable/pacman.sh.in | 2 +- scripts/libmakepkg/executable/strip.sh.in | 2 +- scripts/libmakepkg/executable/vcs.sh.in | 8 +------- 9 files changed, 12 insertions(+), 14 deletions(-) diff --git a/scripts/libmakepkg/executable.sh.in b/scripts/libmakepkg/executable.sh.in index 68c48038..92031d43 100644 --- a/scripts/libmakepkg/executable.sh.in +++ b/scripts/libmakepkg/executable.sh.in @@ -38,7 +38,7 @@ check_software() { local ret=0 for func in ${executable_functions[@]}; do - $func + $func || ret=1 done return $ret diff --git a/scripts/libmakepkg/executable/ccache.sh.in b/scripts/libmakepkg/executable/ccache.sh.in index dafde076..6143fee2 100644 --- a/scripts/libmakepkg/executable/ccache.sh.in +++ b/scripts/libmakepkg/executable/ccache.sh.in @@ -31,7 +31,7 @@ executable_ccache() { if check_buildoption "ccache" "y"; then if ! type -p ccache >/dev/null; then error "$(gettext "Cannot find the %s binary required for compiler cache usage.")" "ccache" - ret=1 + return 1 fi fi } diff --git a/scripts/libmakepkg/executable/distcc.sh.in b/scripts/libmakepkg/executable/distcc.sh.in index b9883f6b..d3a8cc25 100644 --- a/scripts/libmakepkg/executable/distcc.sh.in +++ b/scripts/libmakepkg/executable/distcc.sh.in @@ -31,7 +31,7 @@ executable_distcc() { if check_buildoption "distcc" "y"; then if ! type -p distcc >/dev/null; then error "$(gettext "Cannot find the %s binary required for distributed compilation.")" "distcc" - ret=1 + return 1 fi fi } diff --git a/scripts/libmakepkg/executable/fakeroot.sh.in b/scripts/libmakepkg/executable/fakeroot.sh.in index e22d9a96..56c1b3fd 100644 --- a/scripts/libmakepkg/executable/fakeroot.sh.in +++ b/scripts/libmakepkg/executable/fakeroot.sh.in @@ -31,7 +31,7 @@ executable_fakeroot() { if check_buildenv "fakeroot" "y" && (( EUID > 0 )); then if ! type -p fakeroot >/dev/null; then error "$(gettext "Cannot find the %s binary.")" "fakeroot" - ret=1 + return 1 fi fi } diff --git a/scripts/libmakepkg/executable/gpg.sh.in b/scripts/libmakepkg/executable/gpg.sh.in index c0f57013..139773ef 100644 --- a/scripts/libmakepkg/executable/gpg.sh.in +++ b/scripts/libmakepkg/executable/gpg.sh.in @@ -28,6 +28,8 @@ source "$LIBRARY/util/option.sh" executable_functions+=('executable_gpg') executable_gpg() { + local ret=0 + if [[ $SIGNPKG == 'y' ]] || { [[ -z $SIGNPKG ]] && check_buildenv "sign" "y"; }; then if ! type -p gpg >/dev/null; then error "$(gettext "Cannot find the %s binary required for signing packages.")" "gpg" @@ -41,4 +43,6 @@ executable_gpg() { ret=1 fi fi + + return $ret } diff --git a/scripts/libmakepkg/executable/gzip.sh.in b/scripts/libmakepkg/executable/gzip.sh.in index 66748320..bb1626bc 100644 --- a/scripts/libmakepkg/executable/gzip.sh.in +++ b/scripts/libmakepkg/executable/gzip.sh.in @@ -31,7 +31,7 @@ executable_gzip() { if check_option "zipman" "y"; then if ! type -p gzip >/dev/null; then error "$(gettext "Cannot find the %s binary required for compressing man and info pages.")" "gzip" - ret=1 + return 1 fi fi } diff --git a/scripts/libmakepkg/executable/pacman.sh.in b/scripts/libmakepkg/executable/pacman.sh.in index d9967f45..d1433ffd 100644 --- a/scripts/libmakepkg/executable/pacman.sh.in +++ b/scripts/libmakepkg/executable/pacman.sh.in @@ -31,7 +31,7 @@ executable_pacman() { if (( ! NODEPS || DEP_BIN || RMDEPS || INSTALL )); then if [[ -z $PACMAN_PATH ]]; then error "$(gettext "Cannot find the %s binary required for dependency operations.")" "$PACMAN" - ret=1 + return 1 fi fi } diff --git a/scripts/libmakepkg/executable/strip.sh.in b/scripts/libmakepkg/executable/strip.sh.in index a6b81db6..867dc928 100644 --- a/scripts/libmakepkg/executable/strip.sh.in +++ b/scripts/libmakepkg/executable/strip.sh.in @@ -31,7 +31,7 @@ executable_strip() { if check_option "strip" "y"; then if ! type -p strip >/dev/null; then error "$(gettext "Cannot find the %s binary required for object file stripping.")" "strip" - ret=1 + return 1 fi fi } diff --git a/scripts/libmakepkg/executable/vcs.sh.in b/scripts/libmakepkg/executable/vcs.sh.in index 527d6f22..46631f39 100644 --- a/scripts/libmakepkg/executable/vcs.sh.in +++ b/scripts/libmakepkg/executable/vcs.sh.in @@ -49,7 +49,7 @@ get_vcsclient() { printf "%s\n" "$client" } -check_vcs_software() { +executable_vcs() { local netfile all_sources all_deps deps ret=0 if (( SOURCEONLY == 1 )); then @@ -101,9 +101,3 @@ check_vcs_software() { return $ret } - -executable_vcs() { - if ! check_vcs_software; then - ret=1 - fi -} -- 2.19.2

2 1

[pacman-dev] [PATCH] configure.ac: use $datarootdir instead of $prefix/share
by Allan McRae 03 Dec '18

03 Dec '18

Even worse, makepkg-template ignored $prefix completely. --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index c369ca74..ba54c2dd 100644 --- a/configure.ac +++ b/configure.ac @@ -101,7 +101,7 @@ AC_ARG_WITH(buildscript, # Help line for buildscript filename AC_ARG_WITH(makepkg-template-dir, AS_HELP_STRING([--with-makepkg-template-dir=name], [set the template dir used by makepkg-template]), - [TEMPLATE_DIR=$withval], [TEMPLATE_DIR=/usr/share/makepkg-template]) + [TEMPLATE_DIR=$withval], [TEMPLATE_DIR=${datarootdir}/makepkg-template]) # Help line for debug package suffix AC_ARG_WITH(debug-suffix, @@ -216,7 +216,7 @@ AC_CHECK_LIB([m], [fabs], , AC_MSG_ERROR([libm is needed to compile pacman!])) PKG_CHECK_VAR(bashcompdir, [bash-completion], [completionsdir], , - bashcompdir="${prefix}/share/bash-completion/completions") + bashcompdir="${datarootdir}/bash-completion/completions") # Check for libarchive PKG_CHECK_MODULES(LIBARCHIVE, [libarchive >= 3.0.0], , -- 2.19.1

1 0

[pacman-dev] [PATCH] Make `make distcheck` work again.
by Eli Schwartz 03 Dec '18

03 Dec '18

bash-completion uses pkg-config to determine the best installation directory, but this does not take --prefix into account (although it works fine with DESTDIR). The fallback value does attempt to set this based on --prefix. The distcheck uses --prefix, though, which means when attempting to install the results and bash-completion support for pkg-config was detected, it errors out on trying to write to, usually, /usr/share. Tell distcheck to use the prefix-based fallback location instead, as the PKG_CHECK_* override. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 85be82b4..1e9ee152 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,7 +9,8 @@ ACLOCAL_AMFLAGS = -I m4 --install AM_MAKEFLAGS = --no-print-directory # Make sure we test and build manpages when doing distcheck -DISTCHECK_CONFIGURE_FLAGS = --enable-doc --disable-git-version +DISTCHECK_CONFIGURE_FLAGS = --enable-doc --disable-git-version \ + bashcompdir='$${prefix}/share/bash-completion/completions' # Some files automatically included, so they aren't specified below: # AUTHORS, COPYING, NEWS, README -- 2.19.2

2 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-75-g5fc3056e
by Allan McRae 28 Nov '18

28 Nov '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 5fc3056e6a89bda51d48fe6273fe5e6e2ae986d9 (commit) via e1b9dc6bea9585701637e0ed14f24cb5b20cf341 (commit) via 71f837e45ea56eb7457759fbb31164f62c10a112 (commit) via 83a16d30416cd853898e3cbb9dd57d700a85ddb4 (commit) via 363664e47dd99e8f9593ecf98d73544617fb72fd (commit) via fbc6d8b42811d6d0507ec9dcc33e729cdcc54029 (commit) via 6e819c819a319b47a35c598200ea4a0cf35b517a (commit) via b95ba13df15217f4cad40fcde8f6b5fe7ff1118a (commit) from 44cfc09511aa7c67eb09ee5ceec5cf6f23f7f9c9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5fc3056e6a89bda51d48fe6273fe5e6e2ae986d9 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Nov 13 23:14:31 2018 -0500 scripts: make repo-add utilize a wrapper as well Now that repo-add uses libmakepkg, it needs to have $LIBRARY set before testing it in-tree. [Allan: fix "make distcheck"] Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e1b9dc6bea9585701637e0ed14f24cb5b20cf341 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Nov 13 21:28:21 2018 -0500 autotools: be more accurate in comments when generating processed scripts Instead of assuming all scripts are .sh.in and leaving a comment to that effect, just take the input file directly. This depends on the first dependency for the target being the source of the script. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 71f837e45ea56eb7457759fbb31164f62c10a112 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sat Nov 3 20:46:42 2018 -0400 scripts: fix some inaccurate Makefile targets, and be more templated All of our scripts depend on the same pattern .sh.in, and since commit b5d62d2c91a2caf5c18945921cdf12af6f36b2d4, they also all (not just makepkg itself) depend on libmakepkg. There's no real reason to include separate targets for them just to establish dependency rules. While we are at it, fix a longstanding bug where generated wrapper scripts did not depend on wrapper.sh.in (which due to moving to .lib, requires we regenerate the script too), by making the shared target pattern depend on it. All our generated scripts now require the wrapper, even repo-add which now uses libmakepkg. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 83a16d30416cd853898e3cbb9dd57d700a85ddb4 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Tue Nov 13 22:46:36 2018 -0500 scripts: fix repo-remove/elephant Makefile targets repo-remove and repo-elephant don't care whether repo-add.sh.in is updated... but they do require the repo-add target to be up to date, so use that instead. As a bonus, use the same rule for both of them. commit 363664e47dd99e8f9593ecf98d73544617fb72fd Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Nov 4 23:24:39 2018 -0500 meson: be more accurate in comments when generating processed scripts Instead of assuming all scripts are .sh.in and leaving a comment to that effect, just take the input file directly. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fbc6d8b42811d6d0507ec9dcc33e729cdcc54029 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Oct 21 17:36:53 2018 -0400 build-aux: rm annoying and useless file tap-driver.sh is added to the build tree by autoreconf, and contains upstream modifications as such. This results in dirty working trees. It was originally added in commit 403c175dbc84a8198b92bbe76f66eade613cff48 which made the testsuite use automake, but as far as I can tell, never served any purpose. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6e819c819a319b47a35c598200ea4a0cf35b517a Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Nov 16 19:47:31 2018 -0800 add missing tests to meson.build Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b95ba13df15217f4cad40fcde8f6b5fe7ff1118a Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Nov 16 19:47:32 2018 -0800 common/ini: remove unnecessary alpm include Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: build-aux/edit-script.sh.in | 2 +- build-aux/tap-driver.sh | 652 -------------------------------------------- scripts/Makefile.am | 36 +-- src/common/ini.c | 3 +- test/pacman/meson.build | 2 + 5 files changed, 13 insertions(+), 682 deletions(-) delete mode 100755 build-aux/tap-driver.sh hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/1] Split prepare_buildenv() to libmakepkg scripts
by Que Quotion 27 Nov '18

27 Nov '18

From: Que Quotion <quequotion(a)gmail.com> As Eli Schwartz has pointed out: https://lists.archlinux.org/pipermail/pacman-dev/2018-May/022501.html It would be beneficial to makepkg to have this function ported to libmakepkg and split into individual scripts. Supersedes: https://patchwork.archlinux.org/patch/540/ Signed-off-by: Que Quotion <quequotion(a)gmail.com> --- scripts/Makefile.am | 6 ++ scripts/libmakepkg/buildenv.sh.in | 55 ++++++++++++++++++ scripts/libmakepkg/buildenv/buildflags.sh.in | 34 +++++++++++ scripts/libmakepkg/buildenv/ccache.sh.in | 45 +++++++++++++++ scripts/libmakepkg/buildenv/distcc.sh.in | 47 +++++++++++++++ scripts/libmakepkg/buildenv/makeflags.sh.in | 34 +++++++++++ scripts/libmakepkg/buildenv/meson.build | 20 +++++++ scripts/libmakepkg/meson.build | 1 + scripts/makepkg.sh.in | 60 +------------------- 9 files changed, 243 insertions(+), 59 deletions(-) create mode 100644 scripts/libmakepkg/buildenv.sh.in create mode 100644 scripts/libmakepkg/buildenv/buildflags.sh.in create mode 100644 scripts/libmakepkg/buildenv/ccache.sh.in create mode 100644 scripts/libmakepkg/buildenv/distcc.sh.in create mode 100644 scripts/libmakepkg/buildenv/makeflags.sh.in create mode 100644 scripts/libmakepkg/buildenv/meson.build diff --git a/scripts/Makefile.am b/scripts/Makefile.am index c6b6220e..8e669f71 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -41,6 +41,7 @@ LIBRARY = \ libmakepkgdir = $(datarootdir)/makepkg LIBMAKEPKGDIRS = \ + buildenv \ integrity \ lint_config \ lint_package \ @@ -50,6 +51,11 @@ LIBMAKEPKGDIRS = \ util LIBMAKEPKG_IN = \ + libmakepkg/buildenv.sh \ + libmakepkg/buildenv/buildflags.sh \ + libmakepkg/buildenv/ccache.sh \ + libmakepkg/buildenv/distcc.sh \ + libmakepkg/buildenv/makeflags.sh \ libmakepkg/integrity.sh \ libmakepkg/integrity/generate_checksum.sh \ libmakepkg/integrity/generate_signature.sh \ diff --git a/scripts/libmakepkg/buildenv.sh.in b/scripts/libmakepkg/buildenv.sh.in new file mode 100644 index 00000000..a14a3a9a --- /dev/null +++ b/scripts/libmakepkg/buildenv.sh.in @@ -0,0 +1,55 @@ +#!/bin/bash +# +# buildenv.sh - functions for altering the build environment before +# compiliation +# +# Copyright (c) 2018 Pacman Development Team <pacman-dev(a)archlinux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +[[ -n "$LIBMAKEPKG_BUILDENV_SH" ]] && return +LIBMAKEPKG_BUILDENV_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/message.sh" +source "$LIBRARY/util/option.sh" + + +declare -a build_options + +for lib in "$LIBRARY/buildenv/"*.sh; do + source "$lib" +done + +readonly -a build_options + +prepare_buildenv() { + msg "$(gettext "Preparing build environment...")" + + for func in ${build_options[@]}; do + $func + done + + 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}" + CFLAGS+=" $DEBUG_CFLAGS" + CXXFLAGS+=" $DEBUG_CXXFLAGS" + fi + + # ensure all necessary build variables are exported + export CPPFLAGS CFLAGS CXXFLAGS LDFLAGS MAKEFLAGS CHOST +} diff --git a/scripts/libmakepkg/buildenv/buildflags.sh.in b/scripts/libmakepkg/buildenv/buildflags.sh.in new file mode 100644 index 00000000..fb49a85c --- /dev/null +++ b/scripts/libmakepkg/buildenv/buildflags.sh.in @@ -0,0 +1,34 @@ +#!/usr/bin/bash +# +# buildflags.sh - Clear user-specified buildflags if requested +# +# Copyright (c) 2018 Pacman Development Team <pacman-dev(a)archlinux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +[[ -n "$LIBMAKEPKG_BUILDENV_BUILDFLAGS_SH" ]] && return +LIBMAKEPKG_BUILDENV_BUILDFLAGS_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/option.sh" + +build_options+=('buildflags') + +buildflags() { + if check_option "buildflags" "n"; then + unset CPPFLAGS CFLAGS CXXFLAGS LDFLAGS + fi +} diff --git a/scripts/libmakepkg/buildenv/ccache.sh.in b/scripts/libmakepkg/buildenv/ccache.sh.in new file mode 100644 index 00000000..122033a9 --- /dev/null +++ b/scripts/libmakepkg/buildenv/ccache.sh.in @@ -0,0 +1,45 @@ +#!/usr/bin/bash +# +# ccache.sh - Cache compiliations and recycle them to save time on repititions +# +# Copyright (c) 2018 Pacman Development Team <pacman-dev(a)archlinux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +[[ -n "$LIBMAKEPKG_BUILDENV_CCACHE_SH" ]] && return +LIBMAKEPKG_BUILDENV_CCACHE_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/message.sh" +source "$LIBRARY/util/option.sh" + +build_options+=('ccache') + +local ccache=0 + +ccache() { + if check_buildoption "ccache" "y"; then + if ! type -p ccache >/dev/null; then + error "$(gettext "Cannot find the %s binary required for compiler cache usage.")" "ccache" + return 1 + fi + + if [ -d /usr/lib/ccache/bin ]; then + export PATH="/usr/lib/ccache/bin:$PATH" + ccache=1 + fi + fi +} diff --git a/scripts/libmakepkg/buildenv/distcc.sh.in b/scripts/libmakepkg/buildenv/distcc.sh.in new file mode 100644 index 00000000..f7580705 --- /dev/null +++ b/scripts/libmakepkg/buildenv/distcc.sh.in @@ -0,0 +1,47 @@ +#!/usr/bin/bash +# +# distcc.sh - Distribute compliation to reduce compilation time +# +# Copyright (c) 2018 Pacman Development Team <pacman-dev(a)archlinux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +[[ -n "$LIBMAKEPKG_BUILDENV_DISTCC_SH" ]] && return +LIBMAKEPKG_BUILDENV_DISTCC_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/message.sh" +source "$LIBRARY/util/option.sh" + +build_options+=('distcc') + +distcc() { + if check_buildoption "distcc" "y"; then + if ! type -p distcc >/dev/null; then + error "$(gettext "Cannot find the %s binary required for distributed compilation.")" "distcc" + return 1 + fi + + if (( ccache )); then + export CCACHE_PREFIX="${CCACHE_PREFIX:+$CCACHE_PREFIX }distcc" + export CCACHE_BASEDIR="$srcdir" + elif [[ -d /usr/lib/distcc/bin ]]; then + export PATH="/usr/lib/distcc/bin:$PATH" + fi + + export DISTCC_HOSTS + fi +} diff --git a/scripts/libmakepkg/buildenv/makeflags.sh.in b/scripts/libmakepkg/buildenv/makeflags.sh.in new file mode 100644 index 00000000..53ac1e4c --- /dev/null +++ b/scripts/libmakepkg/buildenv/makeflags.sh.in @@ -0,0 +1,34 @@ +#!/usr/bin/bash +# +# makeflags.sh - Clear user-specified makeflags if requested +# +# Copyright (c) 2018 Pacman Development Team <pacman-dev(a)archlinux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +[[ -n "$LIBMAKEPKG_BUILDENV_MAKEFLAGS_SH" ]] && return +LIBMAKEPKG_BUILDENV_MAKEFLAGS_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/option.sh" + +build_options+=('makeflags') + +makeflags() { + if check_option "makeflags" "n"; then + unset MAKEFLAGS + fi +} diff --git a/scripts/libmakepkg/buildenv/meson.build b/scripts/libmakepkg/buildenv/meson.build new file mode 100644 index 00000000..e0d07287 --- /dev/null +++ b/scripts/libmakepkg/buildenv/meson.build @@ -0,0 +1,20 @@ +libmakepkg_module = 'buildenv' + +sources = [ + 'buildflags.sh.in', + 'ccache.sh.in', + 'distcc.sh.in', + 'makeflags.sh.in', +] + +foreach src : sources + output_dir = join_paths(get_option('datadir'), 'makepkg', libmakepkg_module) + + custom_target( + libmakepkg_module + '_' + src.underscorify(), + command : [ SCRIPT_EDITOR, '@INPUT@', '@OUTPUT@' ], + input : src, + output : '@BASENAME@', + install : true, + install_dir : output_dir) +endforeach diff --git a/scripts/libmakepkg/meson.build b/scripts/libmakepkg/meson.build index 07475b4d..3a487f0d 100644 --- a/scripts/libmakepkg/meson.build +++ b/scripts/libmakepkg/meson.build @@ -1,4 +1,5 @@ libmakepkg_modules = [ + { 'name' : 'buildenv', 'has_subdir' : true }, { 'name' : 'integrity', 'has_subdir' : true }, { 'name' : 'lint_config', 'has_subdir' : true }, { 'name' : 'lint_package', 'has_subdir' : true }, diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 3ac03d11..8ce006fb 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -48,11 +48,10 @@ declare -r startdir="$(pwd -P)" LIBRARY=${LIBRARY:-'@libmakepkgdir@'} -build_options=('ccache' 'distcc' 'buildflags' 'makeflags') splitpkg_overrides=('pkgdesc' 'arch' 'url' 'license' 'groups' 'depends' 'optdepends' 'provides' 'conflicts' 'replaces' 'backup' 'options' 'install' 'changelog') -readonly -a build_options splitpkg_overrides +readonly -a splitpkg_overrides known_hash_algos=('md5' 'sha1' 'sha224' 'sha256' 'sha384' 'sha512') @@ -380,47 +379,6 @@ source_buildfile() { source_safe "$@" } -prepare_buildenv() { - # clear user-specified buildflags if requested - if check_option "buildflags" "n"; then - unset CPPFLAGS CFLAGS CXXFLAGS LDFLAGS - fi - - 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}" - CFLAGS+=" $DEBUG_CFLAGS" - CXXFLAGS+=" $DEBUG_CXXFLAGS" - fi - - # clear user-specified makeflags if requested - if check_option "makeflags" "n"; then - unset MAKEFLAGS - fi - - # ensure all necessary build variables are exported - export CPPFLAGS CFLAGS CXXFLAGS LDFLAGS MAKEFLAGS CHOST - - local ccache=0 - - # use ccache if it is requested (check buildenv and PKGBUILD opts) - if check_buildoption "ccache" "y" && [[ -d /usr/lib/ccache/bin ]]; then - export PATH="/usr/lib/ccache/bin:$PATH" - ccache=1 - fi - - # use distcc if it is requested (check buildenv and PKGBUILD opts) - if check_buildoption "distcc" "y"; then - if (( ccache )); then - export CCACHE_PREFIX="${CCACHE_PREFIX:+$CCACHE_PREFIX }distcc" - export CCACHE_BASEDIR="$srcdir" - elif [[ -d /usr/lib/distcc/bin ]]; then - export PATH="/usr/lib/distcc/bin:$PATH" - fi - export DISTCC_HOSTS - fi -} - run_function_safe() { local restoretrap restoreshopt @@ -1029,22 +987,6 @@ check_software() { done fi - # distcc - compilation with distcc - if check_buildoption "distcc" "y"; then - if ! type -p distcc >/dev/null; then - error "$(gettext "Cannot find the %s binary required for distributed compilation.")" "distcc" - ret=1 - fi - fi - - # ccache - compilation with ccache - if check_buildoption "ccache" "y"; then - if ! type -p ccache >/dev/null; then - error "$(gettext "Cannot find the %s binary required for compiler cache usage.")" "ccache" - ret=1 - fi - fi - # strip - strip symbols from binaries/libraries if check_option "strip" "y"; then if ! type -p strip >/dev/null; then -- 2.19.1

3 23

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.1.1-67-g44cfc095
by Allan McRae 27 Nov '18

27 Nov '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 44cfc09511aa7c67eb09ee5ceec5cf6f23f7f9c9 (commit) via 61fe73804305a8bbb434cdc245944df5284f1964 (commit) via 3726693612a7ab34a1cd27916a6d65314299812c (commit) via 508b4e3ec0cb3e365942f4dc0626edda4789932b (commit) via 0bb04fa16a82db133dd010478c1256bc8500c5e7 (commit) via d81b5cc2a5193a344fc6f9cbf72d406d5597d85b (commit) via 1aaf95089a971730b1c7bcdf6fd98c0534459b01 (commit) via 926eb345c26690ca93b6483ac949612c9b53e9db (commit) via c41222837d76d550921a70dd95c509537031102c (commit) via 0dd14924424478564321fc681e3f344b53fb7b54 (commit) from de915c4f145d6e985c3c0fdf8fe121b5066d711c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 44cfc09511aa7c67eb09ee5ceec5cf6f23f7f9c9 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Nov 24 15:56:13 2018 -0800 require actual siglevel for default ALPM_SIG_USE_DEFAULT does not refer to an actual siglevel, rather it indicates that the global default should be used in place of the operation-specific one. Setting this value for the global default itself makes no sense. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 61fe73804305a8bbb434cdc245944df5284f1964 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Nov 24 15:56:12 2018 -0800 always allow explicit empty siglevel for sync dbs An empty siglevel does not do any signature verification which is exactly what we want when compiled without gpg support. This is already allowed in other parts of the codebase and required for the test suite to pass when compiled without gpg support. Fixes: FS#60880 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3726693612a7ab34a1cd27916a6d65314299812c Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Nov 24 15:56:11 2018 -0800 add specific error for missing gpg support "wrong or NULL argument passed" is a useless error for end users. Fixes FS#60880. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 508b4e3ec0cb3e365942f4dc0626edda4789932b Author: Que Quotion <quequotion(a)gmail.com> Date: Tue Nov 27 18:23:02 2018 +0900 Split prepare_buildenv() to libmakepkg This opens the door for third parties to provide libmakepkg extentions for the purpose of altering the build environment. Signed-off-by: Que Quotion <quequotion(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0bb04fa16a82db133dd010478c1256bc8500c5e7 Author: Que Quotion <quequotion(a)gmail.com> Date: Tue Nov 27 18:23:00 2018 +0900 Split check_software() to libmakepkg This opens the door for third parties who provide extensions to libmakepkg to supply scripts that confirm the presence of their dependant executables. Signed-off-by: Que Quotion <quequotion(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d81b5cc2a5193a344fc6f9cbf72d406d5597d85b Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Nov 13 23:17:02 2018 -0500 scripts/meson: ensure wrapper scripts are executable commit 1aaf95089a971730b1c7bcdf6fd98c0534459b01 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sun Nov 4 18:27:22 2018 -0500 makepkg: if "!buildflags" and "debug" coincide, unset the debug buildflags too If a user has a makepkg.conf policy to enable debug builds, but a PKGBUILD has disabled buildflags, we would unset the *FLAGS but then later append the debug *FLAGS anyway, which would result in some *FLAGS being used, against the wishes of the PKGBUILD author. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 926eb345c26690ca93b6483ac949612c9b53e9db Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Nov 3 20:00:07 2018 -0400 buildsys: remove size_to_human This was only ever used by paccache, and paccache has since been moved to pacman-contrib. commit c41222837d76d550921a70dd95c509537031102c Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Nov 3 19:58:31 2018 -0400 meson: separate out wrapped from non-wrapped scripts makepkg-template is a perl script and doesn't get wrapped by our shell wrapper. It (wrongly) reads from the host machine rather than the build root, but this is working as implemented. commit 0dd14924424478564321fc681e3f344b53fb7b54 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Nov 27 22:42:13 2018 +1000 Remove Doxyfile from EXTRA_DIST We generate this now, so no need to distribute. Fixes "make dist". Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/Makefile.am | 1 - lib/libalpm/alpm.h | 4 +- lib/libalpm/be_sync.c | 4 +- lib/libalpm/error.c | 3 + lib/libalpm/handle.c | 11 +- scripts/Makefile.am | 21 +- .../{lint_pkgbuild.sh.in => buildenv.sh.in} | 25 ++- .../{tidy/docs.sh.in => buildenv/buildflags.sh.in} | 22 +-- scripts/libmakepkg/buildenv/compiler.sh.in | 55 ++++++ .../{tidy/docs.sh.in => buildenv/debugflags.sh.in} | 25 +-- .../{tidy/docs.sh.in => buildenv/makeflags.sh.in} | 22 +-- .../{lint_config => buildenv}/meson.build | 8 +- .../{lint_config.sh.in => executable.sh.in} | 25 ++- .../{tidy/docs.sh.in => executable/ccache.sh.in} | 24 +-- .../file_names.sh.in => executable/checksum.sh.in} | 32 +-- .../{tidy/docs.sh.in => executable/distcc.sh.in} | 24 +-- .../{tidy/docs.sh.in => executable/fakeroot.sh.in} | 24 +-- .../{integrity.sh.in => executable/gpg.sh.in} | 39 ++-- .../{tidy/docs.sh.in => executable/gzip.sh.in} | 24 +-- .../libmakepkg/{tidy => executable}/meson.build | 17 +- .../{tidy/docs.sh.in => executable/pacman.sh.in} | 24 +-- .../{tidy/docs.sh.in => executable/strip.sh.in} | 24 +-- .../{tidy/docs.sh.in => executable/sudo.sh.in} | 25 ++- scripts/libmakepkg/executable/vcs.sh.in | 109 +++++++++++ scripts/libmakepkg/meson.build | 2 + scripts/library/README | 4 - scripts/library/size_to_human.sh | 22 --- scripts/makepkg.sh.in | 216 +-------------------- scripts/meson.build | 42 ++-- scripts/po/POTFILES.in | 1 - 30 files changed, 419 insertions(+), 460 deletions(-) copy scripts/libmakepkg/{lint_pkgbuild.sh.in => buildenv.sh.in} (64%) copy scripts/libmakepkg/{tidy/docs.sh.in => buildenv/buildflags.sh.in} (63%) create mode 100644 scripts/libmakepkg/buildenv/compiler.sh.in copy scripts/libmakepkg/{tidy/docs.sh.in => buildenv/debugflags.sh.in} (57%) copy scripts/libmakepkg/{tidy/docs.sh.in => buildenv/makeflags.sh.in} (63%) copy scripts/libmakepkg/{lint_config => buildenv}/meson.build (74%) copy scripts/libmakepkg/{lint_config.sh.in => executable.sh.in} (66%) mode change 100755 => 100644 copy scripts/libmakepkg/{tidy/docs.sh.in => executable/ccache.sh.in} (61%) copy scripts/libmakepkg/{lint_package/file_names.sh.in => executable/checksum.sh.in} (56%) copy scripts/libmakepkg/{tidy/docs.sh.in => executable/distcc.sh.in} (61%) copy scripts/libmakepkg/{tidy/docs.sh.in => executable/fakeroot.sh.in} (61%) copy scripts/libmakepkg/{integrity.sh.in => executable/gpg.sh.in} (53%) copy scripts/libmakepkg/{tidy/docs.sh.in => executable/gzip.sh.in} (62%) copy scripts/libmakepkg/{tidy => executable}/meson.build (65%) copy scripts/libmakepkg/{tidy/docs.sh.in => executable/pacman.sh.in} (60%) copy scripts/libmakepkg/{tidy/docs.sh.in => executable/strip.sh.in} (62%) copy scripts/libmakepkg/{tidy/docs.sh.in => executable/sudo.sh.in} (60%) create mode 100644 scripts/libmakepkg/executable/vcs.sh.in delete mode 100644 scripts/library/size_to_human.sh hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Remove Doxyfile from EXTRA_DIST
by Allan McRae 27 Nov '18

27 Nov '18

We generate this now, so no need to distribute. Fixes "make dist". Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 711921fd..4bb0f01b 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -65,7 +65,6 @@ EXTRA_DIST = \ index.asciidoc \ submitting-patches.asciidoc \ translation-help.asciidoc \ - Doxyfile \ $(MANPAGES) \ $(DOXYGEN_MANS) -- 2.19.1

1 0