From 2de15984ee7590bb0a1b5a17f9e1b7b509d0bee4 Mon Sep 17 00:00:00 2001 From: Jaye Doepke Date: Tue, 6 Feb 2018 11:23:50 -0600 Subject: [PATCH] Fix build on CentOS 6 w/ xmlsec1-1.2.19-3 pkgconfig doesn't parse the XMLSEC_CRYPTO macro value correctly from xmlsec1-1.2.19-3 on CentOS 6 (the Changelog for [that RPM](https://centos.pkgs.org/6/centos-x86_64/xmlsec1-1.2.20-4.el6.x86_64.rpm.html) suggests there's been some bugs). ``` 2014-05-28 - Simo Sorce - 1.2.20-2 - Update pkg-config fix patch to apply w/o fuzz ... 2014-05-23 - Simo Sorce - 1.2.19-6 - Fix incomplete patch 2014-05-23 - Simo Sorce - 1.2.19-5 - Add patch to deal with different behavior of pkg-config in RHEL6 ``` This change fixes the build for xmlsec1-1.2.19-3. --- xmlsec_setupinfo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmlsec_setupinfo.py b/xmlsec_setupinfo.py index b4b5a817..829b4665 100644 --- a/xmlsec_setupinfo.py +++ b/xmlsec_setupinfo.py @@ -174,7 +174,7 @@ def load_xmlsec1_config(): # fix macros, ensure that macros is list macros = list(config.get('define_macros', [])) for i, v in enumerate(macros): - if v[0] == 'XMLSEC_CRYPTO': + if v[0] == 'XMLSEC_CRYPTO' and not (v[1].startswith('"') and v[1].endswith('"')): macros[i] = ('XMLSEC_CRYPTO', '"{0}"'.format(v[1])) break config['define_macros'] = macros