Add the missing linker flags

This commit is contained in:
jamartis 2022-02-02 15:30:14 +00:00
parent 24ceba9453
commit 69988e8dbe
2 changed files with 21 additions and 2 deletions

12
zip-3.0-configure.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up zip30/unix/configure.nostrip zip30/unix/configure
--- zip30/unix/configure.nostrip 2009-11-30 10:18:09.000000000 +0100
+++ zip30/unix/configure 2009-11-30 10:21:08.354264213 +0100
@@ -17,7 +17,7 @@ CFLAGSR=${CFLAGS}
CC=${1-cc}
CFLAGS=${2-"-I. -DUNIX"}
LFLAGS1=''
-LFLAGS2=''
+LFLAGS2="${LFLAGS2}"
LN="ln -s"
CFLAGS_OPT=''

View File

@ -1,7 +1,7 @@
Summary: A file compression and packaging utility compatible with PKZIP Summary: A file compression and packaging utility compatible with PKZIP
Name: zip Name: zip
Version: 3.0 Version: 3.0
Release: 30%{?dist} Release: 31%{?dist}
License: BSD License: BSD
Source: http://downloads.sourceforge.net/infozip/zip30.tar.gz Source: http://downloads.sourceforge.net/infozip/zip30.tar.gz
URL: http://www.info-zip.org/Zip.html URL: http://www.info-zip.org/Zip.html
@ -16,6 +16,7 @@ Patch3: zip-3.0-time.patch
Patch4: man.patch Patch4: man.patch
Patch5: zip-3.0-format-security.patch Patch5: zip-3.0-format-security.patch
Patch6: zipnote.patch Patch6: zipnote.patch
Patch7: zip-3.0-configure.patch
BuildRequires: make BuildRequires: make
BuildRequires: bzip2-devel, gcc BuildRequires: bzip2-devel, gcc
Requires: unzip Requires: unzip
@ -37,9 +38,10 @@ program.
%patch4 -p1 -b .man %patch4 -p1 -b .man
%patch5 -p1 -b .format-security %patch5 -p1 -b .format-security
%patch6 -p1 -b .zipnote %patch6 -p1 -b .zipnote
%patch7 -p1
%build %build
make -f unix/Makefile prefix=%{_prefix} "CFLAGS_NOOPT=-I. -DUNIX $RPM_OPT_FLAGS" generic_gcc %{?_smp_mflags} make -f unix/Makefile prefix=%{_prefix} CFLAGS_NOOPT="-I. -DUNIX $RPM_OPT_FLAGS" LFLAGS2="%{?__global_ldflags}" generic_gcc %{?_smp_mflags}
%install %install
mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_bindir}
@ -62,6 +64,11 @@ make -f unix/Makefile prefix=$RPM_BUILD_ROOT%{_prefix} \
%{_mandir}/man1/zipsplit.1* %{_mandir}/man1/zipsplit.1*
%changelog %changelog
* Wed Feb 02 2022 Jakub Martisko <jamartis@redhat.com> - 3.0-31
- Add the missing linker flags
- Add the patch that allows to configure the linker flags from the spec file
Resolves: rhbz #2044902
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 3.0-30 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 3.0-30
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688 Related: rhbz#1991688