diff options
| author | Que Quotion | 2018-11-06 00:31:10 +0900 |
|---|---|---|
| committer | Que Quotion | 2018-11-06 01:28:59 +0900 |
| commit | 555aabe4a0e64c592fc204602a8e77540d9fa55a (patch) | |
| tree | 77f9df348a42f222bc07bad1201b4f76411e98e2 | |
| parent | a004ad218915bc19ec782fa427e28d1a56ecc6d3 (diff) | |
| download | aur-555aabe4a0e64c592fc204602a8e77540d9fa55a.tar.gz | |
port buildenv and software checking to their own, extendable, libmakepkg .sh.in scripts
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 12 | ||||
| -rw-r--r-- | buildenv-libmakepkg.patch | 1150 | ||||
| -rw-r--r-- | buildenv_ext.patch | 83 | ||||
| -rw-r--r-- | makepkg.conf | 22 |
5 files changed, 1171 insertions, 106 deletions
@@ -1,7 +1,7 @@ pkgbase = pacman-buildenv_ext-git pkgdesc = A library-based package manager with dependency support with support for build environment extensions. git version. - pkgver = 5.1.1.51.gb5d62d2c - pkgrel = 2 + pkgver = 5.1.1.57.gde915c4f + pkgrel = 1 url = https://bbs.archlinux.org/viewtopic.php?pid=1613555 arch = i686 arch = x86_64 @@ -29,14 +29,14 @@ pkgbase = pacman-buildenv_ext-git source = pacman.conf.i686 source = pacman.conf.x86_64 source = pacman.conf.arm - source = buildenv_ext.patch + source = buildenv-libmakepkg.patch source = makepkg.conf sha1sums = SKIP sha1sums = f3b8b360bf4c8775f439ab189e445f455334cccf sha1sums = 0b3ad0e7e28b6b28a611ea6cc4a12515532e1b78 sha1sums = 1ac32ed5b20d62d3709fc21c67371a9ec1ce199e - sha1sums = 0f3b272bd2afb83eca7af6595ab763ede2cccfdd - sha1sums = 46ae3b64b9c54f06e95ddd7313307942ca45e9b3 + sha1sums = 41f5995cc70970cea871d378f4842dcac43b9e95 + sha1sums = 31025906f087af36e7af5d50220c4a63acadc754 pkgname = pacman-buildenv_ext-git @@ -5,8 +5,8 @@ # Contributor: Andres Perera <aepd87@gmail.com> pkgname=pacman-buildenv_ext-git -pkgver=5.1.1.51.gb5d62d2c -pkgrel=2 +pkgver=5.1.1.57.gde915c4f +pkgrel=1 pkgdesc="A library-based package manager with dependency support with support for build environment extensions. git version." arch=('i686' 'x86_64') url="https://bbs.archlinux.org/viewtopic.php?pid=1613555" @@ -23,14 +23,14 @@ backup=(etc/pacman.conf etc/makepkg.conf) source=(git://git.archlinux.org/pacman.git pacman.conf.{i686,x86_64,arm} - buildenv_ext.patch + buildenv-libmakepkg.patch makepkg.conf) sha1sums=('SKIP' 'f3b8b360bf4c8775f439ab189e445f455334cccf' '0b3ad0e7e28b6b28a611ea6cc4a12515532e1b78' '1ac32ed5b20d62d3709fc21c67371a9ec1ce199e' - '0f3b272bd2afb83eca7af6595ab763ede2cccfdd' - '46ae3b64b9c54f06e95ddd7313307942ca45e9b3') + '41f5995cc70970cea871d378f4842dcac43b9e95' + '31025906f087af36e7af5d50220c4a63acadc754') pkgver() { cd pacman @@ -39,7 +39,7 @@ pkgver() { prepare() { cd pacman - patch -Np1 < ../buildenv_ext.patch + patch -Np1 < ../buildenv-libmakepkg.patch ./autogen.sh } diff --git a/buildenv-libmakepkg.patch b/buildenv-libmakepkg.patch new file mode 100644 index 000000000000..8daea8129612 --- /dev/null +++ b/buildenv-libmakepkg.patch @@ -0,0 +1,1150 @@ +diff --git a/scripts/Makefile.am b/scripts/Makefile.am +index c6b6220e..6e47c1a1 100644 +--- a/scripts/Makefile.am ++++ b/scripts/Makefile.am +@@ -41,6 +41,8 @@ LIBRARY = \ + libmakepkgdir = $(datarootdir)/makepkg + + LIBMAKEPKGDIRS = \ ++ buildenv \ ++ executable \ + integrity \ + lint_config \ + lint_package \ +@@ -50,6 +52,22 @@ LIBMAKEPKGDIRS = \ + util + + LIBMAKEPKG_IN = \ ++ libmakepkg/executable.sh \ ++ libmakepkg/executable/ccache.sh \ ++ libmakepkg/executable/checksum.sh \ ++ libmakepkg/executable/distcc.sh \ ++ libmakepkg/executable/fakeroot.sh \ ++ libmakepkg/executable/gpg.sh \ ++ libmakepkg/executable/gzip.sh \ ++ libmakepkg/executable/pacman.sh \ ++ 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 \ +diff --git a/scripts/libmakepkg/buildenv.sh.in b/scripts/libmakepkg/buildenv.sh.in +new file mode 100644 +index 00000000..c3442c42 +--- /dev/null ++++ b/scripts/libmakepkg/buildenv.sh.in +@@ -0,0 +1,47 @@ ++#!/bin/bash ++# ++# buildenv.sh - functions for altering the build environment before ++# compiliation ++# ++# Copyright (c) 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 ++ ++for lib in "$LIBRARY/buildenv/"*.sh; do ++ source "$lib" ++done ++ ++readonly -a buildenv_functions ++ ++prepare_buildenv() { ++ msg "$(gettext "Preparing build environment...")" ++ ++ for func in ${buildenv_functions[@]}; do ++ $func ++ done ++ ++ # 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..ac207fd3 +--- /dev/null ++++ b/scripts/libmakepkg/buildenv/buildflags.sh.in +@@ -0,0 +1,35 @@ ++#!/usr/bin/bash ++# ++# buildflags.sh - Clear user-specified buildflags if requested ++# ++# Copyright (c) 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 CXXFLAGS LDFLAGS ++ fi ++} +diff --git a/scripts/libmakepkg/buildenv/compiler.sh.in b/scripts/libmakepkg/buildenv/compiler.sh.in +new file mode 100644 +index 00000000..38399269 +--- /dev/null ++++ b/scripts/libmakepkg/buildenv/compiler.sh.in +@@ -0,0 +1,56 @@ ++#!/usr/bin/bash ++# ++# compiler.sh - CCache and DistCC compilation ++# ccache - Cache compiliations and recycle them to save time on repititions ++# distcc - Distribute compliation to reduce compilation time ++# ++# Copyright (c) 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/message.sh" ++source "$LIBRARY/util/option.sh" ++ ++build_options+=('ccache' 'distcc') ++buildenv_functions+=('buildenv_ccache' 'buildenv_distcc') ++ ++local 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 ++} +diff --git a/scripts/libmakepkg/buildenv/debugflags.sh.in b/scripts/libmakepkg/buildenv/debugflags.sh.in +new file mode 100644 +index 00000000..65aa6c0a +--- /dev/null ++++ b/scripts/libmakepkg/buildenv/debugflags.sh.in +@@ -0,0 +1,38 @@ ++#!/usr/bin/bash ++# ++# debugflags.sh - Specify flags for building a package with debugging ++# symbols ++# ++# Copyright (c) 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 ++} +diff --git a/scripts/libmakepkg/buildenv/makeflags.sh.in b/scripts/libmakepkg/buildenv/makeflags.sh.in +new file mode 100644 +index 00000000..45e77468 +--- /dev/null ++++ b/scripts/libmakepkg/buildenv/makeflags.sh.in +@@ -0,0 +1,35 @@ ++#!/usr/bin/bash ++# ++# makeflags.sh - Clear user-specified makeflags if requested ++# ++# Copyright (c) 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 ++} +diff --git a/scripts/libmakepkg/buildenv/meson.build b/scripts/libmakepkg/buildenv/meson.build +new file mode 100644 +index 00000000..34d4ba7b +--- /dev/null ++++ b/scripts/libmakepkg/buildenv/meson.build +@@ -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 +diff --git a/scripts/libmakepkg/executable.sh.in b/scripts/libmakepkg/executable.sh.in +new file mode 100644 +index 00000000..57953600 +--- /dev/null ++++ b/scripts/libmakepkg/executable.sh.in +@@ -0,0 +1,46 @@ ++#!/bin/bash ++# ++# executable.sh - functions for altering the build environment before ++# compiliation ++# ++# Copyright (c) 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_EXECUTABLE_SH" ]] && return ++LIBMAKEPKG_EXECUTABLE_SH=1 ++ ++LIBRARY=${LIBRARY:-'@libmakepkgdir@'} ++ ++source "$LIBRARY/util/message.sh" ++ ++ ++declare -a executable_functions ++ ++for lib in "$LIBRARY/executable/"*.sh; do ++ source "$lib" ++done ++ ++readonly -a executable_functions ++ ++check_software() { ++ local ret=0 ++ ++ for func in ${executable_functions[@]}; do ++ $func ++ done ++ ++ return $ret ++} +diff --git a/scripts/libmakepkg/executable/ccache.sh.in b/scripts/libmakepkg/executable/ccache.sh.in +new file mode 100644 +index 00000000..a745be79 +--- /dev/null ++++ b/scripts/libmakepkg/executable/ccache.sh.in +@@ -0,0 +1,37 @@ ++#!/usr/bin/bash ++# ++# ccache.sh - Cache compiliations and recycle them to save time on repititions ++# ++# Copyright (c) 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_EXECUTABLE_CCACHE_SH" ]] && return ++LIBMAKEPKG_EXECUTABLE_CCACHE_SH=1 ++ ++LIBRARY=${LIBRARY:-'@libmakepkgdir@'} ++ ++source "$LIBRARY/util/option.sh" ++ ++executable_functions+=('executable_ccache') ++ ++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 ++ fi ++ fi ++} +diff --git a/scripts/libmakepkg/executable/checksum.sh.in b/scripts/libmakepkg/executable/checksum.sh.in +new file mode 100644 +index 00000000..4ddb20a6 +--- /dev/null ++++ b/scripts/libmakepkg/executable/checksum.sh.in +@@ -0,0 +1,43 @@ ++#!/usr/bin/bash ++# ++# checksum.sh - Checksum operations ++# ++# Copyright (c) 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_EXECUTABLE_CHECKSUM_SH" ]] && return ++LIBMAKEPKG_EXECUTABLE_CHECKSUM_SH=1 ++ ++LIBRARY=${LIBRARY:-'@libmakepkgdir@'} ++ ++source "$LIBRARY/util/option.sh" ++ ++executable_functions+=('executable_checksum') ++ ++executable_checksum() { ++ if (( GENINTEG || ! SKIPCHECKSUMS )); then ++ local integlist ++ IFS=$'\n' read -rd '' -a integlist < <(get_integlist) ++ ++ local integ ++ for integ in "${integlist[@]}"; do ++ if ! type -p "${integ}sum" >/dev/null; then ++ error "$(gettext "Cannot find the %s binary required for source file checksums operations.")" "${integ}sum" ++ return 1 ++ fi ++ done ++ fi ++} +diff --git a/scripts/libmakepkg/executable/distcc.sh.in b/scripts/libmakepkg/executable/distcc.sh.in +new file mode 100644 +index 00000000..b47a8915 +--- /dev/null ++++ b/scripts/libmakepkg/executable/distcc.sh.in +@@ -0,0 +1,37 @@ ++#!/usr/bin/bash ++# ++# distcc.sh - Distribute compliation to reduce compilation time ++# ++# Copyright (c) 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_EXECUTABLE_DISTCC_SH" ]] && return ++LIBMAKEPKG_EXECUTABLE_DISTCC_SH=1 ++ ++LIBRARY=${LIBRARY:-'@libmakepkgdir@'} ++ ++source "$LIBRARY/util/option.sh" ++ ++executable_functions+=('executable_distcc') ++ ++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 ++ fi ++ fi ++} +diff --git a/scripts/libmakepkg/executable/fakeroot.sh.in b/scripts/libmakepkg/executable/fakeroot.sh.in +new file mode 100644 +index 00000000..83c7a0f6 +--- /dev/null ++++ b/scripts/libmakepkg/executable/fakeroot.sh.in +@@ -0,0 +1,37 @@ ++#!/usr/bin/bash ++# ++# fakeroot.sh - Correct package file permissions ++# ++# Copyright (c) 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_EXECUTABLE_FAKEROOT_SH" ]] && return ++LIBMAKEPKG_EXECUTABLE_FAKEROOT_SH=1 ++ ++LIBRARY=${LIBRARY:-'@libmakepkgdir@'} ++ ++source "$LIBRARY/util/option.sh" ++ ++executable_functions+=('executable_fakeroot') ++ ++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 ++ fi ++ fi ++} +diff --git a/scripts/libmakepkg/executable/gpg.sh.in b/scripts/libmakepkg/executable/gpg.sh.in +new file mode 100644 +index 00000000..f53f186d +--- /dev/null ++++ b/scripts/libmakepkg/executable/gpg.sh.in +@@ -0,0 +1,38 @@ ++#!/usr/bin/bash ++# ++# gpg.sh - Package signing or source verification ++# ++# Copyright (c) 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_EXECUTABLE_GPG_SH" ]] && return ++LIBMAKEPKG_EXECUTABLE_GPG_SH=1 ++ ++LIBRARY=${LIBRARY:-'@libmakepkgdir@'} ++ ++source "$LIBRARY/util/option.sh" ++ ++executable_functions+=('executable_gpg') ++ ++executable_gpg() { ++ if { [[ $SIGNPKG == 'y' ]] || { [[ -z $SIGNPKG ]] && check_buildenv "sign" "y"; }; } || \ ++ { (( ! SKIPPGPCHECK )) && source_has_signatures; }; then ++ if ! type -p gpg >/dev/null; then ++ error "$(gettext "Cannot find the %s binary required for signing packages.")" "gpg" ++ ret=1 ++ fi ++ fi ++} +diff --git a/scripts/libmakepkg/executable/gzip.sh.in b/scripts/libmakepkg/executable/gzip.sh.in +new file mode 100644 +index 00000000..222c5a47 +--- /dev/null ++++ b/scripts/libmakepkg/executable/gzip.sh.in +@@ -0,0 +1,37 @@ ++#!/usr/bin/bash ++# ++# gzip.sh - Compressig man and info pages ++# ++# Copyright (c) 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_EXECUTABLE_GZIP_SH" ]] && return ++LIBMAKEPKG_EXECUTABLE_GZIP_SH=1 ++ ++LIBRARY=${LIBRARY:-'@libmakepkgdir@'} ++ ++source "$LIBRARY/util/option.sh" ++ ++executable_functions+=('executable_gzip') ++ ++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 ++ fi ++ fi ++} +diff --git a/scripts/libmakepkg/executable/meson.build b/scripts/libmakepkg/executable/meson.build +new file mode 100644 +index 00000000..8536a540 +--- /dev/null ++++ b/scripts/libmakepkg/executable/meson.build +@@ -0,0 +1,26 @@ ++libmakepkg_module = 'executable' ++ ++sources = [ ++ 'ccache.sh.in', ++ 'checksum.sh.in', ++ 'distcc.sh.in', ++ 'fakeroot.sh.in', ++ 'gpg.sh.in', ++ 'gzip.sh.in', ++ 'pacman.sh.in', ++ 'strip.sh.in', ++ 'sudo.sh.in', ++ 'vcs.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/executable/pacman.sh.in b/scripts/libmakepkg/executable/pacman.sh.in +new file mode 100644 +index 00000000..9af475bd +--- /dev/null ++++ b/scripts/libmakepkg/executable/pacman.sh.in +@@ -0,0 +1,37 @@ ++#!/usr/bin/bash ++# ++# pacman.sh - Check for PACMAN if we need it ++# ++# Copyright (c) 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_EXECUTABLE_PACMAN_SH" ]] && return ++LIBMAKEPKG_EXECUTABLE_PACMAN_SH=1 ++ ++LIBRARY=${LIBRARY:-'@libmakepkgdir@'} ++ ++source "$LIBRARY/util/option.sh" ++ ++executable_functions+=('executable_pacman') ++ ++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 ++ fi ++ fi ++} +diff --git a/scripts/libmakepkg/executable/strip.sh.in b/scripts/libmakepkg/executable/strip.sh.in +new file mode 100644 +index 00000000..318e2b97 +--- /dev/null ++++ b/scripts/libmakepkg/executable/strip.sh.in +@@ -0,0 +1,37 @@ ++#!/usr/bin/bash ++# ++# strip.sh - Strip symbols from binaries/libraries ++# ++# Copyright (c) 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_EXECUTABLE_STRIP_SH" ]] && return ++LIBMAKEPKG_EXECUTABLE_STRIP_SH=1 ++ ++LIBRARY=${LIBRARY:-'@libmakepkgdir@'} ++ ++source "$LIBRARY/util/option.sh" ++ ++executable_functions+=('executable_strip') ++ ++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 ++ fi ++ fi ++} +diff --git a/scripts/libmakepkg/executable/sudo.sh.in b/scripts/libmakepkg/executable/sudo.sh.in +new file mode 100644 +index 00000000..04807604 +--- /dev/null ++++ b/scripts/libmakepkg/executable/sudo.sh.in +@@ -0,0 +1,36 @@ ++#!/usr/bin/bash ++# ++# sudo.sh - Check for sudo if we will need it during makepkg execution ++# ++# Copyright (c) 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_EXECUTABLE_SUDO_SH" ]] && return ++LIBMAKEPKG_EXECUTABLE_SUDO_SH=1 ++ ++LIBRARY=${LIBRARY:-'@libmakepkgdir@'} ++ ++source "$LIBRARY/util/option.sh" ++ ++executable_functions+=('executable_sudo') ++ ++executable_sudo() { ++ if (( DEP_BIN || RMDEPS || INSTALL )); then ++ if ! type -p sudo >/dev/null; then ++ warning "$(gettext "Cannot find the %s binary. Will use %s to acquire root privileges.")" "sudo" "su" ++ fi ++ fi ++} +diff --git a/scripts/libmakepkg/executable/vcs.sh.in b/scripts/libmakepkg/executable/vcs.sh.in +new file mode 100644 +index 00000000..728cb78e +--- /dev/null ++++ b/scripts/libmakepkg/executable/vcs.sh.in +@@ -0,0 +1,109 @@ ++#!/usr/bin/bash ++# ++# vcs.sh - Tools to download vcs sources ++# ++# Copyright (c) 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_EXECUTABLE_VCS_SH" ]] && return ++LIBMAKEPKG_EXECUTABLE_VCS_SH=1 ++ ++LIBRARY=${LIBRARY:-'@libmakepkgdir@'} ++ ++source "$LIBRARY/util/option.sh" ++ ++executable_functions+=('executable_vcs') ++ ++get_vcsclient() { ++ local proto=${1%%+*} ++ ++ local i ++ for i in "${VCSCLIENTS[@]}"; do ++ local handler="${i%%::*}" ++ if [[ $proto = "$handler" ]]; then ++ local client="${i##*::}" ++ break ++ fi ++ done ++ ++ # if we didn't find an client, return an error ++ if [[ -z $client ]]; then ++ error "$(gettext "Unknown download protocol: %s")" "$proto" ++ plain "$(gettext "Aborting...")" ++ exit $E_CONFIG_ERROR ++ fi ++ ++ printf "%s\n" "$client" ++} ++ ++check_vcs_software() { ++ local netfile all_sources all_deps deps ret=0 ++ ++ if (( SOURCEONLY == 1 )); then ++ # we will not download VCS sources ++ return $ret ++ fi ++ ++ if [[ -z $PACMAN_PATH ]]; then ++ warning "$(gettext "Cannot find the %s binary needed to check VCS source requirements.")" "$PACMAN" ++ return $ret ++ fi ++ ++ # we currently only use global depends/makedepends arrays for --syncdeps ++ for attr in depends makedepends; do ++ get_pkgbuild_attribute "$pkg" "$attr" 1 'deps' ++ all_deps+=("${deps[@]}") ++ ++ get_pkgbuild_attribute "$pkg" "${attr}_$CARCH" 1 'deps' ++ all_deps+=("${deps[@]}") ++ done ++ ++ get_all_sources_for_arch 'all_sources' ++ for netfile in ${all_sources[@]}; do ++ local proto=$(get_protocol "$netfile") ++ ++ case $proto in ++ bzr*|git*|hg*|svn*) ++ if ! type -p ${proto%%+*} > /dev/null; then ++ local client ++ client=$(get_vcsclient "$proto") || exit $? ++ # ensure specified program is installed ++ local uninstalled ++ uninstalled=$(check_deps "$client") || exit $E_INSTALL_DEPS_FAILED ++ # if not installed, check presence in depends or makedepends ++ if [[ -n "$uninstalled" ]] && (( ! NODEPS || ( VERIFYSOURCE && !DEP_BIN ) )); then ++ if ! in_array "$client" ${all_deps[@]}; then ++ error "$(gettext "Cannot find the %s package needed to handle %s sources.")" \ ++ "$client" "${proto%%+*}" ++ ret=1 ++ fi ++ fi ++ fi ++ ;; ++ *) ++ # non VCS source ++ ;; ++ esac ++ done ++ ++ return $ret ++} ++ ++executable_vcs() { ++ if ! check_vcs_software; then ++ ret=1 ++ fi ++} +diff --git a/scripts/libmakepkg/meson.build b/scripts/libmakepkg/meson.build +index 07475b4d..bfba56a5 100644 +--- a/scripts/libmakepkg/meson.build ++++ b/scripts/libmakepkg/meson.build +@@ -1,4 +1,6 @@ + libmakepkg_modules = [ ++ { 'name' : 'buildenv', 'has_subdir' : true }, ++ { 'name' : 'executable', '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..4449ccf7 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 + +@@ -897,178 +855,6 @@ install_package() { + fi + } + +-get_vcsclient() { +- local proto=${1%%+*} +- +- local i +- for i in "${VCSCLIENTS[@]}"; do +- local handler="${i%%::*}" +- if [[ $proto = "$handler" ]]; then +- local client="${i##*::}" +- break +- fi +- done +- +- # if we didn't find an client, return an error +- if [[ -z $client ]]; then +- error "$(gettext "Unknown download protocol: %s")" "$proto" +- plain "$(gettext "Aborting...")" +- exit $E_CONFIG_ERROR +- fi +- +- printf "%s\n" "$client" +-} +- +-check_vcs_software() { +- local netfile all_sources all_deps deps ret=0 +- +- if (( SOURCEONLY == 1 )); then +- # we will not download VCS sources +- return $ret +- fi +- +- if [[ -z $PACMAN_PATH ]]; then +- warning "$(gettext "Cannot find the %s binary needed to check VCS source requirements.")" "$PACMAN" +- return $ret +- fi +- +- # we currently only use global depends/makedepends arrays for --syncdeps +- for attr in depends makedepends; do +- get_pkgbuild_attribute "$pkg" "$attr" 1 'deps' +- all_deps+=("${deps[@]}") +- +- get_pkgbuild_attribute "$pkg" "${attr}_$CARCH" 1 'deps' +- all_deps+=("${deps[@]}") +- done +- +- get_all_sources_for_arch 'all_sources' +- for netfile in ${all_sources[@]}; do +- local proto=$(get_protocol "$netfile") +- +- case $proto in +- bzr*|git*|hg*|svn*) +- if ! type -p ${proto%%+*} > /dev/null; then +- local client +- client=$(get_vcsclient "$proto") || exit $? +- # ensure specified program is installed +- local uninstalled +- uninstalled=$(check_deps "$client") || exit $E_INSTALL_DEPS_FAILED +- # if not installed, check presence in depends or makedepends +- if [[ -n "$uninstalled" ]] && (( ! NODEPS || ( VERIFYSOURCE && !DEP_BIN ) )); then +- if ! in_array "$client" ${all_deps[@]}; then +- error "$(gettext "Cannot find the %s package needed to handle %s sources.")" \ +- "$client" "${proto%%+*}" +- ret=1 +- fi +- fi +- fi +- ;; +- *) +- # non VCS source +- ;; +- esac +- done +- +- return $ret +-} +- +-check_software() { +- # check for needed software +- local ret=0 +- +- # check for PACMAN if we need it +- 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 +- fi +- fi +- +- # check for sudo if we will need it during makepkg execution +- if (( DEP_BIN || RMDEPS || INSTALL )); then +- if ! type -p sudo >/dev/null; then +- warning "$(gettext "Cannot find the %s binary. Will use %s to acquire root privileges.")" "sudo" "su" +- fi +- fi +- +- # fakeroot - correct package file permissions +- 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 +- fi +- fi +- +- # gpg - package signing +- 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" +- ret=1 +- fi +- fi +- +- # gpg - source verification +- if (( ! SKIPPGPCHECK )) && source_has_signatures; then +- if ! type -p gpg >/dev/null; then +- error "$(gettext "Cannot find the %s binary required for verifying source files.")" "gpg" +- ret=1 +- fi +- fi +- +- # checksum operations +- if (( GENINTEG || ! SKIPCHECKSUMS )); then +- local integlist +- IFS=$'\n' read -rd '' -a integlist < <(get_integlist) +- +- local integ +- for integ in "${integlist[@]}"; do +- if ! type -p "${integ}sum" >/dev/null; then +- error "$(gettext "Cannot find the %s binary required for source file checksums operations.")" "${integ}sum" +- ret=1 +- fi +- 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 +- error "$(gettext "Cannot find the %s binary required for object file stripping.")" "strip" +- ret=1 +- fi +- fi +- +- # gzip - compressig man and info pages +- 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 +- fi +- fi +- +- # tools to download vcs sources +- if ! check_vcs_software; then +- ret=1 +- fi +- +- return $ret +-} +- + check_build_status() { + if (( ! SPLITPKG )); then + fullver=$(get_full_version) diff --git a/buildenv_ext.patch b/buildenv_ext.patch deleted file mode 100644 index edb4d079bf6c..000000000000 --- a/buildenv_ext.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff --git a/scripts/Makefile.am b/scripts/Makefile.am -index 448057d..094bca4 100644 ---- a/scripts/Makefile.am -+++ b/scripts/Makefile.am -@@ -48,6 +48,7 @@ LIBMAKEPKGDIRS = \ - lint_pkgbuild \ - source \ - tidy \ -+ buildenv_ext \ - util - - LIBMAKEPKG_IN = \ -@@ -93,6 +94,7 @@ LIBMAKEPKG_IN = \ - libmakepkg/tidy/staticlibs.sh \ - libmakepkg/tidy/strip.sh \ - libmakepkg/tidy/zipman.sh \ -+ libmakepkg/buildenv_ext.sh \ - libmakepkg/util.sh \ - libmakepkg/util/message.sh \ - libmakepkg/util/option.sh \ -diff --git a/scripts/libmakepkg/buildenv_ext.sh.in b/scripts/libmakepkg/buildenv_ext.sh.in -new file mode 100644 -index 0000000..d56afd9 ---- /dev/null -+++ b/scripts/libmakepkg/buildenv_ext.sh.in -@@ -0,0 +1,43 @@ -+#!/bin/bash -+# -+# buildenv_ext.sh - addional functions for altering the build environment -+# before compiliation -+# -+# Copyright (c) 2015-2016 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_EXT_SH" ]] && return -+LIBMAKEPKG_BUILDENV_EXT_SH=1 -+ -+LIBRARY=${LIBRARY:-'@libmakepkgdir@'} -+ -+declare -a extra_buildopts -+ -+for lib in "$LIBRARY/buildenv_ext/"*.sh; do -+ source "$lib" -+done -+ -+readonly -a extra_buildopts -+ -+ -+buildenv_ext() { -+ -+ # options that alter compilation parameters -+ for func in ${extra_buildopts[@]}; do -+ $func -+ done -+ -+} -diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in -index 02398cf..8f4110f 100644 ---- a/scripts/makepkg.sh.in -+++ b/scripts/makepkg.sh.in -@@ -395,6 +395,9 @@ prepare_buildenv() { - fi - export DISTCC_HOSTS - fi -+ -+ # Check for BUILDENV extensions, use any that are requested (check buildenv and PKGBUILD opts) -+ buildenv_ext - } - - run_function_safe() { diff --git a/makepkg.conf b/makepkg.conf index 8fa4fb04d2ed..15c2f9ad978a 100644 --- a/makepkg.conf +++ b/makepkg.conf @@ -1,3 +1,4 @@ +#!/hint/bash # # /etc/makepkg.conf # @@ -8,9 +9,10 @@ # #-- The download utilities that makepkg should use to acquire sources # Format: 'protocol::agent' -DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u' - 'http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u' - 'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u' +DLAGENTS=('file::/usr/bin/curl -gqC - -o %o %u' + 'ftp::/usr/bin/curl -gqfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u' + 'http::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' + 'https::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' 'rsync::/usr/bin/rsync --no-motd -z %u %o' 'scp::/usr/bin/scp -C %u %o') @@ -34,8 +36,6 @@ CARCH="@CARCH@" CHOST="@CHOST@" #-- Compiler and Linker Flags -# -march (or -mcpu) builds exclusively for an architecture -# -mtune optimizes for an architecture, but builds for whole processor family CPPFLAGS="-D_FORTIFY_SOURCE=2" CFLAGS="@CARCHFLAGS@ -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt" CXXFLAGS="@CARCHFLAGS@ -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt" @@ -50,7 +50,7 @@ DEBUG_CXXFLAGS="-g -fvar-tracking-assignments" # BUILD ENVIRONMENT ######################################################################### # -# Defaults: BUILDENV=(!distcc color !ccache check !sign) +# Defaults: BUILDENV=(!distcc !color !ccache check !sign) # A negated environment option will do the opposite of the comments below. # #-- distcc: Use the Distributed C/C++/ObjC compiler @@ -73,7 +73,7 @@ BUILDENV=(!distcc color !ccache check !sign) # These are default values for the options=() settings ######################################################################### # -# Default: OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !optipng !upx !debug) +# Default: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug) # A negated option will do the opposite of the comments below. # #-- strip: Strip symbols from binaries/libraries @@ -83,11 +83,9 @@ BUILDENV=(!distcc color !ccache check !sign) #-- emptydirs: Leave empty directories in packages #-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip #-- purge: Remove files specified by PURGE_TARGETS -#-- upx: Compress binary executable files using UPX -#-- optipng: Optimize PNG images with optipng #-- debug: Add debugging flags as specified in DEBUG_* variables # -OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !optipng !upx !debug) +OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5) @@ -103,6 +101,8 @@ MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info}) DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc}) #-- Files to be removed from all packages (if purge is specified) PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) +#-- Directory to store source code in for debug packages +DBGSRCDIR="/usr/src/debug" ######################################################################### # PACKAGE OUTPUT @@ -143,5 +143,3 @@ COMPRESSZ=(compress -c -f) # PKGEXT='.pkg.tar.xz' SRCEXT='.src.tar.gz' - -# vim: set ft=sh ts=2 sw=2 et: |