mirror of
https://github.com/moparisthebest/pacman
synced 2024-08-13 17:03:46 -04:00
makepkg: add support for CARCH environment var
Add support for overriding configuration in /etc/makepkg.conf and ~/.makepkg.conf by setting the environment variable CARCH similar to how SRCDEST and PKGDEST behave. Fixes FS#35030. Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
parent
a975523fb9
commit
5bcc058d42
@ -229,6 +229,10 @@ Environment Variables
|
|||||||
Folder where the package will be built. Overrides the corresponding
|
Folder where the package will be built. Overrides the corresponding
|
||||||
value defined in linkman:makepkg.conf[5].
|
value defined in linkman:makepkg.conf[5].
|
||||||
|
|
||||||
|
**CARCH=**"(i686|x86_64)"::
|
||||||
|
Force build for a specific architecture. Useful for cross-compiling.
|
||||||
|
Overrides the corresponding value defined in linkman:makepkg.conf[5].
|
||||||
|
|
||||||
Configuration
|
Configuration
|
||||||
-------------
|
-------------
|
||||||
See linkman:makepkg.conf[5] for more details on configuring makepkg using the
|
See linkman:makepkg.conf[5] for more details on configuring makepkg using the
|
||||||
|
@ -2638,6 +2638,7 @@ trap 'trap_exit USR1 "$(gettext "An unknown error has occurred. Exiting...")"' E
|
|||||||
[[ -n ${SRCEXT} ]] && _SRCEXT=${SRCEXT}
|
[[ -n ${SRCEXT} ]] && _SRCEXT=${SRCEXT}
|
||||||
[[ -n ${GPGKEY} ]] && _GPGKEY=${GPGKEY}
|
[[ -n ${GPGKEY} ]] && _GPGKEY=${GPGKEY}
|
||||||
[[ -n ${PACKAGER} ]] && _PACKAGER=${PACKAGER}
|
[[ -n ${PACKAGER} ]] && _PACKAGER=${PACKAGER}
|
||||||
|
[[ -n ${CARCH} ]] && _CARCH=${CARCH}
|
||||||
|
|
||||||
# default config is makepkg.conf
|
# default config is makepkg.conf
|
||||||
MAKEPKG_CONF=${MAKEPKG_CONF:-$confdir/makepkg.conf}
|
MAKEPKG_CONF=${MAKEPKG_CONF:-$confdir/makepkg.conf}
|
||||||
@ -2737,6 +2738,7 @@ PKGEXT=${_PKGEXT:-$PKGEXT}
|
|||||||
SRCEXT=${_SRCEXT:-$SRCEXT}
|
SRCEXT=${_SRCEXT:-$SRCEXT}
|
||||||
GPGKEY=${_GPGKEY:-$GPGKEY}
|
GPGKEY=${_GPGKEY:-$GPGKEY}
|
||||||
PACKAGER=${_PACKAGER:-$PACKAGER}
|
PACKAGER=${_PACKAGER:-$PACKAGER}
|
||||||
|
CARCH=${_CARCH:-$CARCH}
|
||||||
|
|
||||||
if (( ! INFAKEROOT )); then
|
if (( ! INFAKEROOT )); then
|
||||||
if (( EUID == 0 && ! ASROOT )); then
|
if (( EUID == 0 && ! ASROOT )); then
|
||||||
|
Loading…
Reference in New Issue
Block a user