diff --git a/jbigkit.spec b/jbigkit.spec index 01a5882c664f8912b6c583db35d3ae0b5cd4e9d0..9f8ea8969ed807236dc6fefa1d695d30c924a19d 100644 --- a/jbigkit.spec +++ b/jbigkit.spec @@ -1,6 +1,6 @@ Name: jbigkit Version: 2.1 -Release: 21 +Release: 22 Summary: Lossless image compression library License: GPLv2+ @@ -13,6 +13,7 @@ Patch1: jbigkit-2.0-warnings.patch Patch2: jbigkit-ldflags.patch Patch6000: backport-CVE-2017-9937.patch +Patch6001: support-specify-cc.patch BuildRequires: gcc Requires: %{name}-libs = %{version}-%{release} @@ -84,6 +85,9 @@ make test %{_mandir}/man1/* %changelog +* Sun Apr 16 2023 jammyjellyfish - 2.1-22 +- Support specify CC + * Fri Jan 13 2023 zhouwenpei - 2.1-21 - fix build fail diff --git a/support-specify-cc.patch b/support-specify-cc.patch new file mode 100644 index 0000000000000000000000000000000000000000..701b071d2ba4cdbd2fef7152f308faeccaa0ad06 --- /dev/null +++ b/support-specify-cc.patch @@ -0,0 +1,36 @@ +diff -up jbigkit-2.1/libjbig/Makefile.orig2 jbigkit-2.1/libjbig/Makefile +--- jbigkit-2.1/libjbig/Makefile.orig2 2023-04-16 16:44:13.690431844 +0800 ++++ jbigkit-2.1/libjbig/Makefile 2023-04-16 16:44:42.118544267 +0800 +@@ -1,7 +1,7 @@ + # Unix makefile for the JBIG-KIT library + + # Select an ANSI/ISO C compiler here, GNU gcc is recommended +-CC = gcc ++CC ?= gcc + + # Options for the compiler: A high optimization level is suggested + CFLAGS = $(RPM_OPT_FLAGS) -W -Wall -ansi -pedantic # --coverage +diff -up jbigkit-2.1/Makefile.orig2 jbigkit-2.1/Makefile +--- jbigkit-2.1/Makefile.orig2 2023-04-16 16:43:38.182291412 +0800 ++++ jbigkit-2.1/Makefile 2023-04-16 16:45:00.230615896 +0800 +@@ -1,7 +1,7 @@ + # Unix makefile for JBIG-KIT + + # Select an ANSI/ISO C compiler here, GNU gcc is recommended +-CC = gcc ++CC ?= gcc + + # Options for the compiler: A high optimization level is suggested + CFLAGS = $(RPM_OPT_FLAGS) -W -Wno-unused-result +diff -up jbigkit-2.1/pbmtools/Makefile.orig2 jbigkit-2.1/pbmtools/Makefile +--- jbigkit-2.1/pbmtools/Makefile.orig2 2023-04-16 16:44:32.126504750 +0800 ++++ jbigkit-2.1/pbmtools/Makefile 2023-04-16 16:44:48.254568533 +0800 +@@ -1,7 +1,7 @@ + # Unix makefile for the JBIG-KIT PBM tools + + # Select an ANSI/ISO C compiler here, e.g. GNU gcc is recommended +-CC = gcc ++CC ?= gcc + + # Options for the compiler + CFLAGS = $(RPM_OPT_FLAGS) -W -Wall -Wno-unused-result -ansi -pedantic # --coverage