libraries
/
mrw-cxx
1
0
Fork 0
Code Issues Releases Activity

build fixes

Browse Source
master
Marc Wäckerlin 9 years ago
parent b0c4541212
commit de6b202dc6
2 changed files with 5 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      bootstrap.sh
  2. 8
      resolve-debbuilddeps.sh

2
bootstrap.sh
Unescape View File

@ -698,7 +698,7 @@ if testtag AX_USE_DEBIAN_PACKAGING; then
-- @AUTHOR@ @BUILD_DATE@ -- @AUTHOR@ @BUILD_DATE@
EOF EOF
BUILD_DEPENDS="debhelper, subversion, pkg-config, automake, libtoolize, autotools-dev, lsb-release $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen"; fi; if testtag AX_USE_CPPUNIT; then echo -n ", libcppunit-dev"; fi; if testtag AX_CXX_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n ", qt5-default | qt4-default | qt5-qmake | qt4-qmake, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools"; fi)" BUILD_DEPENDS="debhelper, subversion, pkg-config, automake, libtool, autotools-dev, lsb-release $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen"; fi; if testtag AX_USE_CPPUNIT; then echo -n ", libcppunit-dev"; fi; if testtag AX_CXX_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n ", qt5-default | qt4-default | qt5-qmake | qt4-qmake, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools"; fi)"
to debian/control.in <<EOF to debian/control.in <<EOF
Source: @PACKAGE_NAME@ Source: @PACKAGE_NAME@
Priority: extra Priority: extra

8
resolve-debbuilddeps.sh
Unescape View File

@ -16,14 +16,14 @@ sed 's,@[^@]*@, dummytext,g' debian/control.in > debian/control
if test -n "${SCHROOTNAME}"; then if test -n "${SCHROOTNAME}"; then
schroot -c "${SCHROOTNAME}" -u root -d / -- apt-get install -y dpkg-dev software-properties-common schroot -c "${SCHROOTNAME}" -u root -d / -- apt-get install -y dpkg-dev software-properties-common
schroot -c "${SCHROOTNAME}" -u root -d / -- apt-add-repository universe schroot -c "${SCHROOTNAME}" -u root -d / -- apt-add-repository universe || true
schroot -c "${SCHROOTNAME}" -u root -d / -- apt-add-repository multiverse schroot -c "${SCHROOTNAME}" -u root -d / -- apt-add-repository multiverse || true
schroot -c "${SCHROOTNAME}" -u root -d / -- apt-get update schroot -c "${SCHROOTNAME}" -u root -d / -- apt-get update
DEPS=$(schroot -c "${SCHROOTNAME}" -- dpkg-checkbuilddeps 2>&1 || true) DEPS=$(schroot -c "${SCHROOTNAME}" -- dpkg-checkbuilddeps 2>&1 || true)
else else
sudo apt-get install -y dpkg-dev software-properties-common sudo apt-get install -y dpkg-dev software-properties-common
sudo apt-add-repository universe sudo apt-add-repository universe || true
sudo apt-add-repository multiverse sudo apt-add-repository multiverse || true
sudo apt-get update sudo apt-get update
DEPS=$(dpkg-checkbuilddeps 2>&1 || true) DEPS=$(dpkg-checkbuilddeps 2>&1 || true)
fi fi

Write Preview
Loading…
Cancel
Save