dilfridge 15/06/21 15:35:49
Added: libixion-0.9.1-typo.patch
libixion-0.9.1-python-optional.patch
Log:
Version bump; make python support optional
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key
0B08240A96F66571)
Revision Changes Path
1.1 dev-libs/libixion/files/libixion-0.9.1-typo.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libixion/files/libixion-0.9.1-typo.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libixion/files/libixion-0.9.1-typo.patch?rev=1.1&content-type=text/plain
Index: libixion-0.9.1-typo.patch
===================================================================
commit ceddf45ed98dd0b65b510a284d373630c7642587
Author: Andreas Sturmlechner <[email protected]>
Date: Sun May 31 11:55:08 2015 +0200
src/Makefile.am: Fix typo
diff --git a/src/Makefile.am b/src/Makefile.am
index ee9a1cc..b28c610 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,6 +28,6 @@ ixion_sorter_SOURCES = \
ixion_sorter_LDADD = libixion/libixion-@[email protected] \
$(BOOST_THREAD_LIBS)
$(BOOST_PROGRAM_OPTIONS_LIBS)
-AM_TESTS_ENVIRONMENT = PATH=.libs$${PATH:+:$${PATH}}; epxort PATH; \
+AM_TESTS_ENVIRONMENT = PATH=.libs$${PATH:+:$${PATH}}; export PATH; \
LD_LIBRARY_PATH=libixion/.libs$${LD_LIBRARY_PATH:+:$${LD_LIBRARY_PATH}}; export
LD_LIBRARY_PATH;
TESTS = ../test/ixion-parser-test.sh
1.1
dev-libs/libixion/files/libixion-0.9.1-python-optional.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libixion/files/libixion-0.9.1-python-optional.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libixion/files/libixion-0.9.1-python-optional.patch?rev=1.1&content-type=text/plain
Index: libixion-0.9.1-python-optional.patch
===================================================================
commit 59c360c9fe438a2805d65decc6c7889bc99a7747
Author: Andreas Sturmlechner <[email protected]>
Date: Sun May 31 10:14:17 2015 +0200
python: Make it optional
python bindings are built unless disabled
diff --git a/configure.ac b/configure.ac
index 03f6120..1c7d8b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,6 @@ AC_PREREQ([2.63])
AC_INIT([libixion], [ixion_version])
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([1.11 foreign dist-bzip2 dist-xz])
-AM_PATH_PYTHON(2.7.0)
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_ARG_WITH(hash-container-compat,
@@ -28,6 +27,9 @@ AC_ARG_WITH(mdds-include-path,
AS_HELP_STRING([--with-mdds-include-path], [specify include path for mdds
headers.])
,)
+AC_ARG_ENABLE([python],
+ AS_HELP_STRING([--disable-python], [Disable python bindings]))
+
IXION_API_VERSION=ixion_api_version
IXION_MAJOR_VERSION=ixion_major_version
IXION_MINOR_VERSION=ixion_minor_version
@@ -82,7 +84,11 @@ fi
PKG_CHECK_MODULES([MDDS],[mdds >= 0.12.0])
# Check for python.
-PKG_CHECK_MODULES([PYTHON], [python >= 0.27.1])
+AS_IF([test "x$enable_python" != "xno"], [
+ AM_PATH_PYTHON(2.7.0)
+ PKG_CHECK_MODULES([PYTHON], [python >= 0.27.1])
+])
+AM_CONDITIONAL([PYTHON], [test "x$enable_python" != "xno"])
CPPFLAGS="$CPPFLAGS -g -Os -fvisibility=hidden"
diff --git a/src/Makefile.am b/src/Makefile.am
index 6e138a4..cd912ab 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,7 @@
-SUBDIRS = libixion python
+SUBDIRS = libixion
+if PYTHON
+ SUBDIRS += python
+endif
AM_CPPFLAGS = -I$(top_srcdir)/include $(MDDS_CFLAGS)
