| 1 |
ssuominen 10/06/29 19:22:03 |
| 2 |
|
| 3 |
Modified: Makefile-portable |
| 4 |
Log: |
| 5 |
Fix building of paxtest-0.9.6 with -Wl,--as-needed wrt #246755. |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 app-admin/paxtest/files/Makefile-portable |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/paxtest/files/Makefile-portable?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/paxtest/files/Makefile-portable?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/paxtest/files/Makefile-portable?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: Makefile-portable |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/paxtest/files/Makefile-portable,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- Makefile-portable 6 Aug 2004 11:56:08 -0000 1.1 |
| 22 |
+++ Makefile-portable 29 Jun 2010 19:22:03 -0000 1.2 |
| 23 |
@@ -160,7 +160,7 @@ |
| 24 |
|
| 25 |
$(EXEC_TESTS) $(MPROT_TESTS): body.o |
| 26 |
$(CC) $(CFLAGS) -o $@.o -c $@.c |
| 27 |
- $(CC) $(LDFLAGS) $(PTHREAD) -o $@ $< $@.o |
| 28 |
+ $(CC) $(LDFLAGS) -o $@ $< $@.o $(PTHREAD) |
| 29 |
|
| 30 |
$(RAND_TESTS): randbody.o |
| 31 |
$(CC) $(CFLAGS) -o $@.o -c $@.c |
| 32 |
@@ -206,7 +206,7 @@ |
| 33 |
|
| 34 |
$(MPROTSH_TESTS): body.o shlibtest.so |
| 35 |
$(CC) $(CFLAGS) -o $@.o -c $@.c |
| 36 |
- $(CC) $(LDFLAGS) $(PTHREAD) -o $@ $@.o $^ |
| 37 |
+ $(CC) $(LDFLAGS) -o $@ $@.o $^ $(PTHREAD) |
| 38 |
|
| 39 |
# used for RANDEXEC'd binaries |
| 40 |
retbody.o: body.c |
| 41 |
@@ -215,12 +215,12 @@ |
| 42 |
# build as ET_EXEC (recommended by PaX Team, not really a requirement) |
| 43 |
$(RET_TESTS): retbody.o |
| 44 |
$(CC) $(CFLAGS) $(CC_ETEXEC) -o $@.o -c $@.c |
| 45 |
- $(CC) $(LDFLAGS) $(CC_ETEXEC) $(PTHREAD) -o $@ $< $@.o |
| 46 |
+ $(CC) $(LDFLAGS) $(CC_ETEXEC) -o $@ $< $@.o $(PTHREAD) |
| 47 |
|
| 48 |
# build as ET_EXEC (not in Adamantix's Makefile) |
| 49 |
$(RETX_TESTS): retbody.o |
| 50 |
$(CC) $(CFLAGS) $(CC_ETEXEC) -o $@.o -c $@.c |
| 51 |
- $(CC) $(LDFLAGS) $(CC_ETEXEC) $(PTHREAD) -o $@ $< $@.o |
| 52 |
+ $(CC) $(LDFLAGS) $(CC_ETEXEC) -o $@ $< $@.o $(PTHREAD) |
| 53 |
$(PAXBIN) -SPXM $@ |
| 54 |
|
| 55 |
# should also shlibbss.o and shlibdata.o be built w/ PIC? |
| 56 |
@@ -232,5 +232,5 @@ |
| 57 |
$(CC) $(SHLDFLAGS) -shared -o $@ $< |
| 58 |
|
| 59 |
$(SHLIB_TESTS): body.o $(SHLIBS) shlibbss.o shlibdata.o |
| 60 |
- $(CC) $(LDFLAGS) $(PTHREAD) -o $@ body.o $@.o $(SHLIBS) -ldl |
| 61 |
+ $(CC) $(LDFLAGS) -o $@ body.o $@.o $(SHLIBS) -ldl $(PTHREAD) |
Archives