diff options
| author | Lucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de> | 2017-11-19 14:21:25 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de> | 2017-11-20 14:46:55 +0000 |
| commit | 49b46005e7f7ebebcf6b43d451918c5462ac28d4 (patch) | |
| tree | d226c2bb06d084911b70118e466e23a2de45ae0a /subr/pkg_install.subr | |
| parent | d27197213a39dd05dee64788ce185f6805207292 (diff) | |
| download | midipix_build-49b46005e7f7ebebcf6b43d451918c5462ac28d4.tar.bz2 midipix_build-49b46005e7f7ebebcf6b43d451918c5462ac28d4.tar.xz | |
vars/{build,env}.vars: diet, pt. II.
vars/build.vars: install w/ `DESTDIR=<prefix> PREFIX= prefix=' by default.
vars/build.vars:cmake: build w/ -g0 -O2.
vars/cmake.vars: build using cmake_host.
vars/pkgconf_host.vars: remove & don't install ${PREFIX}/bin/pkg-config link to avoid confusing host packages.
vars/{apr_util,chainport}.vars: replaced w/ corresponding ${PKG_BUILD_STEPS}.
patches/perl-5.22.1.local.patch: pass -L. -lperl when linking.
patches/smallbasic.local.patch: don't call pcre-config.
subr/pkg_autoconf.subr, vars/{lib{caca,udns},toilet}.vars: always install config.sub after bootstrap.
subr/pkg_disabled.subr: always silently finish disabled packages.
subr/pkg_setup_{env,vars}.subr: split.
subr/pkg_{build,install}.subr: always pass LIBTOOL=${PKG_SLIBTOOL:=slibtool}.
subr/pkg_{{build,work}_dir,extract,setup_env}.subr: infer ${PKG_BUILD_DIR} from ${PKG_SUBDIR} given the absence of configure{,.{ac,in}}.
Diffstat (limited to 'subr/pkg_install.subr')
| -rw-r--r-- | subr/pkg_install.subr | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/subr/pkg_install.subr b/subr/pkg_install.subr index fc76098e..8e4a5b7a 100644 --- a/subr/pkg_install.subr +++ b/subr/pkg_install.subr @@ -88,6 +88,7 @@ pkg_install() { "${PKG_LDFLAGS_INSTALL:+LDFLAGS=${PKG_LDFLAGS_INSTALL}}" \ "${PKG_LDFLAGS_INSTALL_EXTRA:+LDFLAGS+=${PKG_LDFLAGS_INSTALL_EXTRA}}" \ "${PKG_RANLIB_INSTALL:+RANLIB=${PKG_RANLIB_INSTALL}}" \ + "LIBTOOL=${PKG_SLIBTOOL:-slibtool}" \ ${PKG_INSTALL_TARGET:=install}; if [ -n "${PKG_PREFIX_EXTRA}" ]; then run_cmd_unsplit make \ @@ -99,6 +100,7 @@ pkg_install() { "${PKG_LDFLAGS_INSTALL:+LDFLAGS=${PKG_LDFLAGS_INSTALL}}" \ "${PKG_LDFLAGS_INSTALL_EXTRA:+LDFLAGS+=${PKG_LDFLAGS_INSTALL_EXTRA}}" \ "${PKG_RANLIB_INSTALL:+RANLIB=${PKG_RANLIB_INSTALL}}" \ + "LIBTOOL=${PKG_SLIBTOOL:-slibtool}" \ ${PKG_INSTALL_TARGET_EXTRA:=install} \ DESTDIR=${PKG_PREFIX_EXTRA}; fi; @@ -107,7 +109,9 @@ pkg_install() { if [ -n "${PKG_INSTALL_FILES}" ]; then (install_files -v ${PKG_PREFIX} ${PKG_INSTALL_FILES}); fi; - pkgp_install_libs; + if [ "${PKG_NO_INSTALL_LIBS:-0}" -eq 0 ]; then + pkgp_install_libs; + fi; pkgp_install_pkgconfig; }; |