From d7aecc644a4ddf83da28b73132b306e6164ec938 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 18 Jan 2017 19:55:17 +0100 Subject: [PATCH] build: make the doc generator find the right libnm.so At some point gobject-introspection added an API to add a library path and stopped honoring the LD_LIBRARY_PATH (a bug, according to GI documentation?). (cherry picked from commit 6c96aafaa9a61ca4fe713551a4cd4b15fb7e8a63) (cherry picked from commit 2ee84627746e04cb63e506cf1a8cbdb8a24c3a75) (cherry picked from commit bc2e0269a44cc20895f4296280776258b59451fa) --- libnm/generate-setting-docs.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/libnm/generate-setting-docs.py b/libnm/generate-setting-docs.py index 8265bccd10..9362d71c88 100755 --- a/libnm/generate-setting-docs.py +++ b/libnm/generate-setting-docs.py @@ -18,12 +18,24 @@ from __future__ import print_function +import os import gi -gi.require_version('NM', '1.0') -from gi.repository import NM, GObject +gi.require_version('GIRepository', '2.0') +from gi.repository import GIRepository import argparse, datetime, re, sys import xml.etree.ElementTree as ET +try: + libs = os.environ['LD_LIBRARY_PATH'].split(':') + libs.reverse() + for lib in libs: + GIRepository.Repository.prepend_library_path(lib) +except KeyError: + pass + +gi.require_version('NM', '1.0') +from gi.repository import NM, GObject + dbus_type_name_map = { 'b': 'boolean', 's': 'string',