From 4aab51471259acb8f7789f61089c655545891514 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Fri, 13 Mar 2020 17:51:11 +0100 Subject: [PATCH] Fix libbsd-ctor: only package if it was actually installed The library is built conditionally based on compiler checks. Signed-off-by: David Oberhollenzer --- pkg/libbsd/build | 7 +++++++ pkg/libbsd/libbsd-dev.files | 2 -- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkg/libbsd/build b/pkg/libbsd/build index a09b5c7..a2ec042 100644 --- a/pkg/libbsd/build +++ b/pkg/libbsd/build @@ -18,6 +18,13 @@ build() { deploy() { make DESTDIR="$PKGDEPLOYDIR" install cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR" + + if [ -e "$PKGDEPLOYDIR/lib/libbsd-ctor.a" ]; then + cat >> "$PKGDEPLOYDIR/libbsd-dev.files" <<_EOF +file lib/pkgconfig/libbsd-ctor.pc 0644 0 0 +file lib/libbsd-ctor.a 0644 0 0 +_EOF + fi } check_update() { diff --git a/pkg/libbsd/libbsd-dev.files b/pkg/libbsd/libbsd-dev.files index 71391c2..4b88342 100644 --- a/pkg/libbsd/libbsd-dev.files +++ b/pkg/libbsd/libbsd-dev.files @@ -32,6 +32,4 @@ file include/bsd/getopt.h 0644 0 0 file include/bsd/err.h 0644 0 0 file lib/pkgconfig/libbsd-overlay.pc 0644 0 0 file lib/pkgconfig/libbsd.pc 0644 0 0 -file lib/pkgconfig/libbsd-ctor.pc 0644 0 0 -file lib/libbsd-ctor.a 0644 0 0 slink lib/libbsd.so 0777 0 0 libbsd.so.0.10.0