Merge pull request #2460 from pullmoll/distcc

distcc: can't distribute cpp; add cross-gcc
This commit is contained in:
Jürgen Buchmüller 2015-09-06 13:10:35 +02:00
commit 171def8f25
2 changed files with 21 additions and 5 deletions

View file

@ -1,7 +1,7 @@
# Template file for 'chroot-distcc' # Template file for 'chroot-distcc'
pkgname=chroot-distcc pkgname=chroot-distcc
version=3.2rc1 version=3.2rc1
revision=3 revision=4
wrksrc="distcc-${version}" wrksrc="distcc-${version}"
bootstrap=yes bootstrap=yes
build_style=gnu-configure build_style=gnu-configure
@ -21,14 +21,22 @@ pre_configure() {
} }
post_install() { post_install() {
local f x
# Remove useless files. # Remove useless files.
rm -f ${DESTDIR}/usr/bin/distccd rm -f ${DESTDIR}/usr/bin/distccd
rm -rf ${DESTDIR}/etc rm -rf ${DESTDIR}/etc
rm -rf ${DESTDIR}/usr/share rm -rf ${DESTDIR}/usr/share
# gcc wrappers # gcc wrappers
vmkdir usr/lib/distcc/bin vmkdir usr/lib/distcc/bin
for f in gcc cc c++ cpp g++; do for f in gcc cc c++ g++; do
ln -sfr ${DESTDIR}/usr/bin/distcc ${DESTDIR}/usr/lib/distcc/bin/${f} ln -sfr ${DESTDIR}/usr/bin/distcc ${DESTDIR}/usr/lib/distcc/bin/${f}
done done
# cross-gcc wrappers
for x in arm-linux-gnueabi arm-linux-gnueabihf armv7l-linux-gnueabihf \
arm-linux-musleabihf armv7l-linux-musleabihf; do
for f in gcc cc c++ g++; do
ln -sfr ${DESTDIR}/usr/bin/distcc ${DESTDIR}/usr/lib/distcc/bin/${x}-${f}
done
done
} }

View file

@ -1,7 +1,7 @@
# Template file for 'distcc' # Template file for 'distcc'
pkgname=distcc pkgname=distcc
version=3.2rc1 version=3.2rc1
revision=14 revision=15
build_style=gnu-configure build_style=gnu-configure
configure_args="--disable-Werror --with-gtk" configure_args="--disable-Werror --with-gtk"
hostmakedepends="pkg-config" hostmakedepends="pkg-config"
@ -19,6 +19,7 @@ checksum=311671e844625d7fdb18dd3d096cd855751cfe8de13827682bcb7beff9133b30
build_pie=yes build_pie=yes
post_install() { post_install() {
local f x
# Remove useless files. # Remove useless files.
rm -f ${DESTDIR}/etc/default/distcc rm -f ${DESTDIR}/etc/default/distcc
rm -f ${DESTDIR}/etc/distcc/commands.allow.sh rm -f ${DESTDIR}/etc/distcc/commands.allow.sh
@ -28,9 +29,16 @@ post_install() {
# gcc wrappers # gcc wrappers
vmkdir usr/lib/distcc/bin vmkdir usr/lib/distcc/bin
for f in gcc cc c++ cpp g++; do for f in gcc cc c++ g++; do
ln -sfr ${DESTDIR}/usr/bin/distcc ${DESTDIR}/usr/lib/distcc/bin/${f} ln -sfr ${DESTDIR}/usr/bin/distcc ${DESTDIR}/usr/lib/distcc/bin/${f}
done done
# cross-gcc wrappers
for x in arm-linux-gnueabi arm-linux-gnueabihf armv7l-linux-gnueabihf \
arm-linux-musleabihf armv7l-linux-musleabihf; do
for f in gcc cc c++ g++; do
ln -sfr ${DESTDIR}/usr/bin/distcc ${DESTDIR}/usr/lib/distcc/bin/${x}-${f}
done
done
} }
distcc-gtk_package() { distcc-gtk_package() {