moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-23 00:08:50 -05:00
Code Issues Releases Wiki Activity

FS7355: Add --ignorearch option to makepkg

Browse Source 
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Andreas Hauser 2007-06-04 22:06:11 +01:00 committed by Dan McGee
parent 2746a6319a
commit c1b6a6d616
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
scripts/makepkg.in
View File

@ -53,6 +53,7 @@ RMDEPS=0
REPKG=0 REPKG=0
LOGGING=0 LOGGING=0
SOURCEONLY=0 SOURCEONLY=0
IGNOREARCH=0
PACMAN_OPTS= PACMAN_OPTS=
@ -933,6 +934,7 @@ usage() {
printf "$(gettext "Usage: %s [options]")\n" "$0" printf "$(gettext "Usage: %s [options]")\n" "$0"
echo echo
echo "$(gettext "Options:")" echo "$(gettext "Options:")"
printf "$(gettext " -A, --ignorearch Ignore incomplete arch field in %s")\n" "$BUILDSCRIPT"
echo "$(gettext " -b, --builddeps Build missing dependencies from source")" echo "$(gettext " -b, --builddeps Build missing dependencies from source")"
echo "$(gettext " -c, --clean Clean up work files after build")" echo "$(gettext " -c, --clean Clean up work files after build")"
echo "$(gettext " -C, --cleancache Clean up source files from the cache")" echo "$(gettext " -C, --cleancache Clean up source files from the cache")"
@ -1021,6 +1023,7 @@ while [ "$#" -ne "0" ]; do
--builddeps) DEP_SRC=1 ;; --builddeps) DEP_SRC=1 ;;
--nodeps) NODEPS=1 ;; --nodeps) NODEPS=1 ;;
--noextract) NOEXTRACT=1 ;; --noextract) NOEXTRACT=1 ;;
--ignorearch) IGNOREARCH=1 ;;
--install) INSTALL=1 ;; --install) INSTALL=1 ;;
--force) FORCE=1 ;; --force) FORCE=1 ;;
--nobuild) NOBUILD=1 ;; --nobuild) NOBUILD=1 ;;
@ -1049,8 +1052,9 @@ while [ "$#" -ne "0" ]; do
exit 1 #E_INVALID_OPTION exit 1 #E_INVALID_OPTION
;; ;;
-*) -*)
while getopts "bcCdefFghiLmop:rRsSV-" opt; do while getopts "AbcCdefFghiLmop:rRsSV-" opt; do
case $opt in case $opt in
A) IGNOREARCH=1 ;;
b) DEP_SRC=1 ;; b) DEP_SRC=1 ;;
c) CLEANUP=1 ;; c) CLEANUP=1 ;;
C) CLEANCACHE=1 ;; C) CLEANCACHE=1 ;;
@ -1210,11 +1214,18 @@ if [ $(echo "$pkgrel" | grep '-') ]; then
error "$(gettext "%s is not allowed to contain hyphens.")" "pkgrel" error "$(gettext "%s is not allowed to contain hyphens.")" "pkgrel"
exit 1 exit 1
fi fi
if ! in_array $CARCH ${arch[@]}; then if ! in_array $CARCH ${arch[@]}; then
error "$(gettext "%s is not available for the '%s' architecture.")" "$pkgname" "$CARCH" if "$IGNOREARCH" = "0" ]; then
plain "$(gettext "Note that many packages may need a line added to their %s")" "$BUILDSCRIPT" error "$(gettext "%s is not available for the '%s' architecture.")" "$pkgname" "$CARCH"
plain "$(gettext "such as arch=('%s').")" "$CARCH" plain "$(gettext "Note that many packages may need a line added to their %s")" "$BUILDSCRIPT"
exit 1 plain "$(gettext "such as arch=('%s').")" "$CARCH"
exit 1
else
warning "$(gettext "%s is not available for the '%s' architecture.")" "$pkgname" "$CARCH"
plain "$(gettext "Note that many packages may need a line added to their %s")" "$BUILDSCRIPT"
plain "$(gettext "such as arch=('%s').")" "$CARCH"
fi
fi fi
if [ "$install" -a ! -f "$install" ]; then if [ "$install" -a ! -f "$install" ]; then