diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
| commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
| tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /app-arch/unrar/files | |
reinit the tree, so we can have metadata
Diffstat (limited to 'app-arch/unrar/files')
| -rw-r--r-- | app-arch/unrar/files/unrar-5.5.5-build.patch | 44 | ||||
| -rw-r--r-- | app-arch/unrar/files/unrar-5.5.5-honor-flags.patch | 46 |
2 files changed, 90 insertions, 0 deletions
diff --git a/app-arch/unrar/files/unrar-5.5.5-build.patch b/app-arch/unrar/files/unrar-5.5.5-build.patch new file mode 100644 index 000000000000..5d69a25d65af --- /dev/null +++ b/app-arch/unrar/files/unrar-5.5.5-build.patch @@ -0,0 +1,44 @@ +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 + +--- a/makefile ++++ b/makefile +@@ -139,23 +139,23 @@ uninstall: uninstall-unrar + + clean: + @rm -f *.o *.bak *~ +- +-unrar: clean $(OBJECTS) $(UNRAR_OBJ) + @rm -f unrar ++ @rm -f default.sfx ++ @rm -f libunrar.so ++ @rm -f libunrar.a ++ ++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.so +- @rm -f libunrar.a ++lib: $(OBJECTS) $(LIB_OBJ) + $(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ) + $(AR) rcs libunrar.a $(OBJECTS) $(LIB_OBJ) + +-- +2.13.1 + diff --git a/app-arch/unrar/files/unrar-5.5.5-honor-flags.patch b/app-arch/unrar/files/unrar-5.5.5-honor-flags.patch new file mode 100644 index 000000000000..0237e3d30f05 --- /dev/null +++ b/app-arch/unrar/files/unrar-5.5.5-honor-flags.patch @@ -0,0 +1,46 @@ +Makefile: Honor {LD,CXX}FLAGS, add LIBFLAGS + + - append -pthread to LDFLAGS instead of replacing them + - use CXXFLAGS when linking + - append LIBFLAGS to the individual targets instead of the final link + +Gentoo-Bug: https://bugs.gentoo.org/461806 + +--- a/makefile ++++ b/makefile +@@ -8,7 +8,7 @@ LIBFLAGS=-fPIC + DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DRAR_SMP + STRIP=strip + AR=ar +-LDFLAGS=-pthread ++LDFLAGS+=-pthread + DESTDIR=/usr + + # Linux using LCC +@@ -145,18 +145,19 @@ clean: + @rm -f libunrar.a + + unrar: $(OBJECTS) $(UNRAR_OBJ) +- $(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) +- $(LINK) -o default.sfx $(LDFLAGS) $(OBJECTS) ++ $(LINK) -o default.sfx $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) + $(STRIP) default.sfx + ++$(OBJECTS) $(LIB_OBJ): CXXFLAGS+=$(LIBFLAGS) ++ + lib: WHAT=RARDLL +-lib: CXXFLAGS+=$(LIBFLAGS) + lib: $(OBJECTS) $(LIB_OBJ) +- $(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 + |