May 2015 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/6] libmakepkg: move functions for extracting pkgbuild attributes
by Allan McRae 13 May '15

13 May '15

Also rename some functions for clarity: funcgrep -> grep_function extract_global_var -> extract_global_variable extract_function_var -> extract_function_variable pkgbuild_get_attribute -> get_pkgbuild_attribute Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/Makefile.am | 3 +- scripts/libmakepkg/util/pkgbuild.sh | 111 ++++++++++++++++++++++++++++++++ scripts/makepkg.sh.in | 122 +++++------------------------------- 3 files changed, 130 insertions(+), 106 deletions(-) create mode 100644 scripts/libmakepkg/util/pkgbuild.sh diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 57468f9..3dfd903 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -47,7 +47,8 @@ LIBMAKEPKGDIRS = \ LIBMAKEPKG = \ libmakepkg/util/message.sh \ - libmakepkg/util/option.sh + libmakepkg/util/option.sh \ + libmakepkg/util/pkgbuild.sh LIBMAKEPKG_IN = \ libmakepkg/lint_package.sh \ diff --git a/scripts/libmakepkg/util/pkgbuild.sh b/scripts/libmakepkg/util/pkgbuild.sh new file mode 100644 index 0000000..2e97e4d --- /dev/null +++ b/scripts/libmakepkg/util/pkgbuild.sh @@ -0,0 +1,111 @@ +#!/bin/bash +# +# pkgbuild.sh - functions to extract information from PKGBUILD files +# +# Copyright (c) 2014-2015 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_UTIL_PKGBUILD_SH" ] && return +LIBMAKEPKG_UTIL_PKGBUILD_SH=1 + + +have_function() { + declare -f "$1" >/dev/null +} + +grep_function() { + { declare -f "$1" || declare -f package; } 2>/dev/null | grep -E "$2" +} + +array_build() { + local dest=$1 src=$2 i keys values + + # it's an error to try to copy a value which doesn't exist. + declare -p "$2" &>/dev/null || return 1 + + # Build an array of the indicies of the source array. + eval "keys=(\"\${!$2[@]}\")" + + # Clear the destination array + eval "$dest=()" + + # Read values indirectly via their index. This approach gives us support + # for associative arrays, sparse arrays, and empty strings as elements. + for i in "${keys[@]}"; do + values+=("printf -v '$dest[$i]' %s \"\${$src[$i]}\";") + done + + eval "${values[*]}" +} + +extract_global_variable() { + # $1: variable name + # $2: multivalued + # $3: name of output var + + local attr=$1 isarray=$2 outputvar=$3 ref + + if (( isarray )); then + array_build ref "$attr" + [[ ${ref[@]} ]] && array_build "$outputvar" "$attr" + else + [[ ${!attr} ]] && printf -v "$outputvar" %s "${!attr}" + fi +} + +extract_function_variable() { + # $1: function name + # $2: variable name + # $3: multivalued + # $4: name of output var + + local funcname=$1 attr=$2 isarray=$3 outputvar=$4 attr_regex= decl= r=1 + + if (( isarray )); then + printf -v attr_regex '^[[:space:]]* %s\+?=\(' "$2" + else + printf -v attr_regex '^[[:space:]]* %s\+?=[^(]' "$2" + fi + + while read -r; do + # strip leading whitespace and any usage of declare + decl=${REPLY##*([[:space:]])} + eval "${decl/#$attr/$outputvar}" + + # entering this loop at all means we found a match, so notify the caller. + r=0 + done < <(grep_function "$funcname" "$attr_regex") + + return $r +} + +get_pkgbuild_attribute() { + # $1: package name + # $2: attribute name + # $3: multivalued + # $4: name of output var + + local pkgname=$1 attrname=$2 isarray=$3 outputvar=$4 + + printf -v "$outputvar" %s '' + + if [[ $pkgname ]]; then + extract_global_variable "$attrname" "$isarray" "$outputvar" + extract_function_variable "package_$pkgname" "$attrname" "$isarray" "$outputvar" + else + extract_global_variable "$attrname" "$isarray" "$outputvar" + fi +} diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index fb1ef20..a6e37ee 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -879,7 +879,7 @@ get_pkg_arch() { fi else local arch_override - pkgbuild_get_attribute "$1" arch 1 arch_override + get_pkgbuild_attribute "$1" arch 1 arch_override (( ${#arch_override[@]} == 0 )) && arch_override=("${arch[@]}") if [[ $arch_override = "any" ]]; then printf "%s\n" "any" @@ -1759,7 +1759,7 @@ pkgbuild_extract_to_srcinfo() { local pkgname=$1 attrname=$2 isarray=$3 outvalue= - if pkgbuild_get_attribute "$pkgname" "$attrname" "$isarray" 'outvalue'; then + if get_pkgbuild_attribute "$pkgname" "$attrname" "$isarray" 'outvalue'; then srcinfo_write_attr "$attrname" "${outvalue[@]}" fi } @@ -1778,7 +1778,7 @@ srcinfo_write_section_details() { pkgbuild_extract_to_srcinfo "$1" "$attr" 1 done - pkgbuild_get_attribute "$1" 'arch' 1 'package_arch' + get_pkgbuild_attribute "$1" 'arch' 1 'package_arch' for a in "${package_arch[@]}"; do # 'any' is special. there's no support for, e.g. depends_any. [[ $a = any ]] && continue @@ -2062,7 +2062,7 @@ create_srcpackage() { [[ ${!i} ]] && files+=("${!i}") for name in "${pkgname[@]}"; do - if extract_function_var "package_$name" "$i" 0 file; then + if extract_function_variable "package_$name" "$i" 0 file; then files+=("$file") fi done @@ -2149,94 +2149,6 @@ install_package() { fi } -have_function() { - declare -f "$1" >/dev/null -} - -array_build() { - local dest=$1 src=$2 i keys values - - # it's an error to try to copy a value which doesn't exist. - declare -p "$2" &>/dev/null || return 1 - - # Build an array of the indicies of the source array. - eval "keys=(\"\${!$2[@]}\")" - - # Clear the destination array - eval "$dest=()" - - # Read values indirectly via their index. This approach gives us support - # for associative arrays, sparse arrays, and empty strings as elements. - for i in "${keys[@]}"; do - values+=("printf -v '$dest[$i]' %s \"\${$src[$i]}\";") - done - - eval "${values[*]}" -} - -funcgrep() { - { declare -f "$1" || declare -f package; } 2>/dev/null | grep -E "$2" -} - -extract_global_var() { - # $1: variable name - # $2: multivalued - # $3: name of output var - - local attr=$1 isarray=$2 outputvar=$3 ref - - if (( isarray )); then - array_build ref "$attr" - [[ ${ref[@]} ]] && array_build "$outputvar" "$attr" - else - [[ ${!attr} ]] && printf -v "$outputvar" %s "${!attr}" - fi -} - -extract_function_var() { - # $1: function name - # $2: variable name - # $3: multivalued - # $4: name of output var - - local funcname=$1 attr=$2 isarray=$3 outputvar=$4 attr_regex= decl= r=1 - - if (( isarray )); then - printf -v attr_regex '^[[:space:]]* %s\+?=\(' "$2" - else - printf -v attr_regex '^[[:space:]]* %s\+?=[^(]' "$2" - fi - - while read -r; do - # strip leading whitespace and any usage of declare - decl=${REPLY##*([[:space:]])} - eval "${decl/#$attr/$outputvar}" - - # entering this loop at all means we found a match, so notify the caller. - r=0 - done < <(funcgrep "$funcname" "$attr_regex") - - return $r -} - -pkgbuild_get_attribute() { - # $1: package name - # $2: attribute name - # $3: multivalued - # $4: name of output var - - local pkgname=$1 attrname=$2 isarray=$3 outputvar=$4 - - printf -v "$outputvar" %s '' - - if [[ $pkgname ]]; then - extract_global_var "$attrname" "$isarray" "$outputvar" - extract_function_var "package_$pkgname" "$attrname" "$isarray" "$outputvar" - else - extract_global_var "$attrname" "$isarray" "$outputvar" - fi -} - lint_pkgbase() { if [[ ${pkgbase:0:1} = "-" ]]; then error "$(gettext "%s is not allowed to start with a hyphen.")" "pkgname" @@ -2322,7 +2234,7 @@ lint_arch() { fi for name in "${pkgname[@]}"; do - pkgbuild_get_attribute "$name" 'arch' 1 list + get_pkgbuild_attribute "$name" 'arch' 1 list if [[ $list && $list != 'any' ]] && ! in_array $CARCH "${list[@]}"; then if (( ! IGNOREARCH )); then error "$(gettext "%s is not available for the '%s' architecture.")" "$name" "$CARCH" @@ -2342,12 +2254,12 @@ lint_provides() { done for name in "${pkgname[@]}"; do - if extract_function_var "package_$name" provides 1 list; then + if extract_function_variable "package_$name" provides 1 list; then provides_list+=("${list[@]}") fi for a in "${arch[@]}"; do - if extract_function_var "package_$name" "provides_$a" 1 list; then + if extract_function_variable "package_$name" "provides_$a" 1 list; then provides_list+=("${list[@]}") fi done @@ -2368,7 +2280,7 @@ lint_backup() { backup_list=("${backup[@]}") for name in "${pkgname[@]}"; do - if extract_function_var "package_$name" backup 1 list; then + if extract_function_variable "package_$name" backup 1 list; then backup_list+=("${list[@]}") fi done @@ -2393,12 +2305,12 @@ lint_optdepends() { done for name in "${pkgname[@]}"; do - if extract_function_var "package_$name" optdepends 1 list; then + if extract_function_variable "package_$name" optdepends 1 list; then optdepends_list+=("${list[@]}") fi for a in "${arch[@]}"; do - if extract_function_var "package_$name" "optdepends_$a" 1 list; then + if extract_function_variable "package_$name" "optdepends_$a" 1 list; then optdepends_list+=("${list[@]}") fi done @@ -2435,7 +2347,7 @@ lint_install() { install_list=("${install[@]}") for name in "${pkgname[@]}"; do - extract_function_var "package_$name" install 0 file + extract_function_variable "package_$name" install 0 file install_list+=("$file") done @@ -2447,7 +2359,7 @@ lint_changelog() { changelog_list=("${changelog[@]}") for name in "${pkgname[@]}"; do - if extract_function_var "package_$name" changelog 0 file; then + if extract_function_variable "package_$name" changelog 0 file; then changelog_list+=("$file") fi done @@ -2460,7 +2372,7 @@ lint_options() { options_list=("${options[@]}") for name in "${pkgname[@]}"; do - if extract_function_var "package_$name" options 1 list; then + if extract_function_variable "package_$name" options 1 list; then options_list+=("${list[@]}") fi done @@ -2606,10 +2518,10 @@ check_vcs_software() { # we currently only use global depends/makedepends arrays for --syncdeps for attr in depends makedepends; do - pkgbuild_get_attribute "$pkg" "$attr" 1 'deps' + get_pkgbuild_attribute "$pkg" "$attr" 1 'deps' all_deps+=("${deps[@]}") - pkgbuild_get_attribute "$pkg" "${attr}_$CARCH" 1 'deps' + get_pkgbuild_attribute "$pkg" "${attr}_$CARCH" 1 'deps' all_deps+=("${deps[@]}") done @@ -2838,8 +2750,8 @@ print_all_package_names() { local version=$(get_full_version) local architecture pkg opts a for pkg in ${pkgname[@]}; do - pkgbuild_get_attribute "$pkg" 'arch' 1 architecture - pkgbuild_get_attribute "$pkg" 'options' 1 opts + get_pkgbuild_attribute "$pkg" 'arch' 1 architecture + get_pkgbuild_attribute "$pkg" 'options' 1 opts for a in ${architecture[@]}; do printf "%s-%s-%s\n" "$pkg" "$version" "$a" if in_opt_array "debug" ${opts[@]} && in_opt_array "strip" ${opts[@]}; then -- 2.4.0

2 8

[pacman-dev] [PATCH] Add bacman manpage, fix #36419
by Pablo Lezaeta Reyes 13 May '15

13 May '15

>On 12/06/14 14:37, prflr88 at gmail.com wrote: >> From: Pablo Lezaeta <prflr88 at gmail.com> >> >> This add bacman manpage (if I'm not missing something) for bacman. >> I think this manpage could be improved, but for a first draft (and a >> RFC) is ok. >> > >Man page looks fine. This should only be installed when contrib is >installed. And we do not have a nice target for that (currently we >need to do "make -C contrib install"). > >So the first step we need is to add a toplevel "make install-contrib" >target and then have that install the bacman manpage. > >Allan Now pacman and pacman contrib are merged if I'm correct, so no more need of spliting. is fine now or do you think the spliting will banquished soon? Depending on that maybe I go for #36620 too. Pablo Lezaeta >> Signed-off-by: Pablo Lezaeta <prflr88 at gmail.com> >> --- >> doc/Makefile.am | 4 ++++ >> doc/bacman.8.txt | 36 ++++++++++++++++++++++++++++++++++++ >> doc/index.txt | 1 + >> 3 files changed, 41 insertions(+) >> create mode 100644 doc/bacman.8.txt >> >> diff --git a/doc/Makefile.am b/doc/Makefile.am >> index a7908df..30fc672 100644 >> --- a/doc/Makefile.am >> +++ b/doc/Makefile.am >> @@ -4,6 +4,7 @@ >> # man_MANS if --enable-asciidoc and/or --enable-doxygen are used. >> >> ASCIIDOC_MANS = \ >> + bacman.8 \ >> pacman.8 \ >> makepkg.8 \ >> makepkg-template.1 \ >> @@ -20,6 +21,7 @@ ASCIIDOC_MANS = \ >> DOXYGEN_MANS = $(wildcard man3/*.3) >> >> HTML_MANPAGES = \ >> + bacman.8.html \ >> pacman.8.html \ >> makepkg.8.html \ >> makepkg-template.1.html \ >> @@ -46,6 +48,7 @@ HTML_DOCS = \ >> EXTRA_DIST = \ >> asciidoc.conf \ >> asciidoc-override.css \ >> + bacman.8.txt \ >> pacman.8.txt \ >> makepkg.8.txt \ >> makepkg-template.1.txt \ >> @@ -148,6 +151,7 @@ $(HTML_OTHER): asciidoc.conf Makefile.am >> %.3.html: ASCIIDOC_OPTS += -d manpage >> >> # Dependency rules >> +bacman.8 bacman.8.html: bacman.8.txt >> pacman.8 pacman.8.html: pacman.8.txt >> makepkg.8 makepkg.8.html: makepkg.8.txt >> makepkg-template.1 makepkg-template.1.html: makepkg-template.1.txt >> diff --git a/doc/bacman.8.txt b/doc/bacman.8.txt >> new file mode 100644 >> index 0000000..c677fc0 >> --- /dev/null >> +++ b/doc/bacman.8.txt >> @@ -0,0 +1,36 @@ >> +///// >> +vim:set ts=4 sw=4 syntax=asciidoc noet spell spelllang=en_us: >> +///// >> +bacman(8) >> +========= >> + >> + >> +Name >> +---- >> +bacman - recreates a package using pacman's db and system files >> + >> + >> +Synopsis >> +-------- >> +'bacman' [options] installed-package-name >> + >> +Description >> +----------- >> +recreates a package using pacman's db and system files >> + >> +Options >> +------- >> +*-h, \--help*:: >> + Output syntax and command line options. >> + >> +*-v, \--version*:: >> + Output version of bacman and exit. >> + >> +*\--nocolor*:: >> + Output without colors. >> + >> +See Also >> +-------- >> +linkman:pacman[8] >> + >> +include::footer.txt[] >> \ No newline at end of file >> diff --git a/doc/index.txt b/doc/index.txt >> index ab1dc79..1b611bc 100644 >> --- a/doc/index.txt >> +++ b/doc/index.txt >> @@ -43,6 +43,7 @@ configuration files dealing with pacman. >> * linkman:libalpm[3] >> * linkman:makepkg[8] >> * linkman:makepkg.conf[5] >> +* linkman:bacman[8] >> * linkman:pacman[8] >> * linkman:pacman-key[8] >> * linkman:pacman.conf[5] >>

2 1

[pacman-dev] [PATCH] libmakepkg: extract get_full_version and get_pkg_arch
by Allan McRae 12 May '15

12 May '15

These functions group in with other functions that extract PKGBUILD information. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/libmakepkg/util/pkgbuild.sh | 35 +++++++++++++++++++++++++++++++++++ scripts/makepkg.sh.in | 35 ----------------------------------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/scripts/libmakepkg/util/pkgbuild.sh b/scripts/libmakepkg/util/pkgbuild.sh index 2e97e4d..17e4cc5 100644 --- a/scripts/libmakepkg/util/pkgbuild.sh +++ b/scripts/libmakepkg/util/pkgbuild.sh @@ -109,3 +109,38 @@ get_pkgbuild_attribute() { extract_global_variable "$attrname" "$isarray" "$outputvar" fi } + +## +# usage : get_full_version() +# return : full version spec, including epoch (if necessary), pkgver, pkgrel +## +get_full_version() { + if (( epoch > 0 )); then + printf "%s\n" "$epoch:$pkgver-$pkgrel" + else + printf "%s\n" "$pkgver-$pkgrel" + fi +} + +## +# usage : get_pkg_arch( [$pkgname] ) +# return : architecture of the package +## +get_pkg_arch() { + if [[ -z $1 ]]; then + if [[ $arch = "any" ]]; then + printf "%s\n" "any" + else + printf "%s\n" "$CARCH" + fi + else + local arch_override + get_pkgbuild_attribute "$1" arch 1 arch_override + (( ${#arch_override[@]} == 0 )) && arch_override=("${arch[@]}") + if [[ $arch_override = "any" ]]; then + printf "%s\n" "any" + else + printf "%s\n" "$CARCH" + fi + fi +} diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 11e6459..2d64997 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -854,41 +854,6 @@ missing_source_file() { exit 1 # $E_MISSING_FILE } -## -# usage : get_full_version() -# return : full version spec, including epoch (if necessary), pkgver, pkgrel -## -get_full_version() { - if (( epoch > 0 )); then - printf "%s\n" "$epoch:$pkgver-$pkgrel" - else - printf "%s\n" "$pkgver-$pkgrel" - fi -} - -## -# usage : get_pkg_arch( [$pkgname] ) -# return : architecture of the package -## -get_pkg_arch() { - if [[ -z $1 ]]; then - if [[ $arch = "any" ]]; then - printf "%s\n" "any" - else - printf "%s\n" "$CARCH" - fi - else - local arch_override - get_pkgbuild_attribute "$1" arch 1 arch_override - (( ${#arch_override[@]} == 0 )) && arch_override=("${arch[@]}") - if [[ $arch_override = "any" ]]; then - printf "%s\n" "any" - else - printf "%s\n" "$CARCH" - fi - fi -} - source_has_signatures() { local file all_sources -- 2.4.0

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.2.1-148-gd5536d3
by allan＠archlinux.org 12 May '15

12 May '15

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 d5536d3eb382fa8a00d5d5820c3d0c947fb90e33 (commit) via d568a4335bd372e490f28acd25f8b2bd1b560730 (commit) via 99c7b1b0882ccf816fcabdc937b05260422df1f3 (commit) via 9a9e0203de9a440be0e359a36bf55151ffb51ca6 (commit) via 1545a042535a8c73c1fa5e0a8bc399394f553a4f (commit) via e4af5e3c9787a37103e71c7814564435ec241d4c (commit) via ae7067440c20c49b3d11c63844d583381282c6b2 (commit) via f9423cfa5d5b9f2041b70676438082faad1cd1ee (commit) via 1040ad4e71dc8ade4418f7de8f5d5578658638f3 (commit) via b0ae59724ed36242459a91c0f9c5ce036c46de41 (commit) via d4e5de4bf6b14a51f6ab23c1d80f38c2380917d8 (commit) via 54067c390f622807b78bc1a7950db113c3a8747c (commit) via 4dbac804a3d00a7bcc6405aa1f28cc5d1aa21f44 (commit) via 4e6848dbea7251b4c612503362848574d8ce75e0 (commit) from e374e6829cea3512f0b4a4069c5a6168f0f8d8a0 (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 d5536d3eb382fa8a00d5d5820c3d0c947fb90e33 Author: David Macek <david.macek.0(a)gmail.com> Date: Fri Apr 17 17:31:01 2015 +0200 libalpm: Do a sanity check before manipulating final DB URL The change in commit 9d96bed9d6b57 causes download errors for the .db.sig file in case the final URL for the .db file contains query strings or other unexpected stuff. This commit isn't intended to be a total solution, but it should eliminate the problem in the most obvious cases. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d568a4335bd372e490f28acd25f8b2bd1b560730 Author: David Macek <david.macek.0(a)gmail.com> Date: Fri Apr 17 17:31:19 2015 +0200 Fix comment in alpm_db_update Fix comment to better explain the magic constant used when allocating a buffer for ".db.sig" URL. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 99c7b1b0882ccf816fcabdc937b05260422df1f3 Author: Allan McRae <allan(a)archlinux.org> Date: Tue May 12 11:56:59 2015 +1000 libmakepkg: fix test bracket style Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9a9e0203de9a440be0e359a36bf55151ffb51ca6 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sun Apr 12 00:01:23 2015 -0400 alpm_logaction: implement documented return value "return 0 on success, -1 on error (pm_errno is set accordingly)" Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1545a042535a8c73c1fa5e0a8bc399394f553a4f Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sun Apr 12 00:01:22 2015 -0400 alpm_logaction: allow falling back to syslog Even if opening the log file fails, if a user has enabled syslog we may still be able to log to that. Set the error return value and continue instead of bailing out. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e4af5e3c9787a37103e71c7814564435ec241d4c Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sun Apr 12 00:01:21 2015 -0400 alpm_logaction: check logfile before opening valgrind does not like calling open(NULL, ...). This also makes the return value 0 if logfile has not been set. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ae7067440c20c49b3d11c63844d583381282c6b2 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sun Apr 12 00:01:20 2015 -0400 merge _alpm_logaction into alpm_logaction Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f9423cfa5d5b9f2041b70676438082faad1cd1ee Author: David Macek <david.macek.0(a)gmail.com> Date: Thu Mar 26 19:59:41 2015 +0100 makepkg: Empty/create only $pkgdir's relevant to current PKGBUILD Currently makepkg clears the whole $pkgbasedir which is needless. Moreover, in the obscure case of multiple makepkg runs (with different $pkgname) that share a $pkgdirbase, only $pkgdir's from the last run will remain. Since I consider the contents of $pkgdir an important artifact, this commit restricts the deletion to individual $pkgdir's. When CLEANUP is set, the behavior is unchanged. Discussed in: https://lists.archlinux.org/pipermail/pacman-dev/2015-February/019939.html Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1040ad4e71dc8ade4418f7de8f5d5578658638f3 Author: Charles Duffy <chaduffy(a)cisco.com> Date: Tue Apr 7 15:29:28 2015 -0500 Fix compilation if libarchive headers are not in standard location With commit 097d5a478b32, including alpm.h also drags in archive.h. Ensure the tools we build that depend on ALPM also include the necessary flags to find libarchive headers if they are not installed in a standard location. [Dan: Add commit message] Signed-off-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b0ae59724ed36242459a91c0f9c5ce036c46de41 Author: Dominik Fischer <d.f.fischer(a)web.de> Date: Thu Apr 23 16:41:46 2015 +0200 makepkg-template: support multiple --template-dirs Especially when maintaining local templates in addition to the ones stored in /usr/share/makepkg-template, it can be useful to include templates stored in multiple different locations into one PKGBUILD. This patch makes this possible by allowing --template-dir to be specified multiple times. This also introduces a dedicated error message when a template cannot be found, in contrast to the already existing "Couldn't detect version for template '%s'". If a template of the same name is present in more than one of the given directories, the last one always takes precedence. Neither the default behaviour without the option given, nor the handling of a single template dir is changed. Signed-off-by: Dominik Fischer <d.f.fischer(a)web.de> Signed-off-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d4e5de4bf6b14a51f6ab23c1d80f38c2380917d8 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Thu Apr 23 16:45:51 2015 +1000 pacsort: fix warning about signed overflow potential during comparison. Some crazy person assumed we would have fewer than INT_MAX columns. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 54067c390f622807b78bc1a7950db113c3a8747c Author: Allan McRae <allan(a)archlinux.org> Date: Thu Apr 23 16:01:16 2015 +1000 Silence warning from clang clang is wrong - dbfile is always used initialized in that function. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4dbac804a3d00a7bcc6405aa1f28cc5d1aa21f44 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Apr 14 20:46:04 2015 +1000 Pluralize callback string In English, this string only has it plural form. However, we need to use the pluralized translation as some languages can have multiple plural formats. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4e6848dbea7251b4c612503362848574d8ce75e0 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Mar 27 14:41:50 2015 +1000 Update source URL Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/index.txt | 2 +- doc/makepkg-template.1.txt | 4 +- lib/libalpm/add.c | 2 +- lib/libalpm/be_sync.c | 17 +++++--- lib/libalpm/log.c | 48 ++++++++++++++++++---- lib/libalpm/util.c | 44 -------------------- lib/libalpm/util.h | 3 -- scripts/libmakepkg/lint_package.sh.in | 2 +- .../libmakepkg/lint_package/build_references.sh.in | 2 +- .../libmakepkg/lint_package/missing_backup.sh.in | 2 +- scripts/libmakepkg/tidy.sh.in | 2 +- scripts/libmakepkg/tidy/docs.sh.in | 2 +- scripts/libmakepkg/tidy/emptydirs.sh.in | 2 +- scripts/libmakepkg/tidy/libtool.sh.in | 2 +- scripts/libmakepkg/tidy/optipng.sh.in | 2 +- scripts/libmakepkg/tidy/purge.sh.in | 2 +- scripts/libmakepkg/tidy/staticlibs.sh.in | 2 +- scripts/libmakepkg/tidy/strip.sh.in | 2 +- scripts/libmakepkg/tidy/upx.sh.in | 2 +- scripts/libmakepkg/tidy/zipman.sh.in | 2 +- scripts/libmakepkg/util.sh.in | 2 +- scripts/makepkg-template.pl.in | 37 +++++++++-------- scripts/makepkg.sh.in | 7 +++- src/pacman/Makefile.am | 3 +- src/pacman/callback.c | 5 ++- src/util/Makefile.am | 3 +- src/util/pacsort.c | 2 +- .../compose-multiple-template-dirs/PKGBUILD | 5 +++ .../templates/build/build-1.template | 1 + .../templates/package/package-1.template | 1 + .../compose-multiple-template-dirs/testcase-config | 18 ++++++++ .../last-template-dir-has-precedece/PKGBUILD | 4 ++ .../PKGBUILD.expanded} | 3 +- .../templates/first/perl-module-1.0.template | 1 + .../templates/last/perl-module-1.0.template | 1 + .../testcase-config | 15 +++++++ .../missing-template-file/testcase-config | 2 +- .../missing-template-symlink/testcase-config | 4 +- .../template-without-version/testcase-config | 2 +- 39 files changed, 155 insertions(+), 107 deletions(-) create mode 100644 test/scripts/makepkg-template-tests/compose-multiple-template-dirs/PKGBUILD create mode 100644 test/scripts/makepkg-template-tests/compose-multiple-template-dirs/templates/build/build-1.template create mode 100644 test/scripts/makepkg-template-tests/compose-multiple-template-dirs/templates/package/package-1.template create mode 100644 test/scripts/makepkg-template-tests/compose-multiple-template-dirs/testcase-config create mode 100644 test/scripts/makepkg-template-tests/last-template-dir-has-precedece/PKGBUILD copy test/scripts/makepkg-template-tests/{missing-template-file/PKGBUILD => last-template-dir-has-precedece/PKGBUILD.expanded} (78%) create mode 100644 test/scripts/makepkg-template-tests/last-template-dir-has-precedece/templates/first/perl-module-1.0.template create mode 100644 test/scripts/makepkg-template-tests/last-template-dir-has-precedece/templates/last/perl-module-1.0.template create mode 100644 test/scripts/makepkg-template-tests/last-template-dir-has-precedece/testcase-config hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] libalpm: Do a sanity check before manipulating final DB URL
by David Macek 12 May '15

12 May '15

The change in commit 9d96bed9d6b57 causes download errors for the .db.sig file in case the final URL for the .db file contains query strings or other unexpected stuff. This commit isn't intended to be a total solution, but it should eliminate the problem in the most obvious cases. --- Please comment. Does anyone know if there's a case when the final URL doesn't end in ".db", but it's still reasonable to append ".sig" to it? Is there a case when the final URL ends with ".db.tar.xz", for example? lib/libalpm/be_sync.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 20130dc..f30698e 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -241,20 +241,27 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) unlink(sigpath); free(sigpath); - /* if we downloaded a DB, we want the .sig from the same server - - this information is only available from the internal downloader */ - if(handle->fetchcb == NULL) { + + /* check if the final URL from internal downloader looks reasonable */ + if(final_db_url != NULL) { + if(strlen(final_db_url) < 3 || strcmp(final_db_url + strlen(final_db_url) - 3, ".db") != 0) { + final_db_url = NULL; + } + } + + /* if we downloaded a DB, we want the .sig from the same server */ + if(final_db_url != NULL) { /* print final_db_url into a buffer (leave space for .sig) */ len = strlen(final_db_url) + 5; } else { - /* print server + filename into a buffer (leave space for .sig) */ + /* print server + filename into a buffer (leave space for .db.sig) */ len = strlen(server) + strlen(db->treename) + 9; } /* TODO fix leak syncpath and umask unset */ MALLOC(payload.fileurl, len, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); - if(handle->fetchcb == NULL) { + if(final_db_url != NULL) { snprintf(payload.fileurl, len, "%s.sig", final_db_url); } else { snprintf(payload.fileurl, len, "%s/%s.db.sig", server, db->treename); -- 2.3.5 -- David Macek

4 9

[pacman-dev] [PATCH] libmakepkg: fix test bracket style
by Allan McRae 12 May '15

12 May '15

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/libmakepkg/lint_package.sh.in | 2 +- scripts/libmakepkg/lint_package/build_references.sh.in | 2 +- scripts/libmakepkg/lint_package/missing_backup.sh.in | 2 +- scripts/libmakepkg/tidy.sh.in | 2 +- scripts/libmakepkg/tidy/docs.sh.in | 2 +- scripts/libmakepkg/tidy/emptydirs.sh.in | 2 +- scripts/libmakepkg/tidy/libtool.sh.in | 2 +- scripts/libmakepkg/tidy/optipng.sh.in | 2 +- scripts/libmakepkg/tidy/purge.sh.in | 2 +- scripts/libmakepkg/tidy/staticlibs.sh.in | 2 +- scripts/libmakepkg/tidy/strip.sh.in | 2 +- scripts/libmakepkg/tidy/upx.sh.in | 2 +- scripts/libmakepkg/tidy/zipman.sh.in | 2 +- scripts/libmakepkg/util.sh.in | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/scripts/libmakepkg/lint_package.sh.in b/scripts/libmakepkg/lint_package.sh.in index e5e23bb..6255639 100644 --- a/scripts/libmakepkg/lint_package.sh.in +++ b/scripts/libmakepkg/lint_package.sh.in @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -[ -n "$LIBMAKEPKG_LINT_PACKAGE_SH" ] && return +[[ -n "$LIBMAKEPKG_LINT_PACKAGE_SH" ]] && return LIBMAKEPKG_LINT_PACKAGE_SH=1 LIBRARY=${LIBRARY:-'@libmakepkgdir@'} diff --git a/scripts/libmakepkg/lint_package/build_references.sh.in b/scripts/libmakepkg/lint_package/build_references.sh.in index 6b03e48..a11b263 100644 --- a/scripts/libmakepkg/lint_package/build_references.sh.in +++ b/scripts/libmakepkg/lint_package/build_references.sh.in @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -[ -n "$LIBMAKEPKG_LINT_PACKAGE_BUILD_REFERENCES_SH" ] && return +[[ -n "$LIBMAKEPKG_LINT_PACKAGE_BUILD_REFERENCES_SH" ]] && return LIBMAKEPKG_LINT_PACKAGE_BUILD_REFERENCES_SH=1 LIBRARY=${LIBRARY:-'@libmakepkgdir@'} diff --git a/scripts/libmakepkg/lint_package/missing_backup.sh.in b/scripts/libmakepkg/lint_package/missing_backup.sh.in index 64d5a64..f2a230b 100644 --- a/scripts/libmakepkg/lint_package/missing_backup.sh.in +++ b/scripts/libmakepkg/lint_package/missing_backup.sh.in @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -[ -n "$LIBMAKEPKG_LINT_PACKAGE_MISSING_BACKUP_SH" ] && return +[[ -n "$LIBMAKEPKG_LINT_PACKAGE_MISSING_BACKUP_SH" ]] && return LIBMAKEPKG_LINT_PACKAGE_MISSING_BACKUP_SH=1 LIBRARY=${LIBRARY:-'@libmakepkgdir@'} diff --git a/scripts/libmakepkg/tidy.sh.in b/scripts/libmakepkg/tidy.sh.in index 1f439ba..8514a9a 100644 --- a/scripts/libmakepkg/tidy.sh.in +++ b/scripts/libmakepkg/tidy.sh.in @@ -19,7 +19,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -[ -n "$LIBMAKEPKG_TIDY_SH" ] && return +[[ -n "$LIBMAKEPKG_TIDY_SH" ]] && return LIBMAKEPKG_TIDY_SH=1 LIBRARY=${LIBRARY:-'@libmakepkgdir@'} diff --git a/scripts/libmakepkg/tidy/docs.sh.in b/scripts/libmakepkg/tidy/docs.sh.in index a979130..34dd36a 100644 --- a/scripts/libmakepkg/tidy/docs.sh.in +++ b/scripts/libmakepkg/tidy/docs.sh.in @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -[ -n "$LIBMAKEPKG_TIDY_DOCS_SH" ] && return +[[ -n "$LIBMAKEPKG_TIDY_DOCS_SH" ]] && return LIBMAKEPKG_TIDY_DOCS_SH=1 LIBRARY=${LIBRARY:-'@libmakepkgdir@'} diff --git a/scripts/libmakepkg/tidy/emptydirs.sh.in b/scripts/libmakepkg/tidy/emptydirs.sh.in index c7103e9..1788649 100644 --- a/scripts/libmakepkg/tidy/emptydirs.sh.in +++ b/scripts/libmakepkg/tidy/emptydirs.sh.in @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -[ -n "$LIBMAKEPKG_TIDY_EMPTYDIRS_SH" ] && return +[[ -n "$LIBMAKEPKG_TIDY_EMPTYDIRS_SH" ]] && return LIBMAKEPKG_TIDY_EMPTYDIRS_SH=1 LIBRARY=${LIBRARY:-'@libmakepkgdir@'} diff --git a/scripts/libmakepkg/tidy/libtool.sh.in b/scripts/libmakepkg/tidy/libtool.sh.in index b9c6245..64a638f 100644 --- a/scripts/libmakepkg/tidy/libtool.sh.in +++ b/scripts/libmakepkg/tidy/libtool.sh.in @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -[ -n "$LIBMAKEPKG_TIDY_LIBTOOL_SH" ] && return +[[ -n "$LIBMAKEPKG_TIDY_LIBTOOL_SH" ]] && return LIBMAKEPKG_TIDY_LIBTOOL_SH=1 LIBRARY=${LIBRARY:-'@libmakepkgdir@'} diff --git a/scripts/libmakepkg/tidy/optipng.sh.in b/scripts/libmakepkg/tidy/optipng.sh.in index f739a82..2322f66 100644 --- a/scripts/libmakepkg/tidy/optipng.sh.in +++ b/scripts/libmakepkg/tidy/optipng.sh.in @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -[ -n "$LIBMAKEPKG_TIDY_OPTIPNG_SH" ] && return +[[ -n "$LIBMAKEPKG_TIDY_OPTIPNG_SH" ]] && return LIBMAKEPKG_TIDY_OPTIPNG_SH=1 LIBRARY=${LIBRARY:-'@libmakepkgdir@'} diff --git a/scripts/libmakepkg/tidy/purge.sh.in b/scripts/libmakepkg/tidy/purge.sh.in index 948f001..625ce41 100644 --- a/scripts/libmakepkg/tidy/purge.sh.in +++ b/scripts/libmakepkg/tidy/purge.sh.in @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -[ -n "$LIBMAKEPKG_TIDY_PURGE_SH" ] && return +[[ -n "$LIBMAKEPKG_TIDY_PURGE_SH" ]] && return LIBMAKEPKG_TIDY_PURGE_SH=1 LIBRARY=${LIBRARY:-'@libmakepkgdir@'} diff --git a/scripts/libmakepkg/tidy/staticlibs.sh.in b/scripts/libmakepkg/tidy/staticlibs.sh.in index 4849aba..73cbf89 100644 --- a/scripts/libmakepkg/tidy/staticlibs.sh.in +++ b/scripts/libmakepkg/tidy/staticlibs.sh.in @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -[ -n "$LIBMAKEPKG_TIDY_STATICLIBS_SH" ] && return +[[ -n "$LIBMAKEPKG_TIDY_STATICLIBS_SH" ]] && return LIBMAKEPKG_TIDY_STATICLIBS_SH=1 LIBRARY=${LIBRARY:-'@libmakepkgdir@'} diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/strip.sh.in index 12a7eee..40d7c56 100644 --- a/scripts/libmakepkg/tidy/strip.sh.in +++ b/scripts/libmakepkg/tidy/strip.sh.in @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -[ -n "$LIBMAKEPKG_TIDY_STRIP_SH" ] && return +[[ -n "$LIBMAKEPKG_TIDY_STRIP_SH" ]] && return LIBMAKEPKG_TIDY_STRIP_SH=1 LIBRARY=${LIBRARY:-'@libmakepkgdir@'} diff --git a/scripts/libmakepkg/tidy/upx.sh.in b/scripts/libmakepkg/tidy/upx.sh.in index 4910465..8ebd094 100644 --- a/scripts/libmakepkg/tidy/upx.sh.in +++ b/scripts/libmakepkg/tidy/upx.sh.in @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -[ -n "$LIBMAKEPKG_TIDY_UPX_SH" ] && return +[[ -n "$LIBMAKEPKG_TIDY_UPX_SH" ]] && return LIBMAKEPKG_TIDY_UPX_SH=1 LIBRARY=${LIBRARY:-'@libmakepkgdir@'} diff --git a/scripts/libmakepkg/tidy/zipman.sh.in b/scripts/libmakepkg/tidy/zipman.sh.in index a08a60f..e4f0e54 100644 --- a/scripts/libmakepkg/tidy/zipman.sh.in +++ b/scripts/libmakepkg/tidy/zipman.sh.in @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -[ -n "$LIBMAKEPKG_TIDY_ZIPMAN_SH" ] && return +[[ -n "$LIBMAKEPKG_TIDY_ZIPMAN_SH" ]] && return LIBMAKEPKG_TIDY_ZIPMAN_SH=1 LIBRARY=${LIBRARY:-'@libmakepkgdir@'} diff --git a/scripts/libmakepkg/util.sh.in b/scripts/libmakepkg/util.sh.in index 86c7659..f884b6a 100644 --- a/scripts/libmakepkg/util.sh.in +++ b/scripts/libmakepkg/util.sh.in @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -[ -n "$LIBMAKEPKG_UTIL_SH" ] && return +[[ -n "$LIBMAKEPKG_UTIL_SH" ]] && return LIBMAKEPKG_UTIL_SH=1 LIBRARY=${LIBRARY:-'@libmakepkgdir@'} -- 2.4.0

1 0

[pacman-dev] Duplicated lines of "downloading foo.db..." with --noprogressbar
by David Macek 06 May '15

06 May '15

Hello everyone. I see a problem with --noprogressbar output, but it seems to be dependent on server/network. Can anyone confirm with the following settings? # append to pacman.conf [mingw64] Server = ftp://ftp.heanet.ie/mirrors/download.sourceforge.net/pub/sourceforge/m/ms/m… $ pacman -Syy --noprogressbar My output contains multiple "downloading" lines for this DB: downloading mingw64.db... downloading mingw64.db... downloading mingw64.db... downloading mingw64.db... downloading mingw64.db... It seems that the cause is libcurl calling the progress callback multiple times before the first bytes get downloaded, which then in turns `cb_dl_progress` multiple times with `file_xfered` = 0, which then prints the message each time. I don't want to just complain, so I whipped up a quick patch. I can submit it properly if it gets an upvote. diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 695e38d..3bc43b7 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -628,6 +628,7 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) static double rate_last; static off_t xfered_last; static int64_t initial_time = 0; + static char *filename_last = NULL; int infolen; int filenamelen; char *fname, *p; @@ -646,7 +647,11 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) const unsigned short cols = getcols(); if(config->noprogressbar || cols == 0 || file_total == -1) { - if(file_xfered == 0) { + if(filename_last != NULL || strcmp(filename_last, filename) != 0) { + if(filename_last != NULL) { + free(filename_last); + } + filename_last = strdup(filename); printf(_("downloading %s...\n"), filename); fflush(stdout); } -- David Macek

3 6

[pacman-dev] makepkg, bsdtar and non-ASCII user/group names
by David Macek 05 May '15

05 May '15

Hey everyone. Can someone help me understand why makepkg sets `LANG=C` for invoking bsdtar? According to dreisner, the change was introduced in 537a335cc724a5c7c, but the commit message there only explains what the change does, not how it does it: > Use C locale for bsdtar calls during package creation > This ensures packages build on a UTF-8 locale system with non-ASCII character > names can be installed on non-UTF-8 systems. I'm asking because I'm getting errors regarding group names (but I assume it'd be the same with user names) like this one: > bsdtar: somefile: Can't translate gname 'Отсутствует' to UTF-8 Removing `LANG=C` makes the errors go away. The error can be reproduced outside of makepkg just by running `LANG=C bsdtar -cf /tmp/foo.tar *` in a suitable directory. I know this is not exactly a common scenario on Arch Linux, as the combination of fakeroot, the special status of the root user and group and the ASCII-only policy of groupadd makes it very unlikely that the packaging bsdtar invocation will encounter any such problems. In Cygwin however, the probability of encountering non-ASCII user/group names is pretty high. I wonder if there's some combination of locale settings and bsdtar arguments that allows for the thing the commit was targeted on, but also for non-ASCII user/group names. One possibility would be to specify `--uname "" --gname ""` to bsdtar, assuming the names are useless for pacman anyway. If manipulating the locale variables is more desirable, I ask for an example of the situation that this change fixed (or a link), otherwise I don't know how to correctly test it. Extending this idea further, makepkg could pass `--uname root --gname root --uid 0 --gid 0` to bsdtar, which could help with moving the bsdtar/gnupg step out of fakeroot, if it's not possible already (and if it's desirable). That's of course assuming that all packages contain files with only root.root ownership. -- David Macek

2 1

[pacman-dev] [PATCH] Add LIBARCHIVE_CFLAGS to AM_CFLAGS
by Charles Duffy 04 May '15

04 May '15

Should this get munged during submission, also available from: https://gist.githubusercontent.com/charles-dyfis-net/cdf720fe2a4df1ff97da/r… >From 579787b51f8195801321ea23f2d92d531efac2f1 Mon Sep 17 00:00:00 2001 From: Charles Duffy <chaduffy(a)cisco.com> Date: Tue, 7 Apr 2015 15:15:31 -0500 Subject: [PATCH] Add LIBARCHIVE_CFLAGS to AM_CFLAGS Fixes build if libarchive headers are not present in a location not already in the include path. Signed-off-by: Charles Duffy <chaduffy(a)cisco.com> --- src/pacman/Makefile.am | 2 +- src/util/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am index 5f10308..5f407c7 100644 --- a/src/pacman/Makefile.am +++ b/src/pacman/Makefile.am @@ -19,7 +19,7 @@ AM_CPPFLAGS = \ -DCACHEDIR=\"$(cachedir)\" \ -DLOGFILE=\"$(logfile)\" -AM_CFLAGS = -pedantic -D_GNU_SOURCE $(WARNING_CFLAGS) +AM_CFLAGS = -pedantic -D_GNU_SOURCE $(WARNING_CFLAGS) $(LIBARCHIVE_CFLAGS) if USE_GIT_VERSION GIT_VERSION := $(shell sh -c 'git describe --abbrev=4 --dirty | sed s/^v//') diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 936d7ff..3954c03 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -15,7 +15,7 @@ AM_CPPFLAGS = \ -DGPGDIR=\"$(gpgdir)\" \ -DCACHEDIR=\"$(cachedir)\" -AM_CFLAGS = -pedantic -D_GNU_SOURCE $(WARNING_CFLAGS) +AM_CFLAGS = -pedantic -D_GNU_SOURCE $(WARNING_CFLAGS) $(LIBARCHIVE_CFLAGS) cleanupdelta_SOURCES = cleanupdelta.c cleanupdelta_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la -- 2.3.5

3 2