summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2014-08-09 17:26:24 -0400
committerAllan McRae <allan@archlinux.org>2014-09-23 21:43:16 +1000
commit85c055da73022838c13acae0554e6efa75dacf83 (patch)
tree87a7c19524eb099d75c6e53a435cf4fdddd1e833
parente1f6fe652d8796ed259d248b9aa82d0ed8ec9637 (diff)
downloadpacman-85c055da73022838c13acae0554e6efa75dacf83.tar.xz
makepkg: let --source imply --ignorearch
Since source package creation is architecture independent, we should ignore architecture-dependent behaviors such as the lint check which will halt execution when the host machine is not a supported arch. https://github.com/falconindy/pkgbuild-introspection/issues/15
-rw-r--r--scripts/makepkg.sh.in14
1 files changed, 10 insertions, 4 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 0539800b..2518e668 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -3153,10 +3153,16 @@ fi
SRCPKGDEST=${_SRCPKGDEST:-$SRCPKGDEST}
SRCPKGDEST=${SRCPKGDEST:-$startdir} #default to $startdir if undefined
-if (( SOURCEONLY )) && [[ ! -w $SRCPKGDEST ]]; then
- error "$(gettext "You do not have write permission to store source tarballs in %s.")" "$SRCPKGDEST"
- plain "$(gettext "Aborting...")"
- exit 1
+if (( SOURCEONLY )); then
+ if [[ ! -w $SRCPKGDEST ]]; then
+ error "$(gettext "You do not have write permission to store source tarballs in %s.")" "$SRCPKGDEST"
+ plain "$(gettext "Aborting...")"
+ exit 1
+ fi
+
+ # If we're only making a source tarball, then we need to ignore architecture-
+ # dependent behavior.
+ IGNOREARCH=1
fi
LOGDEST=${_LOGDEST:-$LOGDEST}