diff options
| author | Lucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de> | 2017-11-21 22:00:55 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de> | 2017-11-21 22:00:55 +0000 |
| commit | e8b3b5447ccd38768d07a107e468d229348faa2a (patch) | |
| tree | 11f562fe4875445e057fcf103b267edd2867dc30 | |
| parent | 5603e7b6ce4f5ad1064913b35bd2cb5d1e0358d7 (diff) | |
| download | midipix_build-e8b3b5447ccd38768d07a107e468d229348faa2a.tar.bz2 midipix_build-e8b3b5447ccd38768d07a107e468d229348faa2a.tar.xz | |
vars/glib{,_host}.vars: force -l{ffi,pcre,z} into pkg-config(1) files.
subr/pkg_install_pkgconfig.subr: explicitly pass -i"" to sed(1).
| -rw-r--r-- | subr/pkg_install_pkgconfig.subr | 2 | ||||
| -rw-r--r-- | vars/glib.vars | 17 | ||||
| l--------- | vars/glib_host.vars | 1 |
3 files changed, 19 insertions, 1 deletions
diff --git a/subr/pkg_install_pkgconfig.subr b/subr/pkg_install_pkgconfig.subr index 43c0d601..432c1d6e 100644 --- a/subr/pkg_install_pkgconfig.subr +++ b/subr/pkg_install_pkgconfig.subr @@ -6,7 +6,7 @@ pkg_install_pkgconfig() { local _pc_path; for _pc_path in $(find "${PKG_DESTDIR}" -name \*.pc); do if grep -Eq '^libdir=[^$]+$' "${_pc_path}"; then - sed -i -e '/^libdir=[^$]\+$/s/^libdir=\(.\+\)$/libdir=${exec_prefix}\1/' \ + sed -i"" -e '/^libdir=[^$]\+$/s/^libdir=\(.\+\)$/libdir=${exec_prefix}\1/' \ -e '/^exec_prefix=$/s/^.*$/exec_prefix=${prefix}/' \ "${_pc_path}"; fi; diff --git a/vars/glib.vars b/vars/glib.vars new file mode 100644 index 00000000..86de74ee --- /dev/null +++ b/vars/glib.vars @@ -0,0 +1,17 @@ +# +# set -o errexit -o noglob are assumed. +# + +pkg_glib_install_pkgconfig_post() { + local _pc_path; + for _pc_path in $(find "${PKG_DESTDIR}"/lib/pkgconfig -name \*.pc); do + sed -i"" -e '/^Libs:\s/s/-L\${libdir}/& -lffi -lpcre -lz/' \ + "${_pc_path}"; + done; +}; + +pkg_glib_host_install_pkgconfig_post() { + pkg_glib_install_pkgconfig_post; +}; + +# vim:filetype=sh diff --git a/vars/glib_host.vars b/vars/glib_host.vars new file mode 120000 index 00000000..e3369ea4 --- /dev/null +++ b/vars/glib_host.vars @@ -0,0 +1 @@ +glib.vars
\ No newline at end of file |