Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unrar ver. bump

Browse Source
This commit is contained in:
Rmys
2022-11-06 13:37:06 +03:00
parent b132c229e3
commit 5e43675ca4
3 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/archive/unrar/files/unrar-5.5.5-build.patch
+11 -20
View File
@@ -6,39 +6,30 @@ 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/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
+ @rm -f default.sfx
+ @rm -f libunrar.so
+ @rm -f libunrar.a
+
- @rm -f unrar
+unrar: $(OBJECTS) $(UNRAR_OBJ)
$(LINK) -o unrar $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS)
$(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
- @rm -f libunrar.*
+lib: $(OBJECTS) $(LIB_OBJ)
$(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
$(AR) rcs libunrar.a $(OBJECTS) $(LIB_OBJ)
--
2.13.1
util/archive/unrar/files/unrar-5.5.5-honor-flags.patch
+7 -7
View File
@@ -15,22 +15,22 @@ Gentoo-Bug: https://bugs.gentoo.org/461806
-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 $(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
@@ -39,8 +39,8 @@ Gentoo-Bug: https://bugs.gentoo.org/461806
- $(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