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@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Que Quotion
Allan McRae
parent
0bb04fa16a
commit
508b4e3ec0
9 changed files with 236 additions and 43 deletions
|
|
@ -40,6 +40,7 @@ LIBRARY = \
|
|||
libmakepkgdir = $(datarootdir)/makepkg
|
||||
|
||||
LIBMAKEPKGDIRS = \
|
||||
buildenv \
|
||||
executable \
|
||||
integrity \
|
||||
lint_config \
|
||||
|
|
@ -61,6 +62,11 @@ LIBMAKEPKG_IN = \
|
|||
libmakepkg/executable/strip.sh \
|
||||
libmakepkg/executable/sudo.sh \
|
||||
libmakepkg/executable/vcs.sh \
|
||||
libmakepkg/buildenv.sh \
|
||||
libmakepkg/buildenv/buildflags.sh \
|
||||
libmakepkg/buildenv/compiler.sh \
|
||||
libmakepkg/buildenv/debugflags.sh \
|
||||
libmakepkg/buildenv/makeflags.sh \
|
||||
libmakepkg/integrity.sh \
|
||||
libmakepkg/integrity/generate_checksum.sh \
|
||||
libmakepkg/integrity/generate_signature.sh \
|
||||
|
|
|
|||
45
scripts/libmakepkg/buildenv.sh.in
Normal file
45
scripts/libmakepkg/buildenv.sh.in
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
#!/bin/bash
|
||||
#
|
||||
# buildenv.sh - functions for altering the build environment before
|
||||
# compiliation
|
||||
#
|
||||
# Copyright (c) 2015-2018 Pacman Development Team <pacman-dev@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"
|
||||
|
||||
|
||||
declare -a buildenv_functions build_options
|
||||
|
||||
for lib in "$LIBRARY/buildenv/"*.sh; do
|
||||
source "$lib"
|
||||
done
|
||||
|
||||
readonly -a buildenv_functions build_options
|
||||
|
||||
prepare_buildenv() {
|
||||
for func in ${buildenv_functions[@]}; do
|
||||
$func
|
||||
done
|
||||
|
||||
# ensure all necessary build variables are exported
|
||||
export CPPFLAGS CFLAGS CXXFLAGS LDFLAGS MAKEFLAGS CHOST
|
||||
}
|
||||
35
scripts/libmakepkg/buildenv/buildflags.sh.in
Normal file
35
scripts/libmakepkg/buildenv/buildflags.sh.in
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
#!/usr/bin/bash
|
||||
#
|
||||
# buildflags.sh - Clear user-specified buildflags if requested
|
||||
#
|
||||
# Copyright (c) 2011-2018 Pacman Development Team <pacman-dev@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')
|
||||
buildenv_functions+=('buildenv_buildflags')
|
||||
|
||||
buildenv_buildflags() {
|
||||
if check_option "buildflags" "n"; then
|
||||
unset CPPFLAGS CFLAGS DEBUG_CFLAGS CXXFLAGS DEBUG_CXXFLAGS LDFLAGS
|
||||
fi
|
||||
}
|
||||
55
scripts/libmakepkg/buildenv/compiler.sh.in
Normal file
55
scripts/libmakepkg/buildenv/compiler.sh.in
Normal file
|
|
@ -0,0 +1,55 @@
|
|||
#!/usr/bin/bash
|
||||
#
|
||||
# compiler.sh - CCache and DistCC compilation
|
||||
# ccache - Cache compilations and reuse them to save time on repetitions
|
||||
# distcc - Distribute compilation of C and C++ across machines
|
||||
#
|
||||
# Copyright (c) 2007-2018 Pacman Development Team <pacman-dev@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_COMPILER_SH" ]] && return
|
||||
LIBMAKEPKG_BUILDENV_COMPILER_SH=1
|
||||
|
||||
LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
|
||||
|
||||
source "$LIBRARY/util/option.sh"
|
||||
|
||||
build_options+=('ccache' 'distcc')
|
||||
buildenv_functions+=('buildenv_ccache' 'buildenv_distcc')
|
||||
|
||||
using_ccache=0
|
||||
|
||||
buildenv_ccache() {
|
||||
if check_buildoption "ccache" "y"; then
|
||||
if [ -d /usr/lib/ccache/bin ]; then
|
||||
export PATH="/usr/lib/ccache/bin:$PATH"
|
||||
using_ccache=1
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
buildenv_distcc() {
|
||||
if check_buildoption "distcc" "y"; then
|
||||
if (( using_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
|
||||
}
|
||||
38
scripts/libmakepkg/buildenv/debugflags.sh.in
Normal file
38
scripts/libmakepkg/buildenv/debugflags.sh.in
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
#!/usr/bin/bash
|
||||
#
|
||||
# debugflags.sh - Specify flags for building a package with debugging
|
||||
# symbols
|
||||
#
|
||||
# Copyright (c) 2012-2018 Pacman Development Team <pacman-dev@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_DEBUGFLAGS_SH" ]] && return
|
||||
LIBMAKEPKG_BUILDENV_DEBUGFLAGS_SH=1
|
||||
|
||||
LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
|
||||
|
||||
source "$LIBRARY/util/option.sh"
|
||||
|
||||
buildenv_functions+=('buildenv_debugflags')
|
||||
|
||||
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}"
|
||||
CFLAGS+=" $DEBUG_CFLAGS"
|
||||
CXXFLAGS+=" $DEBUG_CXXFLAGS"
|
||||
fi
|
||||
}
|
||||
35
scripts/libmakepkg/buildenv/makeflags.sh.in
Normal file
35
scripts/libmakepkg/buildenv/makeflags.sh.in
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
#!/usr/bin/bash
|
||||
#
|
||||
# makeflags.sh - Clear user-specified makeflags if requested
|
||||
#
|
||||
# Copyright (c) 2007-2018 Pacman Development Team <pacman-dev@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')
|
||||
buildenv_functions+=('buildenv_makeflags')
|
||||
|
||||
buildenv_makeflags() {
|
||||
if check_option "makeflags" "n"; then
|
||||
unset MAKEFLAGS
|
||||
fi
|
||||
}
|
||||
20
scripts/libmakepkg/buildenv/meson.build
Normal file
20
scripts/libmakepkg/buildenv/meson.build
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
libmakepkg_module = 'buildenv'
|
||||
|
||||
sources = [
|
||||
'buildflags.sh.in',
|
||||
'compiler.sh.in',
|
||||
'debugflags.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
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
libmakepkg_modules = [
|
||||
{ 'name' : 'buildenv', 'has_subdir' : true },
|
||||
{ 'name' : 'executable', 'has_subdir' : true },
|
||||
{ 'name' : 'integrity', 'has_subdir' : true },
|
||||
{ 'name' : 'lint_config', 'has_subdir' : true },
|
||||
|
|
|
|||
|
|
@ -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 DEBUG_CFLAGS CXXFLAGS DEBUG_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
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue