rpm/opa-ff
SHA256
1
0
Fork 0
forked from pool/opa-ff
Code Pull Requests Activity
41fdd3242d
opa-ff/opa-ff-suse-build-fixes.patch

63 lines
2.8 KiB
Diff
Raw Normal View History

Accepting request 617425 from home:NMoreyChaisemartin:branches:science:HPC - Update to v10.7.0.0.133 (fate#325049) * No changelog available - Rebase opa-ff-suse-build-fixes.patch to the latest sources - Update opa-ff-add-shebang-for-exp-files.patchto not use /usr/bin/env OBS-URL: https://build.opensuse.org/request/show/617425 OBS-URL: https://build.opensuse.org/package/show/science:HPC/opa-ff?expand=0&rev=43
2018-06-18 09:35:07 +02:00
commit eea4f1409968d74e218f5d9390141516830d0283
Accepting request 543959 from home:NMoreyChaisemartin:branches:science:HPC - Update to v10.6.0.0.131 * No changelog available - Remove opa-ff-sigset-was-removed.patch as it was fixed upstream. - Rebase opa-ff-suse-build-fixes.patch and opa-ff-add-shebang-for-exp-files.patch to the latest sources OBS-URL: https://build.opensuse.org/request/show/543959 OBS-URL: https://build.opensuse.org/package/show/science:HPC/opa-ff?expand=0&rev=34
2017-11-21 09:56:27 +01:00
Author: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
Date: Thu Jun 8 11:11:01 2017 +0200
opa-ff suse build fixes
Signed-off-by: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
Accepting request 501879 from home:NMoreyChaisemartin:branches:science:HPC - Update to v10.4.0.0.197 * No changelog available - Update opa-ff_fix_suse_build_issue.patch and 0001-Add-shebang-for-exp-files.patch to new sources OBS-URL: https://build.opensuse.org/request/show/501879 OBS-URL: https://build.opensuse.org/package/show/science:HPC/opa-ff?expand=0&rev=22
2017-06-08 13:26:38 +02:00
diff --git Makerules/Defs.Flags Makerules/Defs.Flags
Accepting request 617425 from home:NMoreyChaisemartin:branches:science:HPC - Update to v10.7.0.0.133 (fate#325049) * No changelog available - Rebase opa-ff-suse-build-fixes.patch to the latest sources - Update opa-ff-add-shebang-for-exp-files.patchto not use /usr/bin/env OBS-URL: https://build.opensuse.org/request/show/617425 OBS-URL: https://build.opensuse.org/package/show/science:HPC/opa-ff?expand=0&rev=43
2018-06-18 09:35:07 +02:00
index 8caba534bd95..91764cac6fe7 100755
Accepting request 501879 from home:NMoreyChaisemartin:branches:science:HPC - Update to v10.4.0.0.197 * No changelog available - Update opa-ff_fix_suse_build_issue.patch and 0001-Add-shebang-for-exp-files.patch to new sources OBS-URL: https://build.opensuse.org/request/show/501879 OBS-URL: https://build.opensuse.org/package/show/science:HPC/opa-ff?expand=0&rev=22
2017-06-08 13:26:38 +02:00
--- Makerules/Defs.Flags
+++ Makerules/Defs.Flags
Accepting request 436354 from SUSE:SLE-12-SP2:GA OBS-URL: https://build.opensuse.org/request/show/436354 OBS-URL: https://build.opensuse.org/package/show/science:HPC/opa-ff?expand=0&rev=1
2016-10-19 16:33:55 +02:00
@@ -53,8 +53,8 @@ CCDEPENDFLAGS = $(CCFLAGS) $(DEPENDENV) $(DEPENDPROJ) $(DEPENDMOD) $(DEPENDLOCA
CINCLUDE_DIRS = $(LOCAL_INCLUDE_DIRS) $(MOD_INCLUDE_DIRS) $(PROJ_INCLUDE_DIRS) $(SYS_INCLUDE_DIRS)
ifndef KERNELRELEASE
-CFLAGS = $(CMACH) $(CSYS) $(CENV) $(CPROJ) $(CMOD) $(CLOCAL) $(COPT) $(CDEBUG) $(CINCSRCH)
-CCFLAGS = $(CCMACH) $(CCSYS) $(CCENV) $(CCPROJ) $(CCMOD) $(CCLOCAL) $(CCOPT) $(CCDEBUG) $(CINCSRCH)
+CFLAGS = $(CMACH) $(CSYS) $(CENV) $(CPROJ) $(CMOD) $(CLOCAL) $(COPT) $(CDEBUG) $(CINCSRCH) $(RPM_OPT_FLAGS)
+CCFLAGS = $(CCMACH) $(CCSYS) $(CCENV) $(CCPROJ) $(CCMOD) $(CCLOCAL) $(CCOPT) $(CCDEBUG) $(CINCSRCH) $(RPM_OPT_FLAGS)
LDFLAGS = $(LDMACH) $(LDSYS) $(LDENV) $(LDPROJ) $(LDMOD) $(LDLOCAL) $(LDLIBSRCH) $(LDSTRIP) $(LDOUTPUT)
LD_LIB_DIRS = $(LOCAL_LIB_DIRS) $(MOD_LIB_DIRS) $(PROJ_LIB_DIRS) $(SYS_LIB_DIRS)
Accepting request 501879 from home:NMoreyChaisemartin:branches:science:HPC - Update to v10.4.0.0.197 * No changelog available - Update opa-ff_fix_suse_build_issue.patch and 0001-Add-shebang-for-exp-files.patch to new sources OBS-URL: https://build.opensuse.org/request/show/501879 OBS-URL: https://build.opensuse.org/package/show/science:HPC/opa-ff?expand=0&rev=22
2017-06-08 13:26:38 +02:00
diff --git Makerules/Target.LINUX.INTEL.X86_64 Makerules/Target.LINUX.INTEL.X86_64
Accepting request 617425 from home:NMoreyChaisemartin:branches:science:HPC - Update to v10.7.0.0.133 (fate#325049) * No changelog available - Rebase opa-ff-suse-build-fixes.patch to the latest sources - Update opa-ff-add-shebang-for-exp-files.patchto not use /usr/bin/env OBS-URL: https://build.opensuse.org/request/show/617425 OBS-URL: https://build.opensuse.org/package/show/science:HPC/opa-ff?expand=0&rev=43
2018-06-18 09:35:07 +02:00
index a373262676b5..3a6687d563cc 100755
Accepting request 501879 from home:NMoreyChaisemartin:branches:science:HPC - Update to v10.4.0.0.197 * No changelog available - Update opa-ff_fix_suse_build_issue.patch and 0001-Add-shebang-for-exp-files.patch to new sources OBS-URL: https://build.opensuse.org/request/show/501879 OBS-URL: https://build.opensuse.org/package/show/science:HPC/opa-ff?expand=0&rev=22
2017-06-08 13:26:38 +02:00
--- Makerules/Target.LINUX.INTEL.X86_64
+++ Makerules/Target.LINUX.INTEL.X86_64
Accepting request 436354 from SUSE:SLE-12-SP2:GA OBS-URL: https://build.opensuse.org/request/show/436354 OBS-URL: https://build.opensuse.org/package/show/science:HPC/opa-ff?expand=0&rev=1
2016-10-19 16:33:55 +02:00
@@ -132,6 +132,7 @@ endif
endif
CKERNEL+=-include $(TL_DIR)/Makerules/LINUX/$(BUILD_TARGET).$(BUILD_TARGET_OS_VENDOR).$(BUILD_TARGET_OS_VERSION).h
+CKERNEL+= $(RPM_OPT_FLAGS)
# Include directories for kernel
KERNELDIR=/lib/modules/$(BUILD_TARGET_OS_VERSION)/build
Accepting request 501879 from home:NMoreyChaisemartin:branches:science:HPC - Update to v10.4.0.0.197 * No changelog available - Update opa-ff_fix_suse_build_issue.patch and 0001-Add-shebang-for-exp-files.patch to new sources OBS-URL: https://build.opensuse.org/request/show/501879 OBS-URL: https://build.opensuse.org/package/show/science:HPC/opa-ff?expand=0&rev=22
2017-06-08 13:26:38 +02:00
diff --git OpenIb_Host/ff_build.sh OpenIb_Host/ff_build.sh
Accepting request 617425 from home:NMoreyChaisemartin:branches:science:HPC - Update to v10.7.0.0.133 (fate#325049) * No changelog available - Rebase opa-ff-suse-build-fixes.patch to the latest sources - Update opa-ff-add-shebang-for-exp-files.patchto not use /usr/bin/env OBS-URL: https://build.opensuse.org/request/show/617425 OBS-URL: https://build.opensuse.org/package/show/science:HPC/opa-ff?expand=0&rev=43
2018-06-18 09:35:07 +02:00
index 5a97ff855962..ce4179db7339 100755
Accepting request 501879 from home:NMoreyChaisemartin:branches:science:HPC - Update to v10.4.0.0.197 * No changelog available - Update opa-ff_fix_suse_build_issue.patch and 0001-Add-shebang-for-exp-files.patch to new sources OBS-URL: https://build.opensuse.org/request/show/501879 OBS-URL: https://build.opensuse.org/package/show/science:HPC/opa-ff?expand=0&rev=22
2017-06-08 13:26:38 +02:00
--- OpenIb_Host/ff_build.sh
+++ OpenIb_Host/ff_build.sh
Accepting request 543959 from home:NMoreyChaisemartin:branches:science:HPC - Update to v10.6.0.0.131 * No changelog available - Remove opa-ff-sigset-was-removed.patch as it was fixed upstream. - Rebase opa-ff-suse-build-fixes.patch and opa-ff-add-shebang-for-exp-files.patch to the latest sources OBS-URL: https://build.opensuse.org/request/show/543959 OBS-URL: https://build.opensuse.org/package/show/science:HPC/opa-ff?expand=0&rev=34
2017-11-21 09:56:27 +01:00
@@ -57,7 +57,13 @@ export PRODUCT=${PRODUCT:-OPENIB_FF}
Accepting request 501879 from home:NMoreyChaisemartin:branches:science:HPC - Update to v10.4.0.0.197 * No changelog available - Update opa-ff_fix_suse_build_issue.patch and 0001-Add-shebang-for-exp-files.patch to new sources OBS-URL: https://build.opensuse.org/request/show/501879 OBS-URL: https://build.opensuse.org/package/show/science:HPC/opa-ff?expand=0&rev=22
2017-06-08 13:26:38 +02:00
# for FF the kernel rev is not important. We simply use the kernel rev
Accepting request 436354 from SUSE:SLE-12-SP2:GA OBS-URL: https://build.opensuse.org/request/show/436354 OBS-URL: https://build.opensuse.org/package/show/science:HPC/opa-ff?expand=0&rev=1
2016-10-19 16:33:55 +02:00
# of the running kernel. While BUILD_TARGET_OS_VERSION is needed by Makerules
Accepting request 501879 from home:NMoreyChaisemartin:branches:science:HPC - Update to v10.4.0.0.197 * No changelog available - Update opa-ff_fix_suse_build_issue.patch and 0001-Add-shebang-for-exp-files.patch to new sources OBS-URL: https://build.opensuse.org/request/show/501879 OBS-URL: https://build.opensuse.org/package/show/science:HPC/opa-ff?expand=0&rev=22
2017-06-08 13:26:38 +02:00
# it will have no impact on what is actually built for FF
Accepting request 436354 from SUSE:SLE-12-SP2:GA OBS-URL: https://build.opensuse.org/request/show/436354 OBS-URL: https://build.opensuse.org/package/show/science:HPC/opa-ff?expand=0&rev=1
2016-10-19 16:33:55 +02:00
-export BUILD_TARGET_OS_VERSION=${BUILD_TARGET_OS_VERSION:-`uname -r`}
+export BUILD_TARGET_OS_VERSION=`uname -r`
+export BUILD_PLATFORM_OS_VENDOR="SuSE"
+export BUILD_TARGET_OS_VENDOR="SuSE"
+export BUILD_PLATFORM_OS_VENDOR_VERSION="OPENSUSE_BUILD_SYSTEM"
+export BUILD_TARGET_OS_VENDOR=$BUILD_PLATFORM_OS_VENDOR
+export BUILD_TARGET_OS_VENDOR_VERSION=$BUILD_PLATFORM_OS_VENDOR_VERSION
+
setver $BUILD_TARGET_OS_VENDOR $BUILD_TARGET_OS_VERSION
Accepting request 543959 from home:NMoreyChaisemartin:branches:science:HPC - Update to v10.6.0.0.131 * No changelog available - Remove opa-ff-sigset-was-removed.patch as it was fixed upstream. - Rebase opa-ff-suse-build-fixes.patch and opa-ff-add-shebang-for-exp-files.patch to the latest sources OBS-URL: https://build.opensuse.org/request/show/543959 OBS-URL: https://build.opensuse.org/package/show/science:HPC/opa-ff?expand=0&rev=34
2017-11-21 09:56:27 +01:00
MODULEVERSION=`$TL_DIR/MakeTools/convert_releasetag.pl $RELEASE_TAG`
@@ -69,6 +75,7 @@ shift
Accepting request 436354 from SUSE:SLE-12-SP2:GA OBS-URL: https://build.opensuse.org/request/show/436354 OBS-URL: https://build.opensuse.org/package/show/science:HPC/opa-ff?expand=0&rev=1
2016-10-19 16:33:55 +02:00
set -x
{
echo "Environment:"
+ export BUILD_TARGET_OS_VERSION="4.4"
env
echo "----------------------------------------------------------------------------"
echo
Copy Permalink