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

fix build on debian

Browse Source
This commit is contained in:
Marc Wäckerlin
2016-12-10 14:53:20 +00:00
parent d45845fa0e
commit 7c024f07bd
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2016-12-09 15:51
* [r461] ChangeLog:
fix build issues - utf-8 gpg uid still not supported for most rpm
based distros
2016-12-09 12:12 2016-12-09 12:12
* [r460] ChangeLog, ax_init_standard_project.m4, bootstrap.sh, * [r460] ChangeLog, ax_init_standard_project.m4, bootstrap.sh,

2
build-in-docker.sh
View File

@@ -216,8 +216,10 @@ if ! docker exec ${DOCKER_ID} getent passwd $(id -u) > /dev/null 2>&1; then
fi fi
case $mode in case $mode in
(deb|apt) (deb|apt)
if [[ "${img}" =~ "ubuntu" ]]; then
docker exec ${DOCKER_ID} locale-gen ${LANG} docker exec ${DOCKER_ID} locale-gen ${LANG}
docker exec ${DOCKER_ID} update-locale LANG=${LANG} docker exec ${DOCKER_ID} update-locale LANG=${LANG}
fi
OPTIONS='-o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew -y --force-yes --no-install-suggests --no-install-recommends' OPTIONS='-o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew -y --force-yes --no-install-suggests --no-install-recommends'
for f in 'libpam-systemd:amd64' 'policykit*' 'colord'; do for f in 'libpam-systemd:amd64' 'policykit*' 'colord'; do
docker exec ${DOCKER_ID} bash -c "echo 'Package: $f' >> /etc/apt/preferences" docker exec ${DOCKER_ID} bash -c "echo 'Package: $f' >> /etc/apt/preferences"