dev-util/exmap: Fixed compilation bug with -Wl,--as-needed

svn path=/sunrise/; revision=11100

diff --git a/dev-util/exmap/ChangeLog b/dev-util/exmap/ChangeLog
index 5ad30cad853333e5ab3aa51f2de7def28137a96d..45a73ce96362475cda4533a62d04d6ac3977a039 100644 (file)
--- a/dev-util/exmap/ChangeLog
+++ b/dev-util/exmap/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  08 Aug 2010; Michael Weber (xmw) <gentoo@xmw.de> exmap-0.10.ebuild,
+  +files/exmap-0.10-as-needed.patch:
+  Fixed compilation bug with -Wl,--as-needed
+
   14 May 2010; Michael Weber (xmw) <gentoo@xmw.de> exmap-0.10.ebuild,
   +files/exmap-0.10-gcc45.patch:
   Fixed critical compilation error with sys-devel/gcc:4.5

diff --git a/dev-util/exmap/Manifest b/dev-util/exmap/Manifest
index 3dcd960add2cfe540fbc6167d726ada9cc6ff138..d34ef064109e71772b6cc7fc3d8b75e0f7c72747 100644 (file)
--- a/dev-util/exmap/Manifest
+++ b/dev-util/exmap/Manifest
@@ -1,9 +1,10 @@
+AUX exmap-0.10-as-needed.patch 499 RMD160 f1b582f11e437740b4878c47f1df454b4927cc5c SHA1 f487eb98e279b5f265bdd98b95871fb238fbc2d7 SHA256 65bd41db5828ed9859fabf40db7c8e6e01e1b7bfe9d7c1aea8f2757b5b4ff7e0
 AUX exmap-0.10-fix64bit.patch 855 RMD160 9b6186788b3dae78ff50f1c23cf8139b48dd92a0 SHA1 95819ab3bd91a3fccb57c7cb2c529038c0e3c33c SHA256 89aae22c8450137dd3ebb88b2d3acbea7a04c08a1a075dbab7d265e7dd3277a0
 AUX exmap-0.10-gcc.patch 1827 RMD160 afbdefc11eeed6ba2818f237de374d7ed886bb5c SHA1 a7504340c54f9925699b83458b44a24e5e3cf282 SHA256 6a204d45dada0507b73214179cec6cbe62188f584e34ae6751769e2b32d89d89
 AUX exmap-0.10-gcc45.patch 318 RMD160 e4ec7c82dd1543d58858f8e2e7e0d3ea0dac3022 SHA1 5bdc78209927d2506831e426895ae0da22529f22 SHA256 3e8d02989339543b797ffe306f3d4c997869a5fa5edbfd8aefbe0afc6ea509ad
 AUX exmap-0.10-kernel.patch 1694 RMD160 b74aa4c04e1ecd7bc40c6255c3b6c3a7c6feb7fe SHA1 a8701cc8609f4157f9fc8c29ab0b2bb35d98e492 SHA256 d41e2296b063e7c982929deae8d23d2ee2099f249df7965f84c0ece9de81be92
 AUX exmap-0.10-makefiles.patch 3400 RMD160 a930b6401b1103d341ed76f073d27637a995843f SHA1 89e14d4e7ef39761bd65389281eef63ad0adecc9 SHA256 37203da662b807f98cf11dc1e32a2a0723c5dcfb212871b7b2b073e14be1d4b2
 DIST exmap-0.10.tgz 124620 RMD160 56b4fe3738c9aad8def0a445b8a3bb6e51eedef9 SHA1 e9549e39ab830b94941975c0e393e5ef0d8db6fb SHA256 f6d5feffa53afa3e1321df91b127cdf403f7239076539eeef9aab665286c007c
-EBUILD exmap-0.10.ebuild 1822 RMD160 68f775f72c0ca64f213669d3b3a67f9f9d378ef8 SHA1 4a3d9456e049b122ebd764e471464d28c189ea6f SHA256 d812bc1fc65e74e2dceacce22df004b352c01e9edfdd2c283128d94a43ed9306
-MISC ChangeLog 581 RMD160 7b302ce9f6bfb616c27d47969edebdcd79cc2cde SHA1 e9c431f7fc8a6b16db06e9900bec4ff691d5144a SHA256 9b92c99d7a8dea3997833e15364ede3b399cd132cd94950dc4bab8d30442c02e
+EBUILD exmap-0.10.ebuild 1907 RMD160 8a1f7ec9a41898c261bddde83c23211677b50328 SHA1 326e115dc38c8aff66b1ba63dfe3fb3de1bc0790 SHA256 3474bf9e5695d79ee6844d0e8c5cfafc7e629e0e4e90b2b4c9d7e8651aded8c2
+MISC ChangeLog 734 RMD160 e5f30c2c9e51c67c1b9ef32a320b4ff6e035e5b0 SHA1 cae5163437b97b77b61bbd04f7db3aca4d999b09 SHA256 ee2a7e7717c09fde686b92fe17e29e29441741a77b0bd96fb0cc0183fc250422
 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f

diff --git a/dev-util/exmap/exmap-0.10.ebuild b/dev-util/exmap/exmap-0.10.ebuild
index ca0f7cf10fa1c9434251404241b04b0e09cddd13..7cce6b67be05257170f552341159209c56aacf3c 100644 (file)
--- a/dev-util/exmap/exmap-0.10.ebuild
+++ b/dev-util/exmap/exmap-0.10.ebuild
@@ -46,6 +46,9 @@ src_prepare() {
        # fix for 64bit from http://www.kdedevelopers.org/node/4166
        epatch "${FILESDIR}/${P}-fix64bit.patch"
 
+       # fix underlinking with -Wl,--as-needed
+       epatch "${FILESDIR}/${P}-as-needed.patch"
+
        rm -v src/{*.so,munged-ls-threeloads,prelinked-amule} || die
 }
 

diff --git a/dev-util/exmap/files/exmap-0.10-as-needed.patch b/dev-util/exmap/files/exmap-0.10-as-needed.patch
new file mode 100644 (file)
index 0000000..72671b3
--- /dev/null
+++ b/dev-util/exmap/files/exmap-0.10-as-needed.patch
@@ -0,0 +1,21 @@
+--- src/Makefile       2010-08-09 01:17:29.000000000 +0200
++++ src/Makefile       2010-08-09 01:21:13.000000000 +0200
+@@ -42,15 +42,15 @@
+ OBJS += $(TR_OBJ)
+ TESTS +=  t_range
+ 
+-TE_OBJ = t_elf.o Elf.o Range.o
++TE_OBJ = t_elf.o Elf.o Range.o ../jutil/Pcre.o
+ OBJS += $(TE_OBJ)
+ TESTS +=  t_elf
+ 
+-TP_OBJ = t_pcre.o
++TP_OBJ = t_pcre.o ../jutil/Pcre.o
+ OBJS += $(TP_OBJ)
+ TESTS +=  t_pcre
+ 
+-TX_OBJ = t_exmap.o $(EXMAP_OBJ)
++TX_OBJ = t_exmap.o ../jutil/Pcre.o $(EXMAP_OBJ)
+ OBJS += $(TX_OBJ)
+ TESTS +=  t_exmap
+