SHA256
1
0
forked from pool/opa-ff
opa-ff/opa-ff_fix_suse_build_issue.patch

55 lines
2.5 KiB
Diff
Raw Normal View History

diff --git Makerules/Defs.Flags Makerules/Defs.Flags
index 8caba53..91764ca 100755
--- Makerules/Defs.Flags
+++ Makerules/Defs.Flags
@@ -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)
diff --git Makerules/Target.LINUX.INTEL.X86_64 Makerules/Target.LINUX.INTEL.X86_64
index a373262..3a6687d 100755
--- Makerules/Target.LINUX.INTEL.X86_64
+++ Makerules/Target.LINUX.INTEL.X86_64
@@ -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
diff --git OpenIb_Host/ff_build.sh OpenIb_Host/ff_build.sh
index b6a17a0..028a234 100755
--- OpenIb_Host/ff_build.sh
+++ OpenIb_Host/ff_build.sh
@@ -65,7 +65,13 @@ export PRODUCT=${PRODUCT:-OPENIB_FF}
# for FF the kernel rev is not important. We simply use the kernel rev
# of the running kernel. While BUILD_TARGET_OS_VERSION is needed by Makerules
# it will have no impact on what is actually built for FF
-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
RELEASE_STRING=IntelOPA-Tools-FF.$BUILD_TARGET_OS_ID.$MODULEVERSION
@@ -76,6 +82,7 @@ shift
set -x
{
echo "Environment:"
+ export BUILD_TARGET_OS_VERSION="4.4"
env
echo "----------------------------------------------------------------------------"
echo