pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/archivers/unrar Actually make this MAKE_JOBS safe (hin...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/9d4fca2606ee
branches:  trunk
changeset: 458554:9d4fca2606ee
user:      martin <martin%pkgsrc.org@localhost>
date:      Sat Sep 18 09:37:51 2021 +0000

description:
Actually make this MAKE_JOBS safe (hint from Joerg)

diffstat:

 archivers/unrar/distinfo               |   3 ++-
 archivers/unrar/patches/patch-makefile |  30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletions(-)

diffs (46 lines):

diff -r e05d700b114b -r 9d4fca2606ee archivers/unrar/distinfo
--- a/archivers/unrar/distinfo  Sat Sep 18 09:02:01 2021 +0000
+++ b/archivers/unrar/distinfo  Sat Sep 18 09:37:51 2021 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.86 2021/07/07 08:50:07 adam Exp $
+$NetBSD: distinfo,v 1.87 2021/09/18 09:37:51 martin Exp $
 
 SHA1 (unrarsrc-6.0.7.tar.gz) = 041a36ea448c73555ab94070add7dfaa0ef62bb0
 RMD160 (unrarsrc-6.0.7.tar.gz) = 8d800632d865a56584f640d96c7672797bda3193
 SHA512 (unrarsrc-6.0.7.tar.gz) = 2c50d1f58f5189e59dad36eb25aa50a34572f583242e624846c9791c5609e83d4ee76314d785771fe514ec3378749dcb86e4c97a8d2a3ab7b469df49a5c5f412
 Size (unrarsrc-6.0.7.tar.gz) = 232903 bytes
+SHA1 (patch-makefile) = b467d681dacd3230c6b8761400e6c5566663eae4
diff -r e05d700b114b -r 9d4fca2606ee archivers/unrar/patches/patch-makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/archivers/unrar/patches/patch-makefile    Sat Sep 18 09:37:51 2021 +0000
@@ -0,0 +1,30 @@
+$NetBSD: patch-makefile,v 1.3 2021/09/18 09:37:51 martin Exp $
+
+Avoid race condition with parallel makes (cleaning freshly made new .o files)
+
+--- makefile.orig      2020-05-21 11:13:21.000000000 +0200
++++ makefile   2021-09-18 11:32:41.790564278 +0200
+@@ -142,20 +142,20 @@ clean:
+       @rm -f $(OBJECTS) $(UNRAR_OBJ) $(LIB_OBJ)
+       @rm -f unrar libunrar.*
+ 
+-unrar:        clean $(OBJECTS) $(UNRAR_OBJ)
++unrar:        $(OBJECTS) $(UNRAR_OBJ)
+       @rm -f unrar
+       $(LINK) -o unrar $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS)     
+       $(STRIP) unrar
+ 
+ sfx:  WHAT=SFX_MODULE
+-sfx:  clean $(OBJECTS)
++sfx:  $(OBJECTS)
+       @rm -f default.sfx
+       $(LINK) -o default.sfx $(LDFLAGS) $(OBJECTS)
+       $(STRIP) default.sfx
+ 
+ lib:  WHAT=RARDLL
+ lib:  CXXFLAGS+=$(LIBFLAGS)
+-lib:  clean $(OBJECTS) $(LIB_OBJ)
++lib:  $(OBJECTS) $(LIB_OBJ)
+       @rm -f libunrar.*
+       $(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
+       $(AR) rcs libunrar.a $(OBJECTS) $(LIB_OBJ)



Home | Main Index | Thread Index | Old Index