diff options
Diffstat (limited to 'app-arch/unrar/files')
| -rw-r--r-- | app-arch/unrar/files/unrar-5.9.3-build.patch | 35 | ||||
| -rw-r--r-- | app-arch/unrar/files/unrar-6.2.6-honor-flags.patch (renamed from app-arch/unrar/files/unrar-5.5.5-honor-flags.patch) | 12 |
2 files changed, 6 insertions, 41 deletions
diff --git a/app-arch/unrar/files/unrar-5.9.3-build.patch b/app-arch/unrar/files/unrar-5.9.3-build.patch deleted file mode 100644 index d9cbcfd8683a..000000000000 --- a/app-arch/unrar/files/unrar-5.9.3-build.patch +++ /dev/null @@ -1,35 +0,0 @@ -Makefile: Fix parallel build issue - -If clean runs in parallel with $(OBJECTS), it is possible to build some -objects first, then the clean target fires and deletes some, and then we -try to link and fail. - -Gentoo-Bug: https://bugs.gentoo.org/528218 - ---- unrar/makefile -+++ unrar/makefile -@@ -142,21 +142,18 @@ - @rm -f $(OBJECTS) $(UNRAR_OBJ) $(LIB_OBJ) - @rm -f unrar libunrar.* - --unrar: clean $(OBJECTS) $(UNRAR_OBJ) -- @rm -f unrar -+unrar: $(OBJECTS) $(UNRAR_OBJ) - $(LINK) -o unrar $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS) - $(STRIP) unrar - - sfx: WHAT=SFX_MODULE --sfx: clean $(OBJECTS) -- @rm -f default.sfx -+sfx: $(OBJECTS) - $(LINK) -o default.sfx $(LDFLAGS) $(OBJECTS) - $(STRIP) default.sfx - - lib: WHAT=RARDLL - lib: CXXFLAGS+=$(LIBFLAGS) --lib: clean $(OBJECTS) $(LIB_OBJ) -- @rm -f libunrar.* -+lib: $(OBJECTS) $(LIB_OBJ) - $(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ) - $(AR) rcs libunrar.a $(OBJECTS) $(LIB_OBJ) - diff --git a/app-arch/unrar/files/unrar-5.5.5-honor-flags.patch b/app-arch/unrar/files/unrar-6.2.6-honor-flags.patch index 0237e3d30f05..976f1417c861 100644 --- a/app-arch/unrar/files/unrar-5.5.5-honor-flags.patch +++ b/app-arch/unrar/files/unrar-6.2.6-honor-flags.patch @@ -17,30 +17,30 @@ Gentoo-Bug: https://bugs.gentoo.org/461806 DESTDIR=/usr # Linux using LCC -@@ -145,18 +145,19 @@ clean: - @rm -f libunrar.a +@@ -147,20 +147,21 @@ clean: unrar: $(OBJECTS) $(UNRAR_OBJ) + @rm -f unrar - $(LINK) -o unrar $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS) + $(LINK) -o unrar $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS) $(STRIP) unrar sfx: WHAT=SFX_MODULE sfx: $(OBJECTS) + @rm -f default.sfx - $(LINK) -o default.sfx $(LDFLAGS) $(OBJECTS) + $(LINK) -o default.sfx $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(STRIP) default.sfx -+$(OBJECTS) $(LIB_OBJ): CXXFLAGS+=$(LIBFLAGS) ++$(OBJECTS) $(LIB_OBJ): CXXFLAGS+=$(LIBFLAGS) + lib: WHAT=RARDLL -lib: CXXFLAGS+=$(LIBFLAGS) lib: $(OBJECTS) $(LIB_OBJ) + @rm -f libunrar.* - $(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ) + $(LINK) -shared -o libunrar.so $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(LIB_OBJ) $(AR) rcs libunrar.a $(OBJECTS) $(LIB_OBJ) install-unrar: --- -2.13.1 - +-- |