summaryrefslogtreecommitdiffhomepage
path: root/vars
diff options
context:
space:
mode:
authorLucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de>2017-11-28 10:07:53 +0000
committerLucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de>2017-11-28 10:16:15 +0000
commitcaed76f7988989d6cef19e8902262ffeb98e8246 (patch)
tree1875f43b506499c25026cfa12bbba0cc59bb02a6 /vars
parent64cbaf56f14518ebd10bda62964706dac289ebdc (diff)
downloadmidipix_build-caed76f7988989d6cef19e8902262ffeb98e8246.tar.bz2
midipix_build-caed76f7988989d6cef19e8902262ffeb98e8246.tar.xz
patches/gtk2-2.24.31.local.patch:configure: always use ${PKG_CONFIG}.
vars/gdk.vars: patch incorrectly missing gio-2.0 (glib) dependency into .pc file. vars/glib.vars:pkg_glib_install_pkgconfig_post(): fix library order.
Diffstat (limited to 'vars')
-rw-r--r--vars/gdk.vars13
-rw-r--r--vars/glib.vars2
2 files changed, 14 insertions, 1 deletions
diff --git a/vars/gdk.vars b/vars/gdk.vars
new file mode 100644
index 00000000..16d03deb
--- /dev/null
+++ b/vars/gdk.vars
@@ -0,0 +1,13 @@
+#
+# set -o errexit -o noglob are assumed.
+#
+
+pkg_gdk_install_pkgconfig_post() {
+ local _pc_path;
+ for _pc_path in $(find "${PKG_DESTDIR}"/lib/pkgconfig -name \*.pc); do
+ sed -i"" -e '/^Requires:\s\+gobject-2.0$/s/^.*$/& gio-2.0/' \
+ "${_pc_path}";
+ done;
+};
+
+# vim:filetype=sh
diff --git a/vars/glib.vars b/vars/glib.vars
index 86de74ee..fea598c4 100644
--- a/vars/glib.vars
+++ b/vars/glib.vars
@@ -5,7 +5,7 @@
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/' \
+ sed -i"" -e '/^Libs:/s/^\(Libs:\s\+-L\${libdir}\)\s\+\(.\+\)$/\1 \2 -lffi -lpcre -lz/' \
"${_pc_path}";
done;
};