2709f948fa
This PR corrects a problem with the opa-psm2 package. It was installing headers into <prefix>/usr/include and libraries into <prefix>/usr/lib instead of <prefix>/include and <prefix>/lib. The extra level of usr/ subdirectories causes dependent packages like libfabric to fail to build.
79 lines
4.5 KiB
Diff
79 lines
4.5 KiB
Diff
diff -Naupr opa-psm2-PSM2_11.2.68/Makefile opa-psm2-PSM2_11.2.68-pathfix/Makefile
|
|
--- opa-psm2-PSM2_11.2.68/Makefile 2018-09-27 19:48:03.000000000 -0400
|
|
+++ opa-psm2-PSM2_11.2.68-pathfix/Makefile 2019-06-07 11:34:37.658270976 -0400
|
|
@@ -135,9 +135,9 @@ endif
|
|
|
|
ifndef LIBDIR
|
|
ifeq (${arch},x86_64)
|
|
- INSTALL_LIB_TARG=/usr/lib64
|
|
+ INSTALL_LIB_TARG=/lib64
|
|
else
|
|
- INSTALL_LIB_TARG=/usr/lib
|
|
+ INSTALL_LIB_TARG=/lib
|
|
endif
|
|
else
|
|
INSTALL_LIB_TARG=${LIBDIR}
|
|
@@ -177,7 +177,7 @@ UDEV_40_PSM_RULES := %{_udevrulesdir}/40
|
|
|
|
ifeq (fedora,$(DISTRO))
|
|
# On Fedora, we change these two variables to these values:
|
|
- LIBPSM2_COMPAT_CONF_DIR := /usr/lib
|
|
+ LIBPSM2_COMPAT_CONF_DIR := /lib
|
|
LIBPSM2_COMPAT_SYM_CONF_DIR := %{_prefix}/lib
|
|
SPEC_FILE_RELEASE_DIST := %{?dist}
|
|
UDEV_40_PSM_RULES :=#
|
|
@@ -411,20 +411,20 @@ install: all
|
|
ln -sf ${TARGLIB}.so.${MAJOR} ${TARGLIB}.so)
|
|
install -D $(OUTDIR)/${TARGLIB}.a \
|
|
${DESTDIR}${INSTALL_LIB_TARG}/${TARGLIB}.a
|
|
- install -m 0644 -D psm2.h ${DESTDIR}/usr/include/psm2.h
|
|
- install -m 0644 -D psm2_mq.h ${DESTDIR}/usr/include/psm2_mq.h
|
|
- install -m 0644 -D psm2_am.h ${DESTDIR}/usr/include/psm2_am.h
|
|
+ install -m 0644 -D psm2.h ${DESTDIR}/include/psm2.h
|
|
+ install -m 0644 -D psm2_mq.h ${DESTDIR}/include/psm2_mq.h
|
|
+ install -m 0644 -D psm2_am.h ${DESTDIR}/include/psm2_am.h
|
|
ifneq (fedora,${DISTRO})
|
|
install -m 0644 -D 40-psm.rules ${DESTDIR}$(UDEVDIR)/rules.d/40-psm.rules
|
|
endif
|
|
# The following files and dirs were part of the noship rpm:
|
|
- mkdir -p ${DESTDIR}/usr/include/hfi1diag
|
|
- mkdir -p ${DESTDIR}/usr/include/hfi1diag/linux-x86_64
|
|
- install -m 0644 -D include/linux-x86_64/bit_ops.h ${DESTDIR}/usr/include/hfi1diag/linux-x86_64/bit_ops.h
|
|
- install -m 0644 -D include/linux-x86_64/sysdep.h ${DESTDIR}/usr/include/hfi1diag/linux-x86_64/sysdep.h
|
|
- install -m 0644 -D include/opa_udebug.h ${DESTDIR}/usr/include/hfi1diag/opa_udebug.h
|
|
- install -m 0644 -D include/opa_debug.h ${DESTDIR}/usr/include/hfi1diag/opa_debug.h
|
|
- install -m 0644 -D include/opa_intf.h ${DESTDIR}/usr/include/hfi1diag/opa_intf.h
|
|
+ mkdir -p ${DESTDIR}/include/hfi1diag
|
|
+ mkdir -p ${DESTDIR}/include/hfi1diag/linux-x86_64
|
|
+ install -m 0644 -D include/linux-x86_64/bit_ops.h ${DESTDIR}/include/hfi1diag/linux-x86_64/bit_ops.h
|
|
+ install -m 0644 -D include/linux-x86_64/sysdep.h ${DESTDIR}/include/hfi1diag/linux-x86_64/sysdep.h
|
|
+ install -m 0644 -D include/opa_udebug.h ${DESTDIR}/include/hfi1diag/opa_udebug.h
|
|
+ install -m 0644 -D include/opa_debug.h ${DESTDIR}/include/hfi1diag/opa_debug.h
|
|
+ install -m 0644 -D include/opa_intf.h ${DESTDIR}/include/hfi1diag/opa_intf.h
|
|
for h in opa_user_gen1.h opa_service_gen1.h opa_common_gen1.h ; do \
|
|
sed -e 's/#include "opa_user_gen1.h"/#include "opa_user.h"/' \
|
|
-e 's/#include "opa_common_gen1.h"/#include "opa_common.h"/' \
|
|
@@ -434,14 +434,14 @@ endif
|
|
done
|
|
cat include/opa_user.h $(TEMP_INST_DIR)/opa_user_gen1.h > $(TEMP_INST_DIR)/opa_user.h
|
|
cat include/opa_service.h $(TEMP_INST_DIR)/opa_service_gen1.h > $(TEMP_INST_DIR)/opa_service.h
|
|
- install -m 0644 -D $(TEMP_INST_DIR)/opa_user.h ${DESTDIR}/usr/include/hfi1diag/opa_user.h
|
|
- install -m 0644 -D $(TEMP_INST_DIR)/opa_service.h ${DESTDIR}/usr/include/hfi1diag/opa_service.h
|
|
- install -m 0644 -D $(TEMP_INST_DIR)/opa_common_gen1.h ${DESTDIR}/usr/include/hfi1diag/opa_common.h
|
|
- install -m 0644 -D include/opa_byteorder.h ${DESTDIR}/usr/include/hfi1diag/opa_byteorder.h
|
|
- install -m 0644 -D include/psm2_mock_testing.h ${DESTDIR}/usr/include/hfi1diag/psm2_mock_testing.h
|
|
- install -m 0644 -D include/opa_revision.h ${DESTDIR}/usr/include/hfi1diag/opa_revision.h
|
|
- install -m 0644 -D psmi_wrappers.h ${DESTDIR}/usr/include/hfi1diag/psmi_wrappers.h
|
|
- install -m 0644 -D psm_hal_gen1/hfi1_deprecated_gen1.h ${DESTDIR}/usr/include/hfi1diag/hfi1_deprecated.h
|
|
+ install -m 0644 -D $(TEMP_INST_DIR)/opa_user.h ${DESTDIR}/include/hfi1diag/opa_user.h
|
|
+ install -m 0644 -D $(TEMP_INST_DIR)/opa_service.h ${DESTDIR}/include/hfi1diag/opa_service.h
|
|
+ install -m 0644 -D $(TEMP_INST_DIR)/opa_common_gen1.h ${DESTDIR}/include/hfi1diag/opa_common.h
|
|
+ install -m 0644 -D include/opa_byteorder.h ${DESTDIR}/include/hfi1diag/opa_byteorder.h
|
|
+ install -m 0644 -D include/psm2_mock_testing.h ${DESTDIR}/include/hfi1diag/psm2_mock_testing.h
|
|
+ install -m 0644 -D include/opa_revision.h ${DESTDIR}/include/hfi1diag/opa_revision.h
|
|
+ install -m 0644 -D psmi_wrappers.h ${DESTDIR}/include/hfi1diag/psmi_wrappers.h
|
|
+ install -m 0644 -D psm_hal_gen1/hfi1_deprecated_gen1.h ${DESTDIR}/include/hfi1diag/hfi1_deprecated.h
|
|
rm -fr $(TEMP_INST_DIR)
|
|
|
|
specfile: specfile_clean | $(OUTDIR)
|