summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-06-29 19:18:33 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-06-29 19:18:33 +0000
commit88c966a5c1cfa1ed4bfe5a44fad0258c4138f0d0 (patch)
tree27e5572813b57aaf2080f165d15ea07d565f6a86 /app-admin/paxtest
parentFix building with -Wl,--as-needed wrt #247067 by Diego E. Pettenò and Kacper... (diff)
downloadgentoo-2-88c966a5c1cfa1ed4bfe5a44fad0258c4138f0d0.tar.gz
gentoo-2-88c966a5c1cfa1ed4bfe5a44fad0258c4138f0d0.tar.bz2
gentoo-2-88c966a5c1cfa1ed4bfe5a44fad0258c4138f0d0.zip
Fix building of paxtest-0.9.7_pre4 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/ChangeLog7
-rw-r--r--app-admin/paxtest/files/Makefile.psm510
2 files changed, 10 insertions, 7 deletions
diff --git a/app-admin/paxtest/ChangeLog b/app-admin/paxtest/ChangeLog
index 23b69eb5628b..04b367ccb4f0 100644
--- a/app-admin/paxtest/ChangeLog
+++ b/app-admin/paxtest/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-admin/paxtest
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/paxtest/ChangeLog,v 1.33 2009/10/11 23:39:34 halcy0n Exp $
+# 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 $
+
+ 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.
11 Oct 2009; Mark Loeser <halcy0n@gentoo.org> paxtest-0.9.5-r1.ebuild,
paxtest-0.9.6.ebuild, paxtest-0.9.7_pre4.ebuild:
diff --git a/app-admin/paxtest/files/Makefile.psm5 b/app-admin/paxtest/files/Makefile.psm5
index 54c94480c1c3..8c42af9875bd 100644
--- a/app-admin/paxtest/files/Makefile.psm5
+++ b/app-admin/paxtest/files/Makefile.psm5
@@ -132,7 +132,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
@@ -178,7 +178,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
@@ -187,12 +187,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) $(LD_ETEXEC) $(PTHREAD) -o $@ $< $@.o
+ $(CC) $(LDFLAGS) $(LD_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) $(LD_ETEXEC) $(PTHREAD) -o $@ $< $@.o
+ $(CC) $(LDFLAGS) $(LD_ETEXEC) -o $@ $< $@.o $(PTHREAD)
$(PAXBIN) -SPXM $@
# should also shlibbss.o and shlibdata.o be built w/ PIC?
@@ -204,4 +204,4 @@ 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) $(DL)
+ $(CC) $(LDFLAGS) -o $@ body.o $@.o $(SHLIBS) $(DL) $(PTHREAD)