Skip to content

Fix build on CentOS 6 w/ xmlsec1-1.2.19-3#76

Merged
bgaifullin merged 1 commit intoxmlsec:masterfrom
mintel:XMLSEC_CRYPTO-quotes
Jun 29, 2018
Merged

Fix build on CentOS 6 w/ xmlsec1-1.2.19-3#76
bgaifullin merged 1 commit intoxmlsec:masterfrom
mintel:XMLSEC_CRYPTO-quotes

Conversation

@jtdoepke
Copy link
Contributor

@jtdoepke jtdoepke commented Feb 6, 2018

pkgconfig doesn't parse the XMLSEC_CRYPTO macro value correctly from xmlsec1-1.2.19-3 on CentOS 6: it comes already wrapped in quotes "openssl", then xmlsec_setupinfo.py wraps it again ""openssl"". So the gcc command ends up looking something like this:

gcc -DXMLSEC_CRYPTO=""openssl""  # ... other args ...

Which causes a syntax error when compiling main.c:

    /var/tmp/pip-qg0cd5lq-build/src/main.c: In function ‘PyXmlSec_Init’:
    /var/tmp/pip-qg0cd5lq-build/src/main.c:56: error: expected ‘,’ or ‘;’ before ‘openssl’
    error: command 'gcc' failed with exit status 1

The Changelog for the xmlsec1 RPM suggests there's been some bugs with pkg-config that were fixed in later versions.

2014-05-28 - Simo Sorce <[email protected]> - 1.2.20-2
- Update pkg-config fix patch to apply w/o fuzz

...

2014-05-23 - Simo Sorce <[email protected]> - 1.2.19-6
- Fix incomplete patch

2014-05-23 - Simo Sorce <[email protected]> - 1.2.19-5
- Add patch to deal with different behavior of pkg-config in RHEL6

This change just checks if XMLSEC_CRYPTO is already wrapped in quotes.

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 <[email protected]> - 1.2.20-2
- Update pkg-config fix patch to apply w/o fuzz

...

2014-05-23 - Simo Sorce <[email protected]> - 1.2.19-6
- Fix incomplete patch

2014-05-23 - Simo Sorce <[email protected]> - 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.
@bgaifullin
Copy link
Collaborator

Thanks for PR.

@bgaifullin bgaifullin merged commit 876b300 into xmlsec:master Jun 29, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants