commit:     80d29e9c5330d6cecdf0225e564a94427610b702
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 11 07:44:41 2022 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Mon Apr 11 07:46:47 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80d29e9c

dev-libs/xmlrpc: fix multilib builds

Previosly broken by commit c96c1ecd22c1fda96cb02bed3e33d7643e383996

Reported-by: Michael Cook <mackal.cook <AT> gmail.com>
Closes: https://bugs.gentoo.org/837539
Bug: https://bugs.gentoo.org/836469
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Sergey Popov <pinkbyte <AT> gentoo.org>

 dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r2.ebuild | 8 ++++++--
 dev-libs/xmlrpc-c/xmlrpc-c-1.54.05.ebuild    | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r2.ebuild 
b/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r2.ebuild
index 54cf9c58c907..283f805275ca 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r2.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r2.ebuild
@@ -64,12 +64,16 @@ multilib_src_configure() {
 
 multilib_src_compile() {
        default_src_compile
-       # Needed for tests, bug #836469
-       cp "${BUILD_DIR}"/include/xmlrpc-c/config.h "${S}"/include/xmlrpc-c || 
die
        # Tools building is broken in this release
        #multilib_is_native_abi && use tools && emake -rC "${S}"/tools
 }
 
+multilib_src_test() {
+       # Needed for tests, bug #836469
+       cp "${BUILD_DIR}"/include/xmlrpc-c/config.h "${S}"/include/xmlrpc-c || 
die
+       default_src_test
+}
+
 #multilib_src_install_all() {
 #      # Tools building is broken in this release
 #      #use tools && emake DESTDIR="${D}" -rC "${S}"/tools install

diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05.ebuild 
b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05.ebuild
index 05c4799f8bdf..d6b2720a168b 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05.ebuild
@@ -64,12 +64,16 @@ multilib_src_configure() {
 
 multilib_src_compile() {
        default_src_compile
-       # Needed for tests, bug #836469
-       cp "${BUILD_DIR}"/include/xmlrpc-c/config.h "${S}"/include/xmlrpc-c || 
die
        # Tools building is broken in this release
        #multilib_is_native_abi && use tools && emake -rC "${S}"/tools
 }
 
+multilib_src_test() {
+       # Needed for tests, bug #836469
+       cp "${BUILD_DIR}"/include/xmlrpc-c/config.h "${S}"/include/xmlrpc-c || 
die
+       default_src_test
+}
+
 #multilib_src_install_all() {
 #      # Tools building is broken in this release
 #      #use tools && emake DESTDIR="${D}" -rC "${S}"/tools install

Reply via email to