| 1 |
ssuominen 13/05/01 11:32:59 |
| 2 |
|
| 3 |
Added: unrar-5.0.2-build.patch |
| 4 |
Log: |
| 5 |
Version bump. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 4868F14D) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-arch/unrar/files/unrar-5.0.2-build.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/unrar/files/unrar-5.0.2-build.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/unrar/files/unrar-5.0.2-build.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: unrar-5.0.2-build.patch |
| 16 |
=================================================================== |
| 17 |
do not let these targets depend on clean, otherwise it could run in |
| 18 |
parallel with the object compile which runs into races |
| 19 |
https://bugs.gentoo.org/461806 |
| 20 |
|
| 21 |
While we're in here, fix up a few other things: |
| 22 |
- append -pthread to LDFLAGS instead of replacing them |
| 23 |
- do not bother with `rm` in the output since linking will clober it |
| 24 |
- use CXXFLAGS when linking |
| 25 |
- append LIBFLAGS to the individual targets instead of the final link |
| 26 |
|
| 27 |
--- a/makefile |
| 28 |
+++ b/makefile |
| 29 |
@@ -7,7 +7,7 @@ |
| 30 |
LIBFLAGS=-fPIC |
| 31 |
DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DRAR_SMP |
| 32 |
STRIP=strip |
| 33 |
-LDFLAGS=-pthread |
| 34 |
+LDFLAGS+=-pthread |
| 35 |
DESTDIR=/usr |
| 36 |
|
| 37 |
# Linux using LCC |
| 38 |
@@ -119,8 +119,7 @@ |
| 39 |
@rm -f *.o *.bak *~ |
| 40 |
|
| 41 |
unrar: clean $(OBJECTS) $(UNRAR_OBJ) |
| 42 |
- @rm -f unrar |
| 43 |
- $(LINK) -o unrar $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS) |
| 44 |
+ $(LINK) -o unrar $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS) |
| 45 |
$(STRIP) unrar |
| 46 |
|
| 47 |
sfx: WHAT=SFX_MODULE |
| 48 |
@@ -130,10 +129,9 @@ |
| 49 |
$(STRIP) default.sfx |
| 50 |
|
| 51 |
lib: WHAT=RARDLL |
| 52 |
-lib: CXXFLAGS+=$(LIBFLAGS) |
| 53 |
-lib: clean $(OBJECTS) $(LIB_OBJ) |
| 54 |
- @rm -f libunrar.so |
| 55 |
- $(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ) |
| 56 |
+$(OBJECTS) $(LIB_OBJ): CXXFLAGS+=$(LIBFLAGS) |
| 57 |
+lib: $(OBJECTS) $(LIB_OBJ) |
| 58 |
+ $(LINK) -shared -o libunrar.so $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(LIB_OBJ) |
| 59 |
|
| 60 |
install-unrar: |
| 61 |
install -D unrar $(DESTDIR)/bin/unrar |
Archives