From: "Alexis Ballier" <aballier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ros/xmlrpcpp/
Date: Fri, 27 Nov 2015 12:12:44 +0000 (UTC) [thread overview]
Message-ID: <1448626360.529847e3ea7c318cd6cae006688dfdc61c222815.aballier@gentoo> (raw)
commit: 529847e3ea7c318cd6cae006688dfdc61c222815
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 27 12:12:30 2015 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 12:12:40 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=529847e3
dev-ros/xmlrpcpp: Include -I Cflags to the .pc file since we move headers around. Bug #566200.
Package-Manager: portage-2.2.26
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
.../{xmlrpcpp-1.11.16.ebuild => xmlrpcpp-1.11.16-r1.ebuild} | 6 ++++++
dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild | 6 ++++++
2 files changed, 12 insertions(+)
diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-1.11.16.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-1.11.16-r1.ebuild
similarity index 69%
rename from dev-ros/xmlrpcpp/xmlrpcpp-1.11.16.ebuild
rename to dev-ros/xmlrpcpp/xmlrpcpp-1.11.16-r1.ebuild
index 806b8bc..c2699ae 100644
--- a/dev-ros/xmlrpcpp/xmlrpcpp-1.11.16.ebuild
+++ b/dev-ros/xmlrpcpp/xmlrpcpp-1.11.16-r1.ebuild
@@ -24,4 +24,10 @@ src_configure() {
# Hack so that proper -I are added
sed -e "s#_include_dirs \"include\"#_include_dirs \"include;${EPREFIX}/usr/include/xmlrpcpp\"#" \
-i "${BUILD_DIR}/catkin_generated/installspace/xmlrpcppConfig.cmake" || die
+
+ sed -e "s#/usr/include#/usr/include;${EPREFIX}/usr/include/xmlrpcpp#g" \
+ -i "${BUILD_DIR}/catkin_generated/pkg.installspace.context.pc.py" || die
+
+ sed -e "s#/usr/include#/usr/include -I${EPREFIX}/usr/include/xmlrpcpp#g" \
+ -i "${BUILD_DIR}/./catkin_generated/installspace/xmlrpcpp.pc" || die
}
diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild
index 806b8bc..c2699ae 100644
--- a/dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild
+++ b/dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild
@@ -24,4 +24,10 @@ src_configure() {
# Hack so that proper -I are added
sed -e "s#_include_dirs \"include\"#_include_dirs \"include;${EPREFIX}/usr/include/xmlrpcpp\"#" \
-i "${BUILD_DIR}/catkin_generated/installspace/xmlrpcppConfig.cmake" || die
+
+ sed -e "s#/usr/include#/usr/include;${EPREFIX}/usr/include/xmlrpcpp#g" \
+ -i "${BUILD_DIR}/catkin_generated/pkg.installspace.context.pc.py" || die
+
+ sed -e "s#/usr/include#/usr/include -I${EPREFIX}/usr/include/xmlrpcpp#g" \
+ -i "${BUILD_DIR}/./catkin_generated/installspace/xmlrpcpp.pc" || die
}
next reply other threads:[~2015-11-27 12:12 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-27 12:12 Alexis Ballier [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-07-30 9:48 [gentoo-commits] repo/gentoo:master commit in: dev-ros/xmlrpcpp/ David Seifert
2020-07-31 10:34 Alexis Ballier
2020-07-31 10:34 Alexis Ballier
2020-05-18 16:35 Alexis Ballier
2020-05-18 16:35 Alexis Ballier
2018-07-31 15:21 Alexis Ballier
2015-11-14 11:39 Alexis Ballier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1448626360.529847e3ea7c318cd6cae006688dfdc61c222815.aballier@gentoo \
--to=aballier@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox