diff mbox series

clamav 0.99.4: removed gcc patch

Message ID 20180307182653.1968-1-matthias.fischer@ipfire.org
State Superseded
Headers
Series clamav 0.99.4: removed gcc patch |

Commit Message

Matthias Fischer March 8, 2018, 5:26 a.m. UTC 
  'clamav-0.99.3-gcc-6.patch' won't apply.

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
---
 lfs/clamav | 1 -
 1 file changed, 1 deletion(-)

Comments

Michael Tremer March 8, 2018, 5:46 a.m. UTC | #1 
Thank you for sending in this one. I didn't even notice that the nightly builds
were broken.

I updated clamav as well and removed both patches since it built without.
However, Peter's patch didn't remove any of them and I thought he at least built
the package.

In addition to your patch, I removed the patch file. Please do this in the
future so that we don't have any unused patch files in src/patches.

Good work!

-Michael

On Wed, 2018-03-07 at 19:26 +0100, Matthias Fischer wrote:
> 'clamav-0.99.3-gcc-6.patch' won't apply.
> 
> Best,
> Matthias
> 
> Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
> ---
>  lfs/clamav | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/lfs/clamav b/lfs/clamav
> index 957788aa0..748c2c371 100644
> --- a/lfs/clamav
> +++ b/lfs/clamav
> @@ -82,7 +82,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>  	@$(PREBUILD)
>  	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
>  	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/clamav/llvm-
> glibc.patch
> -	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/clamav/clamav-
> 0.99.3-gcc-6.patch
>  	cd $(DIR_APP) && ./configure \
>  		--prefix=/usr \
>  		--disable-zlib-vcheck \
Peter Müller March 12, 2018, 5:19 a.m. UTC | #2 
Hello,

thanks for removing the patches.

They did not apply here indeed, but I forgot to add that to the ClamAV LFS
file (yes, I know, my package update procedure is somewhat strange :-) ).

Best regards,
Peter Müller

> Thank you for sending in this one. I didn't even notice that the nightly builds
> were broken.
> 
> I updated clamav as well and removed both patches since it built without.
> However, Peter's patch didn't remove any of them and I thought he at least built
> the package.
> 
> In addition to your patch, I removed the patch file. Please do this in the
> future so that we don't have any unused patch files in src/patches.
> 
> Good work!
> 
> -Michael
> 
> On Wed, 2018-03-07 at 19:26 +0100, Matthias Fischer wrote:
> > 'clamav-0.99.3-gcc-6.patch' won't apply.
> > 
> > Best,
> > Matthias
> > 
> > Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
> > ---
> >  lfs/clamav | 1 -
> >  1 file changed, 1 deletion(-)
> > 
> > diff --git a/lfs/clamav b/lfs/clamav
> > index 957788aa0..748c2c371 100644
> > --- a/lfs/clamav
> > +++ b/lfs/clamav
> > @@ -82,7 +82,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> >  	@$(PREBUILD)
> >  	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
> >  	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/clamav/llvm-
> > glibc.patch
> > -	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/clamav/clamav-
> > 0.99.3-gcc-6.patch
> >  	cd $(DIR_APP) && ./configure \
> >  		--prefix=/usr \
> >  		--disable-zlib-vcheck \
diff mbox series

Patch

diff --git a/lfs/clamav b/lfs/clamav
index 957788aa0..748c2c371 100644
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -82,7 +82,6 @@  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/clamav/llvm-glibc.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/clamav/clamav-0.99.3-gcc-6.patch
 	cd $(DIR_APP) && ./configure \
 		--prefix=/usr \
 		--disable-zlib-vcheck \