can be built in fresh docker container

master
Marc Wäckerlin 9 years ago
parent 34e4fd6395
commit a3fc702330
  1. 12
      ax_init_standard_project.m4
  2. 56
      resolve-debbuilddeps.sh

@ -696,3 +696,15 @@ AC_DEFUN([AX_CHECK_VALID_LD_FLAG], [
AC_SUBST(LDFLAGS) AC_SUBST(LDFLAGS)
AC_MSG_RESULT([$newflag in $LDFLAGS]) AC_MSG_RESULT([$newflag in $LDFLAGS])
]) ])
# Check if a package exists in the current distribution, if yes, require it
# in debian/control.in append @DEB_DEPEND_IFEXISTS@ to Build-Depends
# - parameter:
# $1 = package name
AC_DEFUN([AX_DEB_DEPEND_IFEXISTS], [
pkg=$1
if test -n "$(apt-cache policy -q ${pkg} 2> /dev/null)"; then
DEB_DEPEND_IFEXISTS+=", ${pkg}"
fi
AC_SUBST(DEB_DEPEND_IFEXISTS)
])

@ -12,22 +12,40 @@
SCHROOTNAME="$1" SCHROOTNAME="$1"
function install() {
if test -n "${SCHROOTNAME}"; then
if schroot -c "${SCHROOTNAME}" -u root -d / -- apt-get -y install $*; then
return 0
fi
else
if apt-get -y install $*; then
return 0
fi
fi
}
TO_INSTALL=
if test -e debian/control.in -a ! -e debian/control; then if test -e debian/control.in -a ! -e debian/control; then
sed 's,@[^@]*@, dummytext,g' debian/control.in > debian/control for f in $(sed -n 's, *AX_DEB_DEPEND_IFEXISTS(\([^)]*\)).*,\1,p' configure.ac); do
if test -n "$(apt-cache policy -q ${f})" && ! dpkg -l "${f}"; then
TO_INSTALL+=" ${f}"
fi
done
trap "rm debian/control" INT TERM EXIT trap "rm debian/control" INT TERM EXIT
sed 's,@DEB_DEPEND_IFEXISTS@,,g' debian/control.in | \
sed 's,@[^@]*@, dummytext,g' > debian/control
fi fi
if test -n "${SCHROOTNAME}"; then if test -n "${SCHROOTNAME}"; then
schroot -c "${SCHROOTNAME}" -u root -d / -- apt-get install -y dpkg-dev schroot -c "${SCHROOTNAME}" -u root -d / -- apt-get -y install dpkg-dev
DEPS=$(schroot -c "${SCHROOTNAME}" -- dpkg-checkbuilddeps 2>&1 || true) DEPS=$(schroot -c "${SCHROOTNAME}" -- dpkg-checkbuilddeps 2>&1 || true)
else else
apt-get install -y dpkg-dev apt-get -y install dpkg-dev
apt-get update
DEPS=$(dpkg-checkbuilddeps 2>&1 || true) DEPS=$(dpkg-checkbuilddeps 2>&1 || true)
fi fi
DEPS=$(echo "$DEPS" | sed -n '/Unmet build dependencies/ { s,.*Unmet build dependencies: ,,g; s, ([^)]*),,g; s, *| *,|,g; p}') DEPS=$(echo "$DEPS" | sed -n '/Unmet build dependencies/ { s,.*Unmet build dependencies: ,,g; s, ([^)]*),,g; s, *| *,|,g; p}')
TO_INSTALL=
for pa in ${DEPS}; do for pa in ${DEPS}; do
if test ${pa//|/} = ${pa}; then if test ${pa//|/} = ${pa}; then
TO_INSTALL+=" ${pa}" TO_INSTALL+=" ${pa}"
@ -35,16 +53,10 @@ for pa in ${DEPS}; do
fi fi
success=0 success=0
for p in ${pa//|/ }; do for p in ${pa//|/ }; do
if test -n "${SCHROOTNAME}"; then if install ${TO_INSTALL} ${p}; then
if schroot -c "${SCHROOTNAME}" -u root -d / -- apt-get -y install ${p}; then TO_INSTALL+=" ${p}"
success=1 success=1
break; break
fi
else
if apt-get -y install ${p}; then
success=1
break;
fi
fi fi
done done
if test ${success} -eq 0; then if test ${success} -eq 0; then
@ -53,18 +65,8 @@ for pa in ${DEPS}; do
fi fi
done done
success=0 if test -n "${TO_INSTALL}" && ! install ${TO_INSTALL}; then
if test -n "${SCHROOTNAME}"; then echo "**** Error: Installation Failed: ${TO_INSTALL}"
if schroot -c "${SCHROOTNAME}" -u root -d / -- apt-get -y install ${TO_INSTALL}; then
success=1
fi
else
if apt-get -y install ${TO_INSTALL}; then
success=1
fi
fi
if test ${success} -eq 0; then
echo "**** Error: Installation Failed: ${pa}"
exit 1 exit 1
fi fi

Loading…
Cancel
Save