[gnome-apps-nightly] org.gnome.Builder: Build lxml and jedi dependencies
- From: Patrick Griffis <pgriffis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-apps-nightly] org.gnome.Builder: Build lxml and jedi dependencies
- Date: Mon, 22 Aug 2016 22:05:42 +0000 (UTC)
commit 222f03891b5c9558d098439589f45b4278aa0224
Author: Patrick Griffis <tingping tingping se>
Date: Mon Aug 22 18:03:28 2016 -0400
org.gnome.Builder: Build lxml and jedi dependencies
...getting-lib-version-when-using-pkg-config.patch | 27 ++++++++++++
org.gnome.Builder.json | 43 ++++++++++++++++++++
setuptools-makefile | 5 ++
3 files changed, 75 insertions(+), 0 deletions(-)
---
diff --git a/lxml-Fix-getting-lib-version-when-using-pkg-config.patch
b/lxml-Fix-getting-lib-version-when-using-pkg-config.patch
new file mode 100644
index 0000000..84fcbdd
--- /dev/null
+++ b/lxml-Fix-getting-lib-version-when-using-pkg-config.patch
@@ -0,0 +1,27 @@
+From d10c98f4bb5e15d5c39bf71206065c3a25754900 Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <tingping tingping se>
+Date: Mon, 22 Aug 2016 17:37:35 -0400
+Subject: [PATCH] Fix getting lib version when using pkg-config
+
+---
+ setupinfo.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/setupinfo.py b/setupinfo.py
+index ecbf961..7cb0d7b 100644
+--- a/setupinfo.py
++++ b/setupinfo.py
+@@ -360,8 +360,8 @@ def check_min_version(version, min_version, error_name):
+
+
+ def get_library_versions():
+- xml2_version = run_command(find_xml2_config(), "--version")
+- xslt_version = run_command(find_xslt_config(), "--version")
++ xml2_version = run_command(find_xml2_config(), "--modversion")
++ xslt_version = run_command(find_xslt_config(), "--modversion")
+ return xml2_version, xslt_version
+
+
+--
+2.9.3
+
diff --git a/org.gnome.Builder.json b/org.gnome.Builder.json
index dc832bb..d0b083d 100644
--- a/org.gnome.Builder.json
+++ b/org.gnome.Builder.json
@@ -31,6 +31,49 @@
"*.la", "*.a"],
"modules": [
{
+ "name": "python3-jedi",
+ "no-autogen": true,
+ "sources": [
+ {
+ "type": "archive",
+ "url": "https://pypi.python.org/packages/source/j/jedi/jedi-0.9.0.tar.gz",
+ "sha256": "3b4c19fba31bdead9ab7350fb9fa7c914c59b0a807dcdd5c00a05feb85491d31"
+ },
+ {
+ "type": "file",
+ "path": "setuptools-makefile",
+ "dest-filename": "Makefile"
+ }
+ ]
+ },
+ {
+ "name": "python3-lxml",
+ "no-autogen": true,
+ "build-options": {
+ "cflags": "-I/usr/include",
+ "env": {
+ "XSLT_CONFIG": "pkg-config libxslt",
+ "XML2_CONFIG": "pkg-config libxml-2.0"
+ }
+ },
+ "sources": [
+ {
+ "type": "archive",
+ "url": "https://pypi.io/packages/source/l/lxml/lxml-3.6.4.tar.gz",
+ "sha256": "61d5d3e00b5821e6cda099b3b4ccfea4527bf7c595e0fb3a7a760490cedd6172"
+ },
+ {
+ "type": "file",
+ "path": "setuptools-makefile",
+ "dest-filename": "Makefile"
+ },
+ {
+ "type": "patch",
+ "path": "lxml-Fix-getting-lib-version-when-using-pkg-config.patch"
+ }
+ ]
+ },
+ {
"name": "libssh2",
"cmake": true,
"config-opts": [ "-DCMAKE_INSTALL_LIBDIR:PATH=/app/lib",
diff --git a/setuptools-makefile b/setuptools-makefile
new file mode 100644
index 0000000..96c28f0
--- /dev/null
+++ b/setuptools-makefile
@@ -0,0 +1,5 @@
+all:
+ python3 ./setup.py build
+
+install:
+ python3 ./setup.py install --prefix=/app --skip-build --optimize=1
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]