From 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 14 Dec 2020 13:26:14 +0000 Subject: gentoo resync : 14.12.2020 --- sys-fabric/infinipath-psm/Manifest | 3 +- .../files/infinipath-psm-3.2-fno-common.patch | 79 ++++++++++++++++++++++ .../infinipath-psm/infinipath-psm-3.2.ebuild | 6 +- 3 files changed, 84 insertions(+), 4 deletions(-) create mode 100644 sys-fabric/infinipath-psm/files/infinipath-psm-3.2-fno-common.patch (limited to 'sys-fabric/infinipath-psm') diff --git a/sys-fabric/infinipath-psm/Manifest b/sys-fabric/infinipath-psm/Manifest index c4e477f7ec31..b9f06444ebd3 100644 --- a/sys-fabric/infinipath-psm/Manifest +++ b/sys-fabric/infinipath-psm/Manifest @@ -1,4 +1,5 @@ AUX 42-infinipath-psm.rules 85 BLAKE2B fc740e6f5399879060a6f37f4a862fc398e0163e176d8f20e5dbec6c953b6febe49afd848135966eedec7da09ebeabb0e63cb2729618ccb2822e274b39829b24 SHA512 2113118500c9dce4d1faf2a9f5da1e540be82ed6cfbe5ad5edd2927f266d77a698f628ade289716e5f992b4d5a9ad49c6b1f522a2c2a9eda087953f9a082f6fc +AUX infinipath-psm-3.2-fno-common.patch 2518 BLAKE2B 4cabe6924788235bbac230f0d5486d0ff713839dc48dd6ed673071d1f728497e0cfcd79660cac3468f43c731754947a0b4c293a7709a7cbd72ac35cfb9bca7d0 SHA512 125651c5527f0da432ab0fd3ee4fc6c866d2310ca8a2bf6f00a14056f80671f14ed4deffbec90950b23c2eeeed752c6e45103a5b225b1641ea7843d6a9757d3f DIST OFED-3.12-rc1.tgz 22055476 BLAKE2B 49e6411721392f418369a292513709f396fbb0f17001687aa15b5c0acdc91013cc67354e5978df56452178af7fbbd338a7ff408592ff9126a3045b9bb27375fe SHA512 9f834d6982ab7e8ab47a8b5c958ab2e4c238ef983e47798e7f06655f69672ea1e996297939b381f26ed8c39552f6e62156173d5ddd2f0a7b6cad6aecdd973944 -EBUILD infinipath-psm-3.2.ebuild 693 BLAKE2B c7fefbfae76c3cc5ac34536bb6f1239a632d033b5222ad9d0ca90cc20abc856fda5777285632670b614269345636ea99a30875f7c8850c3d2363078260e4d0ed SHA512 dac0b35711cf9a87cd88642d71cff3b2529e032c0a8359ec40d48745ad31be8c419feec9562152fafd164b6fafff0275cba62df070c0b17989747552a9e06c0e +EBUILD infinipath-psm-3.2.ebuild 733 BLAKE2B eed4b8311b735637a4fd5f573d71f45f9f8b0ba6ca524a10e2e695afbf7b0e6deb060c08a9e06f111ce700ad5249f1286027aedd5c52d35682c9658c28c5f145 SHA512 e71064e2e57a67f048ff753dd0116df2eaa3eb8a58210e0435fe81d8eea80aa22f34d057a16019e3de3ed30185111c43aa87845caa325f7e9bd0c5a4dbe65bfc MISC metadata.xml 253 BLAKE2B 2fbd23e1eeca2d6a1474e03aeaa1ad81f16f00141d906ca087f01b67a69e065cac2b3600c2da212ca9fdaf4765788a58ec12b6cd6a45323e5b524dbdb1ce0a77 SHA512 0894860713279dc39bbe7ce3491002710b62c4476198984a0deb6328cb0012c19d7a5546299960bbe600ee240e62a603dd4c4fa04325a753cc0b7c4044c30aba diff --git a/sys-fabric/infinipath-psm/files/infinipath-psm-3.2-fno-common.patch b/sys-fabric/infinipath-psm/files/infinipath-psm-3.2-fno-common.patch new file mode 100644 index 000000000000..7f376f009e75 --- /dev/null +++ b/sys-fabric/infinipath-psm/files/infinipath-psm-3.2-fno-common.patch @@ -0,0 +1,79 @@ +Taken From: https://build.opensuse.org/package/view_file/science:HPC:Head/infinipath-psm/Add-missing-extern-keywords.patch?expand=1 +Author: Nicolas Morey-Chaisemartin + +--- psm_error.h ++++ psm_error.h +@@ -42,7 +42,7 @@ + #define PSMI_EP_NORETURN ((psm_ep_t) -2) + #define PSMI_EP_LOGEVENT ((psm_ep_t) -3) + +-psm_ep_errhandler_t psmi_errhandler_global; ++extern psm_ep_errhandler_t psmi_errhandler_global; + + psm_error_t psmi_handle_error(psm_ep_t ep, psm_error_t error, + const char *buf, ...) +--- psm_user.h ++++ psm_user.h +@@ -100,7 +100,7 @@ psm_error_t psmi_mq_wait_internal(psm_mq_req_t *ireq); + #endif + + #ifdef PSMI_PLOCK_IS_SPINLOCK +- psmi_spinlock_t psmi_progress_lock; ++ extern psmi_spinlock_t psmi_progress_lock; + #define PSMI_PLOCK_INIT() psmi_spin_init(&psmi_progress_lock) + #define PSMI_PLOCK_TRY() psmi_spin_trylock(&psmi_progress_lock) + #define PSMI_PLOCK() psmi_spin_lock(&psmi_progress_lock) +@@ -109,8 +109,8 @@ psm_error_t psmi_mq_wait_internal(psm_mq_req_t *ireq); + #define PSMI_PUNLOCK_ASSERT() + #define PSMI_PLOCK_DISABLED 0 + #elif defined(PSMI_PLOCK_IS_MUTEXLOCK_DEBUG) +- pthread_mutex_t psmi_progress_lock; +- pthread_t psmi_progress_lock_owner; ++ extern pthread_mutex_t psmi_progress_lock; ++ extern pthread_t psmi_progress_lock_owner; + #define PSMI_PLOCK_NO_OWNER ((pthread_t)(-1)) + + PSMI_ALWAYS_INLINE( +--- psm_utils.h ++++ psm_utils.h +@@ -254,7 +254,7 @@ int psmi_diags(void); + * Fault injection + */ + struct psmi_faultinj_spec; +-int psmi_faultinj_enabled; /* use macro to test */ ++extern int psmi_faultinj_enabled; /* use macro to test */ + #if 1 /* possible to disable at compile time */ + #define PSMI_FAULTINJ_ENABLED() (!!psmi_faultinj_enabled) + #else +--- ptl_am/ptl_fwd.h ++++ ptl_am/ptl_fwd.h +@@ -47,7 +47,7 @@ + #endif + + /* Symbol in am ptl */ +-struct ptl_ctl_init psmi_ptl_amsh; ++extern struct ptl_ctl_init psmi_ptl_amsh; + + /* Special non-ptl function exposed to pre-attach to shm segment */ + psm_error_t psmi_shm_attach(psm_ep_t ep, int *shmidx_o); +--- ptl_ips/ptl_fwd.h ++++ ptl_ips/ptl_fwd.h +@@ -38,5 +38,5 @@ + typedef struct ptl_epaddr ips_epaddr_t; + + /* Symbol in ips ptl */ +-struct ptl_ctl_init psmi_ptl_ips; ++extern struct ptl_ctl_init psmi_ptl_ips; + #endif /* _PTL_FWD_IPS_H */ +--- ptl_self/ptl_fwd.h ++++ ptl_self/ptl_fwd.h +@@ -35,7 +35,7 @@ + #define _PTL_FWD_SELF_H + + /* Symbol in am ptl */ +-struct ptl_ctl_init psmi_ptl_self; ++extern struct ptl_ctl_init psmi_ptl_self; + + #endif + + diff --git a/sys-fabric/infinipath-psm/infinipath-psm-3.2.ebuild b/sys-fabric/infinipath-psm/infinipath-psm-3.2.ebuild index 0654f6526906..3df69cc34f9d 100644 --- a/sys-fabric/infinipath-psm/infinipath-psm-3.2.ebuild +++ b/sys-fabric/infinipath-psm/infinipath-psm-3.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -10,11 +10,10 @@ OFED_SUFFIX="2_ga8c3e3e_open" OFED_SNAPSHOT="1" OFED_SRC_SNAPSHOT="1" -inherit openib udev +inherit epatch openib udev DESCRIPTION="OpenIB userspace driver for the PathScale InfiniBand HCAs" KEYWORDS="amd64 ~x86 ~amd64-linux" -IUSE="" RDEPEND="sys-fabric/libibverbs:${SLOT}" DEPEND="${RDEPEND} @@ -26,6 +25,7 @@ src_prepare() { sed -e 's:uname -p:uname -m:g' \ -e 's:-Werror::g' \ -i buildflags.mak || die + epatch "${FILESDIR}"/${P}-fno-common.patch } src_install() { -- cgit v1.2.3