Re: [pacman-dev] [PATCH 2/2] Split prepare_buildenv() to libmakepkg scripts

On 5/11/18 12:35 am, Que Quotion wrote:

From: Que Quotion

Being misled by git's documentation, my attempt to attach this patch to the previous mail was foiled. That's really, really frustrating.

Put comments like this under the "---" line. Also, it is useful to provide some context to the patch in the commit message.

Signed-off-by: Que Quotion --- scripts/Makefile.am | 4 +-- scripts/libmakepkg/buildenv.sh.in | 13 ++------ scripts/libmakepkg/buildenv/buildflags.sh.in | 1 + .../buildenv/{ccache.sh.in => compiler.sh.in} | 27 +++++++++++++--- .../{distcc.sh.in => debugflags.sh.in} | 31 +++++++------------ scripts/libmakepkg/buildenv/makeflags.sh.in | 1 + scripts/libmakepkg/buildenv/meson.build | 4 +-- 7 files changed, 43 insertions(+), 38 deletions(-) rename scripts/libmakepkg/buildenv/{ccache.sh.in => compiler.sh.in} (69%) rename scripts/libmakepkg/buildenv/{distcc.sh.in => debugflags.sh.in} (56%)

diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 8e669f71..adced908 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -53,8 +53,8 @@ LIBMAKEPKGDIRS = \ LIBMAKEPKG_IN = \ libmakepkg/buildenv.sh \ libmakepkg/buildenv/buildflags.sh \ - libmakepkg/buildenv/ccache.sh \ - libmakepkg/buildenv/distcc.sh \ + libmakepkg/buildenv/compiler.sh \ + libmakepkg/buildenv/debugflags.sh \ libmakepkg/buildenv/makeflags.sh \ libmakepkg/integrity.sh \ libmakepkg/integrity/generate_checksum.sh \ diff --git a/scripts/libmakepkg/buildenv.sh.in b/scripts/libmakepkg/buildenv.sh.in index a14a3a9a..9c1f02f4 100644 --- a/scripts/libmakepkg/buildenv.sh.in +++ b/scripts/libmakepkg/buildenv.sh.in @@ -28,28 +28,21 @@ source "$LIBRARY/util/message.sh" source "$LIBRARY/util/option.sh"

-declare -a build_options +declare -a build_options build_macros

I just figure out why you are doing this and then the next patch has: -declare -a build_options build_macros +declare -a buildenv_options I'm not doing any further review. A