Fix building of paxtest-0.9.6 with -Wl,--as-needed wrt #246755.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/app-admin/paxtest/ChangeLog b/app-admin/paxtest/ChangeLog
index 04b367ccb4f0f415af185431b972463c3ab0fb19..455b8093c46926ba169d0344e85336ea60762265 100644 (file)
--- 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/Manifest b/app-admin/paxtest/Manifest
index fb372f61c1d8366fefef177e5eb51bbe46bf468b..f4803a3509ab5277e2b0b120e7d5f464ff79dc18 100644 (file)
--- a/app-admin/paxtest/Manifest
+++ b/app-admin/paxtest/Manifest
@@ -1,4 +1,4 @@
-AUX Makefile-portable 7373 RMD160 44309d63d083a166587861d4a7c8d891fe8dd68a SHA1 80b4a1cbf95befae84c49166b2f7900c7fdb7c85 SHA256 7a033aa44bcea376a0ff4fa267d13920d951b0a9d3eda14b1f531c7143c27303
+AUX Makefile-portable 7373 RMD160 bed87b6e723fb9042d6b1cd7379d9b1387bd9ba9 SHA1 50f8afbec0bfd2b7602a1734189dc1310298556c SHA256 856e805d432a52078534241ab5c79555a76eda0765d3cdf99b2173252c870842
 AUX Makefile.psm5 6157 RMD160 f385de3fbae354bbfda683587273f1f8e0edfb1c SHA1 c3981f529ef058e29499ee64534aca96a8d99a33 SHA256 6f8579361cfb3a055ae5450c6b3ffa7a07510e9382addb15fcf32f5541bf89a1
 AUX paxtest-0.9.5-use-fPIE.patch 813 RMD160 86f9d9456dbedde81853302f28bbe212aa8418ea SHA1 78e16661716988899cb2a1ba3b697a1fc07d099f SHA256 585f2d34cd438a3b9b3f05868f8a6e7a72af009c35e74feed4e33294a13fd2c6
 AUX paxtest-0.9.5.1.diff 2369 RMD160 7601b098ae29afb27de7d3460d777fb13c6d4824 SHA1 872b9c3e9a162bb3347bf07d6d447d74ddd98da3 SHA256 9b9ccde9603017be034d6ee3b63daa2ff7b2af5ba3b789429a58948bedf20a95
@@ -12,5 +12,5 @@ EBUILD paxtest-0.9.5-r1.ebuild 1081 RMD160 0ae06d595accb486e8f1897911f24b6ae8140
 EBUILD paxtest-0.9.6.ebuild 942 RMD160 7401506bbeb8f4e500e9040d2339138ac8a6fd5d SHA1 2e72d73b930d556bc41c365bc657cf14b37e1e06 SHA256 f89740e7cb91a19d4bf08c5731fca083d2754691ac5df03866ddabf0f54640bf
 EBUILD paxtest-0.9.7_pre4.ebuild 1134 RMD160 075c0c738647a6ac2acc4dff6777aab711c40ed7 SHA1 39b157f8699b88ba0369be979f95bb667696e56f SHA256 9a4c81a916da64386b4d35cdd9c60b15cd8f8639e33182471d5fa5acd69ceb65
 EBUILD paxtest-0.9.7_pre5.ebuild 1745 RMD160 c7b25f22e15e3f27302d171c3e11fef8e056fdc0 SHA1 31f4bbfc567035e632269edf799f8eab49c7f8dd SHA256 c431fdd351f48b80cbd61349cba85623a01211531553bcae42b3e3be5e731309
-MISC ChangeLog 4738 RMD160 9d3d31827333a4542274ed5b2dd5a97a1385be93 SHA1 7ba1eb46f91709b79213e3ebeb5f7bd9f68f792b SHA256 376c03c37e0697bab9e2de1cffcebf8f84f3394debc5fb46c37fbbefa4d735f9
+MISC ChangeLog 4886 RMD160 b52d719a4c70384c08d139430c7498ed33d828fa SHA1 0c2802a235af94c3914a54e6b3d90325b91c3b5d SHA256 dea0d11d3dcabb6fa9a5e89633e082578400036e8e2a6bb2a8ea59f78c682701
 MISC metadata.xml 1075 RMD160 8e3cfd11e2a8fa1334390dd6503ba82a32a08fb8 SHA1 b12c5c2530c840f69ce3b3a1d267bd195a107b35 SHA256 92a9af0326aa50db1957e3a9088da6c416a26e82f1208ff2c8f94be40ed41f46

diff --git a/app-admin/paxtest/files/Makefile-portable b/app-admin/paxtest/files/Makefile-portable
index 30c0653f5e4d72bc6dcf99f9a8def49060fb793b..65142e426daa04aca9cd83df65fa9d6d8f57b397 100644 (file)
--- 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)