From 25deaf430979a5c4940053b452a7c6cd71ac4841 Mon Sep 17 00:00:00 2001 From: Thomas Klausner Date: Sat, 16 Feb 2019 16:48:12 +0100 Subject: [PATCH] glib2: make build progress with python3 Remove non-existent file from SUBST. Mention current error in TODO: wip/glib2/work/glib-2.58.2/output/gio/glib-compile-resources: Shared object "libgio-2.0.so.0" not found --- glib2/Makefile.common | 4 +++- glib2/TODO | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 glib2/TODO diff --git a/glib2/Makefile.common b/glib2/Makefile.common index a25feaa64e..1b9980dbfd 100644 --- a/glib2/Makefile.common +++ b/glib2/Makefile.common @@ -69,12 +69,14 @@ CONFIGURE_ARGS+= --disable-threads .include "../../mk/pthread.buildlink3.mk" .endif +pre-configure: + ${LN} -s ${PYTHONBIN} ${BUILDLINK_DIR}/bin/python3 + BUILD_DEFS+= VARBASE SUBST_CLASSES+= dbusdb SUBST_MESSAGE.dbusdb= Adjust dbus machine uuid path to dbus package SUBST_STAGE.dbusdb= pre-configure SUBST_FILES.dbusdb= gio/gdbusconnection.c SUBST_FILES.dbusdb+= gio/gdbusprivate.c -SUBST_FILES.dbusdb+= po/glib20.pot SUBST_FILES.dbusdb+= po/*.po SUBST_SED.dbusdb= -e 's,/var/lib/dbus,${VARBASE}/db/dbus,g' diff --git a/glib2/TODO b/glib2/TODO new file mode 100644 index 0000000000..fd6fef9dbc --- /dev/null +++ b/glib2/TODO @@ -0,0 +1 @@ +wip/glib2/work/glib-2.58.2/output/gio/glib-compile-resources: Shared object "libgio-2.0.so.0" not found