From f8813c1565465d895fca60f64fb9c245ef5a8cd4 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 29 Jun 2011 13:47:56 +0000 Subject: abuild: do not move *.la files to dev package and exit with error if found To be allowed to keep the .la files you need to add 'libtool' to $options --- abuild.in | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'abuild.in') diff --git a/abuild.in b/abuild.in index fdc9527..25ae4e5 100755 --- a/abuild.in +++ b/abuild.in @@ -469,6 +469,13 @@ prepare_subpackages() { subpkgdir="$pkgbasedir/${i%:*}" subpkgname="${i%:*}" \ $0 $func prepare_package || return 1 done + # post check + i=$(find "$pkgdir" -name '*.la') + if [ -n "$i" ] && ! options_has "libtool"; then + error "Libtool archives (*.la) files found and \$options has no 'libtool' flag:" + echo "$i" | sed 's/^/ /' + return 1 + fi } lang_subpkg() { @@ -919,8 +926,7 @@ default_dev() { usr/share/gettext usr/bin/*-config \ usr/share/vala/vapi usr/share/gir-[0-9]*\ $(find -name include -type d) \ - $(find usr/ -name '*.[acho]' -o -name '*.la' \ - 2>/dev/null); do + $(find usr/ -name '*.[acho]' 2>/dev/null); do if [ -e "$pkgdir/$i" ] || [ -L "$pkgdir/$i" ]; then d="$subpkgdir/${i%/*}" # dirname $i mkdir -p "$d" -- cgit v1.2.3-60-g2f50