From b4463edfc9644112afaec5a973232b10cd06cffe Mon Sep 17 00:00:00 2001 From: luofeng14 Date: Sun, 4 Feb 2024 02:05:53 +0000 Subject: [PATCH] support clang build Signed-off-by: luofeng14 --- zip-fix-cc.patch | 11 +++++++++++ zip.spec | 8 ++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 zip-fix-cc.patch diff --git a/zip-fix-cc.patch b/zip-fix-cc.patch new file mode 100644 index 0000000..af7c15a --- /dev/null +++ b/zip-fix-cc.patch @@ -0,0 +1,11 @@ +--- a/unix/Makefile 2008-05-07 14:33:56.000000000 +0800 ++++ b/unix/Makefile 2023-04-16 16:14:10.611625606 +0800 +@@ -22,7 +22,7 @@ + LN = ln -s + + # (to use the GNU compiler, change cc to gcc in CC) +-CC = cc ++CC ?= cc + BIND = $(CC) + AS = $(CC) -c + CPP = /lib/cpp diff --git a/zip.spec b/zip.spec index 63ecc9d..37b28ee 100644 --- a/zip.spec +++ b/zip.spec @@ -1,6 +1,6 @@ Name: zip Version: 3.0 -Release: 30 +Release: 31 Summary: A compression and file packaging/archive utility License: Info-ZIP URL: http://www.info-zip.org/Zip.html @@ -13,6 +13,7 @@ Patch3: zip-3.0-time.patch Patch4: man.patch Patch5: zip-3.0-format-security.patch Patch6: zipnote.patch +Patch7: zip-fix-cc.patch Patch6000: CVE-2018-13410.patch @@ -37,7 +38,7 @@ This package contains the documents and manuals related to zip. %autosetup -n zip30 -p1 %build -%make_build -f unix/Makefile prefix=%{_prefix} "CFLAGS_NOOPT=-I. -DUNIX $RPM_OPT_FLAGS" generic_gcc +%make_build -f unix/Makefile prefix=%{_prefix} "CFLAGS_NOOPT=-I. -DUNIX $RPM_OPT_FLAGS" generic %install mkdir -p %{buildroot}%{_bindir} @@ -55,6 +56,9 @@ mkdir -p %{buildroot}%{_mandir}/man1 %{_mandir}/man1/zip* %changelog +* Fri Nov 10 2023 luofeng - 3.0-31 +- support clang build + * Fri May 27 2022 konglidong - 3.0-30 - modify bad date in %changelog -- Gitee