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
}