Remove --builddeps from makepkg
This really should be in an external script, as it is not makepkg's job to rebuild your system. Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
parent
584ffa6aef
commit
ae5ef3b90f
3 changed files with 3 additions and 49 deletions
|
@ -45,13 +45,6 @@ Options
|
||||||
for rebuilding packages from source when the PKGBUILD may be slightly
|
for rebuilding packages from source when the PKGBUILD may be slightly
|
||||||
outdated and not updated with an `$$arch=('yourarch')$$` field.
|
outdated and not updated with an `$$arch=('yourarch')$$` field.
|
||||||
|
|
||||||
*-b, \--builddeps*::
|
|
||||||
Build missing dependencies from source. When makepkg finds missing
|
|
||||||
build-time or run-time dependencies, it will look for the dependencies'
|
|
||||||
PKGBUILD files under `SRCROOT` (set in linkman:makepkg.conf[5]). If it
|
|
||||||
finds them it will call makepkg to build and install the missing
|
|
||||||
dependencies. The child calls will be made with the `-b` and `-i` options.
|
|
||||||
|
|
||||||
*-c, \--clean*::
|
*-c, \--clean*::
|
||||||
Clean up leftover work files and directories after a successful build.
|
Clean up leftover work files and directories after a successful build.
|
||||||
|
|
||||||
|
|
|
@ -84,8 +84,6 @@ DOC_DIRS=(usr/{,share/}{info,doc,gtk-doc} opt/*/{info,doc,gtk-doc})
|
||||||
#PKGDEST=/home/packages
|
#PKGDEST=/home/packages
|
||||||
#-- Source cache: specify a fixed directory where source files will be cached
|
#-- Source cache: specify a fixed directory where source files will be cached
|
||||||
#SRCDEST=/home/sources
|
#SRCDEST=/home/sources
|
||||||
#-- Source root: specify location where PKGBUILDs are located for '--builddeps'
|
|
||||||
#SRCROOT=/home/pkgbuilds
|
|
||||||
#-- Packager: name/email of the person or organization building packages
|
#-- Packager: name/email of the person or organization building packages
|
||||||
#PACKAGER="John Doe <john@doe.com>"
|
#PACKAGER="John Doe <john@doe.com>"
|
||||||
|
|
||||||
|
|
|
@ -44,7 +44,6 @@ ASROOT=0
|
||||||
CLEANUP=0
|
CLEANUP=0
|
||||||
CLEANCACHE=0
|
CLEANCACHE=0
|
||||||
DEP_BIN=0
|
DEP_BIN=0
|
||||||
DEP_SRC=0
|
|
||||||
FORCE=0
|
FORCE=0
|
||||||
INFAKEROOT=0
|
INFAKEROOT=0
|
||||||
GENINTEG=0
|
GENINTEG=0
|
||||||
|
@ -339,7 +338,7 @@ handledeps() {
|
||||||
striplist="$striplist $depstrip"
|
striplist="$striplist $depstrip"
|
||||||
done
|
done
|
||||||
|
|
||||||
if [ "$DEP_SRC" = "0" -a "$DEP_BIN" = "0" ]; then
|
if [ "$DEP_BIN" = "0" ]; then
|
||||||
return $R_DEPS_MISSING
|
return $R_DEPS_MISSING
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -358,40 +357,6 @@ handledeps() {
|
||||||
error "$(gettext "Pacman failed to install missing dependencies.")"
|
error "$(gettext "Pacman failed to install missing dependencies.")"
|
||||||
exit 1 # TODO: error code
|
exit 1 # TODO: error code
|
||||||
fi
|
fi
|
||||||
elif [ "$DEP_SRC" = "1" ]; then
|
|
||||||
msg "$(gettext "Building missing dependencies...")"
|
|
||||||
|
|
||||||
# install missing deps by building them from source.
|
|
||||||
# we look for each package name in $SRCROOT and build it.
|
|
||||||
if [ "$SRCROOT" = "" ]; then
|
|
||||||
error "$(gettext "Source root cannot be found - please make sure it is specified in %s.")" "$confdir/makepkg.conf"
|
|
||||||
exit 1 # TODO: error code
|
|
||||||
fi
|
|
||||||
|
|
||||||
# TODO: handle version comparators (eg, glibc>=2.2.5)
|
|
||||||
for dep in $striplist; do
|
|
||||||
local candidates="$(find "$SRCROOT" -type d -name "$dep")"
|
|
||||||
if [ "$candidates" = "" ]; then
|
|
||||||
error "$(gettext "Could not find '%s' under %s")" "$dep" "$SRCROOT"
|
|
||||||
exit 1 # TODO: error code
|
|
||||||
fi
|
|
||||||
|
|
||||||
local makepkg_opts='-i -c -b'
|
|
||||||
[ "$RMDEPS" = "1" ] && makepkg_opts="$makepkg_opts -r"
|
|
||||||
[ "$ASROOT" = "1" ] && makepkg_opts="$makepkg_opts --asroot"
|
|
||||||
local ret packagedir
|
|
||||||
for packagedir in $candidates; do
|
|
||||||
if [ -f "$packagedir/$BUILDSCRIPT" ]; then
|
|
||||||
cd "$packagedir"
|
|
||||||
ret=0
|
|
||||||
PKGDEST="$PKGDEST" makepkg $makepkg_opts $PACMAN_OPTS || ret=$?
|
|
||||||
[ $ret -eq 0 ] && continue 2
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
error "$(gettext "Failed to build '%s'")" "$dep"
|
|
||||||
exit 1 # TODO: error code
|
|
||||||
done
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# rerun any additional sh scripts found in /etc/profile.d/
|
# rerun any additional sh scripts found in /etc/profile.d/
|
||||||
|
@ -421,7 +386,7 @@ resolve_deps() {
|
||||||
# check deps again to make sure they were resolved
|
# check deps again to make sure they were resolved
|
||||||
deplist="$(check_deps $*)"
|
deplist="$(check_deps $*)"
|
||||||
[ "$deplist" = "" ] && return $R_DEPS_SATISFIED
|
[ "$deplist" = "" ] && return $R_DEPS_SATISFIED
|
||||||
elif [ "$DEP_BIN" = "1" -o "$DEP_SRC" = "1" ]; then
|
elif [ "$DEP_BIN" = "1" ]; then
|
||||||
error "$(gettext "Failed to install all missing dependencies.")"
|
error "$(gettext "Failed to install all missing dependencies.")"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -1092,7 +1057,6 @@ usage() {
|
||||||
echo
|
echo
|
||||||
echo "$(gettext "Options:")"
|
echo "$(gettext "Options:")"
|
||||||
printf "$(gettext " -A, --ignorearch Ignore incomplete arch field in %s")\n" "$BUILDSCRIPT"
|
printf "$(gettext " -A, --ignorearch Ignore incomplete arch field in %s")\n" "$BUILDSCRIPT"
|
||||||
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")"
|
||||||
echo "$(gettext " -d, --nodeps Skip all dependency checks")"
|
echo "$(gettext " -d, --nodeps Skip all dependency checks")"
|
||||||
|
@ -1188,7 +1152,6 @@ while true; do
|
||||||
# Makepkg Options
|
# Makepkg Options
|
||||||
--asroot) ASROOT=1 ;;
|
--asroot) ASROOT=1 ;;
|
||||||
-A|--ignorearch) IGNOREARCH=1 ;;
|
-A|--ignorearch) IGNOREARCH=1 ;;
|
||||||
-b|--builddeps) DEP_SRC=1 ;;
|
|
||||||
-c|--clean) CLEANUP=1 ;;
|
-c|--clean) CLEANUP=1 ;;
|
||||||
-C|--cleancache) CLEANCACHE=1 ;;
|
-C|--cleancache) CLEANCACHE=1 ;;
|
||||||
-d|--nodeps) NODEPS=1 ;;
|
-d|--nodeps) NODEPS=1 ;;
|
||||||
|
@ -1297,7 +1260,7 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# check for sudo if we will need it during makepkg execution
|
# check for sudo if we will need it during makepkg execution
|
||||||
if [ "$ASROOT" = "0" -a \( "$DEP_BIN" = "1" -o "$DEP_SRC" = "1" \
|
if [ "$ASROOT" = "0" -a \( "$DEP_BIN" = "1" \
|
||||||
-o "$RMDEPS" = "1" -o "$INSTALL" = "1" \) ]; then
|
-o "$RMDEPS" = "1" -o "$INSTALL" = "1" \) ]; then
|
||||||
if [ ! "$(type -p sudo)" ]; then
|
if [ ! "$(type -p sudo)" ]; then
|
||||||
error "$(gettext "Cannot find the sudo binary! Is sudo installed?")"
|
error "$(gettext "Cannot find the sudo binary! Is sudo installed?")"
|
||||||
|
|
Loading…
Add table
Reference in a new issue