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
This commit is contained in:
parent
178affc406
commit
f8813c1565
10
abuild.in
10
abuild.in
|
@ -469,6 +469,13 @@ prepare_subpackages() {
|
||||||
subpkgdir="$pkgbasedir/${i%:*}" subpkgname="${i%:*}" \
|
subpkgdir="$pkgbasedir/${i%:*}" subpkgname="${i%:*}" \
|
||||||
$0 $func prepare_package || return 1
|
$0 $func prepare_package || return 1
|
||||||
done
|
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() {
|
lang_subpkg() {
|
||||||
|
@ -919,8 +926,7 @@ default_dev() {
|
||||||
usr/share/gettext usr/bin/*-config \
|
usr/share/gettext usr/bin/*-config \
|
||||||
usr/share/vala/vapi usr/share/gir-[0-9]*\
|
usr/share/vala/vapi usr/share/gir-[0-9]*\
|
||||||
$(find -name include -type d) \
|
$(find -name include -type d) \
|
||||||
$(find usr/ -name '*.[acho]' -o -name '*.la' \
|
$(find usr/ -name '*.[acho]' 2>/dev/null); do
|
||||||
2>/dev/null); do
|
|
||||||
if [ -e "$pkgdir/$i" ] || [ -L "$pkgdir/$i" ]; then
|
if [ -e "$pkgdir/$i" ] || [ -L "$pkgdir/$i" ]; then
|
||||||
d="$subpkgdir/${i%/*}" # dirname $i
|
d="$subpkgdir/${i%/*}" # dirname $i
|
||||||
mkdir -p "$d"
|
mkdir -p "$d"
|
||||||
|
|
Loading…
Reference in New Issue