diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-06-29 19:22:03 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-06-29 19:22:03 +0000 |
| commit | 89e0a6bf44c7fe73f60ef1c4d3be9302402efe7b (patch) | |
| tree | 7d2bd140dbbce219e371b9dda0b73da9f0d9d3fc /app-admin/paxtest | |
| parent | Fix building of paxtest-0.9.7_pre4 with -Wl,--as-needed wrt #246755. (diff) | |
| download | gentoo-2-89e0a6bf44c7fe73f60ef1c4d3be9302402efe7b.tar.gz gentoo-2-89e0a6bf44c7fe73f60ef1c4d3be9302402efe7b.tar.bz2 gentoo-2-89e0a6bf44c7fe73f60ef1c4d3be9302402efe7b.zip | |
Fix building of paxtest-0.9.6 with -Wl,--as-needed wrt #246755.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'app-admin/paxtest')
| -rw-r--r-- | app-admin/paxtest/ChangeLog | 6 | ||||
| -rw-r--r-- | app-admin/paxtest/files/Makefile-portable | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/app-admin/paxtest/ChangeLog b/app-admin/paxtest/ChangeLog index 04b367ccb4f0..455b8093c469 100644 --- a/app-admin/paxtest/ChangeLog +++ b/app-admin/paxtest/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/paxtest # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/paxtest/ChangeLog,v 1.34 2010/06/29 19:18:33 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/paxtest/ChangeLog,v 1.35 2010/06/29 19:22:03 ssuominen Exp $ + + 29 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> + files/Makefile-portable: + Fix building of paxtest-0.9.6 with -Wl,--as-needed wrt #246755. 29 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> files/Makefile.psm5: Fix building of paxtest-0.9.7_pre4 with -Wl,--as-needed wrt #246755. diff --git a/app-admin/paxtest/files/Makefile-portable b/app-admin/paxtest/files/Makefile-portable index 30c0653f5e4d..65142e426daa 100644 --- a/app-admin/paxtest/files/Makefile-portable +++ b/app-admin/paxtest/files/Makefile-portable @@ -160,7 +160,7 @@ paxtest: $(TESTS) genpaxtest $(EXEC_TESTS) $(MPROT_TESTS): body.o $(CC) $(CFLAGS) -o $@.o -c $@.c - $(CC) $(LDFLAGS) $(PTHREAD) -o $@ $< $@.o + $(CC) $(LDFLAGS) -o $@ $< $@.o $(PTHREAD) $(RAND_TESTS): randbody.o $(CC) $(CFLAGS) -o $@.o -c $@.c @@ -206,7 +206,7 @@ getstack2: getstack.o $(MPROTSH_TESTS): body.o shlibtest.so $(CC) $(CFLAGS) -o $@.o -c $@.c - $(CC) $(LDFLAGS) $(PTHREAD) -o $@ $@.o $^ + $(CC) $(LDFLAGS) -o $@ $@.o $^ $(PTHREAD) # used for RANDEXEC'd binaries retbody.o: body.c @@ -215,12 +215,12 @@ retbody.o: body.c # build as ET_EXEC (recommended by PaX Team, not really a requirement) $(RET_TESTS): retbody.o $(CC) $(CFLAGS) $(CC_ETEXEC) -o $@.o -c $@.c - $(CC) $(LDFLAGS) $(CC_ETEXEC) $(PTHREAD) -o $@ $< $@.o + $(CC) $(LDFLAGS) $(CC_ETEXEC) -o $@ $< $@.o $(PTHREAD) # build as ET_EXEC (not in Adamantix's Makefile) $(RETX_TESTS): retbody.o $(CC) $(CFLAGS) $(CC_ETEXEC) -o $@.o -c $@.c - $(CC) $(LDFLAGS) $(CC_ETEXEC) $(PTHREAD) -o $@ $< $@.o + $(CC) $(LDFLAGS) $(CC_ETEXEC) -o $@ $< $@.o $(PTHREAD) $(PAXBIN) -SPXM $@ # should also shlibbss.o and shlibdata.o be built w/ PIC? @@ -232,5 +232,5 @@ shlib%.so: shlib%.o $(CC) $(SHLDFLAGS) -shared -o $@ $< $(SHLIB_TESTS): body.o $(SHLIBS) shlibbss.o shlibdata.o - $(CC) $(LDFLAGS) $(PTHREAD) -o $@ body.o $@.o $(SHLIBS) -ldl + $(CC) $(LDFLAGS) -o $@ body.o $@.o $(SHLIBS) -ldl $(PTHREAD) |