diff options
author | Michael Mair-Keimberger (asterix) <m.mairkeimberger@gmail.com> | 2017-08-16 11:14:47 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-08-16 18:23:56 +0200 |
commit | c6477b6a9bfb729347bbbffe8a00f822dd40fc5a (patch) | |
tree | b4ec8b0319331b4e17bd8a63f7ca57017afbfedd /dev-libs/libixion | |
parent | app-text/liblangtag: remove unused patch (diff) | |
download | gentoo-c6477b6a9bfb729347bbbffe8a00f822dd40fc5a.tar.gz gentoo-c6477b6a9bfb729347bbbffe8a00f822dd40fc5a.tar.bz2 gentoo-c6477b6a9bfb729347bbbffe8a00f822dd40fc5a.zip |
dev-libs/libixion: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/5439
Diffstat (limited to 'dev-libs/libixion')
-rw-r--r-- | dev-libs/libixion/files/libixion-0.9.1-python-optional.patch | 64 | ||||
-rw-r--r-- | dev-libs/libixion/files/libixion-0.9.1-typo.patch | 18 |
2 files changed, 0 insertions, 82 deletions
diff --git a/dev-libs/libixion/files/libixion-0.9.1-python-optional.patch b/dev-libs/libixion/files/libixion-0.9.1-python-optional.patch deleted file mode 100644 index 632fa07e0f6e..000000000000 --- a/dev-libs/libixion/files/libixion-0.9.1-python-optional.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- a/configure.ac 2016-02-06 17:08:05.505990463 +0100 -+++ b/configure.ac 2016-02-06 17:08:42.316530268 +0100 -@@ -15,18 +15,22 @@ - 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, - [ - --with-hash-container-compat use std::hash_foo instead of boost::unordered_foo - ], - ,with_hash_container_compat=no) - - 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])], -+ [enable_python="$enableval"], -+ [enable_python=yes] -+) - - IXION_API_VERSION=ixion_api_version - IXION_MAJOR_VERSION=ixion_major_version -@@ -70,7 +74,11 @@ - 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([BUILD_PYTHON], [test "x$enable_python" != "xno"]) - - CPPFLAGS="$CPPFLAGS -g -Os -fvisibility=hidden" - -@@ -101,3 +109,10 @@ - src/libixion/constants.inl - src/python/Makefile]) - AC_OUTPUT -+ -+AC_MSG_NOTICE([ -+============================================================================== -+Build configuration: -+ python: $enable_python -+============================================================================== -+]) ---- a/src/python/Makefile.am 2016-02-06 17:08:12.138907540 +0100 -+++ b/src/python/Makefile.am 2016-02-06 17:08:38.034583800 +0100 -@@ -1,3 +1,5 @@ -+if BUILD_PYTHON -+ - pyexec_LTLIBRARIES = ixion.la - ixion_la_SOURCES = \ - document.hpp \ -@@ -16,3 +18,5 @@ - - AM_TESTS_ENVIRONMENT = PYTHONPATH=.libs$${PYTHONPATH:+:$${PYTHONPATH}}; export PYTHONPATH; - TESTS = ../../test/ixion-python-test.py -+ -+endif diff --git a/dev-libs/libixion/files/libixion-0.9.1-typo.patch b/dev-libs/libixion/files/libixion-0.9.1-typo.patch deleted file mode 100644 index 7e41f7bb752f..000000000000 --- a/dev-libs/libixion/files/libixion-0.9.1-typo.patch +++ /dev/null @@ -1,18 +0,0 @@ -commit ceddf45ed98dd0b65b510a284d373630c7642587 -Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -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-@IXION_API_VERSION@.la \ - $(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 |