summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McDermott <patrick.mcdermott@libiquity.com>2020-08-03 02:10:12 (EDT)
committer Patrick McDermott <patrick.mcdermott@libiquity.com>2020-08-03 02:10:12 (EDT)
commitd4a970f27322e6a060ef30851116e16f27f55202 (patch)
tree01ce0326c0f8e154d483cfa3d8e3e664e2247ad0
parenteab0c95114d11805116ac5d7849102e3ec42a331 (diff)
build: Fix install_dbg target
`[ x"$(variant)" != x'dbg' ] && oh-strip -d $(destdir)` returned non-zero (from the `[` command), so an if construct is better. oh-installfiles complained about leftover files, so remove all the development files.
-rwxr-xr-xbuild26
1 files changed, 19 insertions, 7 deletions
diff --git a/build b/build
index 8441f6b..5bfac03 100755
--- a/build
+++ b/build
@@ -29,6 +29,8 @@ build_client_cflags = $(common_cflags) \
build_full_cflags = $(common_cflags)
build_dbg_cflags = $(common_cflags)
+arch = $(OPK_HOST_ARCH)
+
nop:
@:
@@ -55,17 +57,27 @@ build: build_client build_full build_dbg
install_client install_full install_dbg: build
oh-autoinstall -B $(builddir) -d $(destdir)
rm -Rf \
- $(destdir)/usr/lib/$(OPK_HOST_ARCH)/libwolfssl.la \
+ $(destdir)/usr/lib/$(arch)/libwolfssl.la \
$(destdir)/usr/share/doc/wolfssl/example/ \
$(destdir)/usr/share/doc/wolfssl/README.txt \
$(destdir)/usr/share/doc/wolfssl/taoCert.txt
oh-fixperms -d $(destdir)
- [ x"$(variant)" != x'dbg' ] && oh-strip -d $(destdir)
- OPK_PACKAGES="libwolfssl.$(abi_ver)-$(variant)" \
- oh-installfiles -d $(destdir)
- [ x"$(variant)" != x'dbg' ] && \
- OPK_PACKAGES="libwolfssl.$(abi_ver)-$(variant)-dev" \
- oh-installfiles -d $(destdir)
+ set -e; if [ x"$(variant)" != x'dbg' ]; then \
+ oh-strip -d $(destdir); \
+ OPK_PACKAGES="\
+ libwolfssl.$(abi_ver)-$(variant) \
+ libwolfssl.$(abi_ver)-$(variant)-dev \
+ " oh-installfiles -d $(destdir); \
+ else \
+ rm -Rf \
+ $(destdir)/usr/include/ \
+ $(destdir)/usr/lib/$(arch)/libwolfssl.so \
+ $(destdir)/usr/lib/$(arch)/pkgconfig/wolfssl.pc \
+ $(destdir)/usr/bin/wolfssl-config; \
+ OPK_PACKAGES="\
+ libwolfssl.$(abi_ver)-$(variant) \
+ " oh-installfiles -d $(destdir); \
+ fi
install: install_client install_full install_dbg
oh-shlibdeps