diff --git a/genwqe-tools.spec b/genwqe-tools.spec index 571427db87f97546c75b60773f5bc58228f6421e..5801c482b61c68a832a108704cf8771bf43b2566 100644 --- a/genwqe-tools.spec +++ b/genwqe-tools.spec @@ -1,7 +1,7 @@ Summary: GenWQE userspace tools Name: genwqe-tools Version: 4.0.20 -Release: 1 +Release: 2 License: ASL 2.0 URL: https://github.com/ibm-genwqe/genwqe-user/ BuildRequires: gcc zlib-devel >= 1.2.7 help2man @@ -11,6 +11,7 @@ BuildRequires: libcxl-devel Source0: https://github.com/ibm-genwqe/genwqe-user/archive/v%{version}.tar.gz#/genwqe-user-%{version}.tar.gz Patch0: genwqe-user-4.0.18-install-gzFile_test.patch Patch1: genwqe-user-4.0.18-modifyFuntionName.patch +Patch2: support-specify-cc.patch Requires: genwqe-zlib = %{version}-%{release} %description Provide a suite of utilities to manage and configure the IBM GenWQE card. @@ -117,5 +118,8 @@ rmdir %{buildroot}%{_libdir}/genwqe/ %{_libdir}/*.a %changelog +* Fri Apr 14 2023 jammyjellyfish - 4.0.20-2 +- Support specify CC + * Thu Aug 13 2020 tuShenmei - 4.0.20-1 - package init diff --git a/support-specify-cc.patch b/support-specify-cc.patch new file mode 100644 index 0000000000000000000000000000000000000000..3385c4e44beaade4b39b9900ec4e61f33ad38a53 --- /dev/null +++ b/support-specify-cc.patch @@ -0,0 +1,33 @@ +diff -up genwqe-user-4.0.20/config.mk.orig2 genwqe-user-4.0.20/config.mk +--- genwqe-user-4.0.20/config.mk.orig2 2023-04-21 10:34:13.040174041 +0800 ++++ genwqe-user-4.0.20/config.mk 2023-04-21 10:35:05.669606777 +0800 +@@ -20,10 +20,10 @@ + # V=2 means full output + # + V ?= 1 +-CC = $(CROSS)gcc +-AS = $(CROSS)as +-LD = $(CROSS)ld +-AR = $(CROSS)ar ++CC ?= $(CROSS)gcc ++AS ?= $(CROSS)as ++LD ?= $(CROSS)ld ++AR ?= $(CROSS)ar + RANLIB = $(CROSS)ranlib + OBJCOPY = $(CROSS)objcopy + OBJDUMP = $(CROSS)objdump +@@ -40,10 +40,10 @@ endif + ifeq ($(V),1) + MAKEFLAGS += --silent + MAKE += -s +-CC = printf "\t[CC]\t%s\n" `basename "$@"`; $(CROSS)gcc +-AS = printf "\t[AS]\t%s\n" `basename "$@"`; $(CROSS)as +-AR = printf "\t[AR]\t%s\n" `basename "$@"`; $(CROSS)ar +-LD = printf "\t[LD]\t%s\n" `basename "$@"`; $(CROSS)ld ++CC := printf "\t[CC]\t%s\n" `basename "$@"`; $(CC) ++AS := printf "\t[AS]\t%s\n" `basename "$@"`; $(AS) ++AR := printf "\t[AR]\t%s\n" `basename "$@"`; $(LD) ++LD := printf "\t[LD]\t%s\n" `basename "$@"`; $(AR) + OBJCOPY = printf "\t[OBJCOPY]\t%s\n" `basename "$@"`; $(CROSS)objcopy + else + CLEAN = echo -n