use gcc pthread flag instead of -lpthread.

do not link -lstdc++ explicitly on aix.
Package-Manager: portage-2.1.6.7/cvs/Linux i686

5 files changed, 77 insertions, 4 deletions

diff --git a/net-misc/mico/ChangeLog b/net-misc/mico/ChangeLog
index c2184d8effbc..4370d2986ced 100644
--- a/net-misc/mico/ChangeLog
+++ b/net-misc/mico/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/mico
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/ChangeLog,v 1.19 2009/04/07 08:33:33 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/ChangeLog,v 1.20 2009/04/16 20:25:03 haubi Exp $
+
+  16 Apr 2009; Michael Haubenwallner <haubi@gentoo.org>
+  +files/mico-2.3.13-aix.patch, +files/mico-2.3.13-pthread.patch,
+  mico-2.3.13.ebuild:
+  use gcc pthread flag instead of -lpthread.
+  do not link -lstdc++ explicitly on aix.
 
   07 Apr 2009; Michael Haubenwallner <haubi@gentoo.org> metadata.xml:
   added <longdescription lang=en/>
diff --git a/net-misc/mico/Manifest b/net-misc/mico/Manifest
index b98a7f4f2234..9250dd8bf505 100644
--- a/net-misc/mico/Manifest
+++ b/net-misc/mico/Manifest
@@ -1,7 +1,9 @@
 AUX gtk-config 87 RMD160 372fe81433c28726f71cf99986c9142f20605433 SHA1 973a86ac03cd251315e7b0a7a72d23603f1823c5 SHA256 95dc7514f6a305656ca9b973321e02a0376e9397ad6ad323f65d7601cfd7f015
+AUX mico-2.3.13-aix.patch 411 RMD160 a6f750d3e15e39b5b3e89645484bb631b6ec5eaa SHA1 ca97fbaf38ea738273c2f051decda928484b5bf4 SHA256 0823e1d621ba0e313ba00b675ffc650c2ebc83138b0ec21d5ab6b9dd3e5b9c9f
 AUX mico-2.3.13-gcc43.patch 752 RMD160 767d448586b2ab8e773f8145ca77f23ea0cf317a SHA1 d6c1ef757d3cedad9b1fc2b5846a9ee16dc41538 SHA256 be64300153630158eab537dda057204159b482372b17b54ccc2177a7d884a535
 AUX mico-2.3.13-nolibcheck.patch 1124 RMD160 557c3588420938cef2365c86ff22a67c6c7594f9 SHA1 ac73d6113a2c0f65c4f6912a8a58e944a3d97d94 SHA256 bbc92cbfa298ac292d80f76859594430c0581af564df9fad7f5870d92fd3d333
+AUX mico-2.3.13-pthread.patch 1317 RMD160 1ef269452add11a18e5c313c126029afb1a110ea SHA1 f226c9882472b574431c39d23a82217f2c253bc9 SHA256 485f1e35fb71643f2d3c1181cd96d75e7c2174fe4cae5d2537a51ad43aa7b8ff
 DIST mico-2.3.13.tar.gz 3269814 RMD160 70c8b9e68deac853ed2a28f48cd719bdef4e60fb SHA1 ee0138deb4d9ad0a50fe18e0b2add99fb5831c93 SHA256 a355fd0205440f0c8793b68d105b179942d883babc6b1fe69113707b88fe1d69
-EBUILD mico-2.3.13.ebuild 2792 RMD160 db38b142b1559437280cbd7f918ce47700ee8f4e SHA1 ff1a59e47dce5159aa785f92ecda7b63a9d9e23c SHA256 72b7877147db7b6f2984e595d16a0e06b630adedc6accf3db771d94440afc0bb
-MISC ChangeLog 1068 RMD160 26ea030c6191da1746455e7bfe294036a1917c9c SHA1 c549e65b3ca54b9efaa64e98f87cb7f8553412f4 SHA256 c0115123f32ecc13640253c5652b09a8fb22498658d753393d6f375c20b3c151
+EBUILD mico-2.3.13.ebuild 3068 RMD160 3974884b362a387ed88a0af5203c82236447adbb SHA1 ca412e198c825b76a75f19ab1f68658dee7c9b7b SHA256 552e9846b24b2cd97bb24d49cc18dadeb6a78e074f8d9b8689d1712371405ae1
+MISC ChangeLog 1300 RMD160 8d716ff16efee98b3ea055d5c7b42e91912fff24 SHA1 14ce5a5bf33a361f166dee0f94aa59770c46f468 SHA256 358e92d4c19c4062b755a4c11fb91c427c2a48947461467baf596f9db2649632
 MISC metadata.xml 640 RMD160 7c861b35cb15bad094830b9e83d0077fb7177a4b SHA1 5426b40b5f7a464c4a4577bef86ab0fcd1be117f SHA256 1f8be72dd1c133d7a282c5e5564466680dff87ed0c5daf688b6dca00327d9f85
diff --git a/net-misc/mico/files/mico-2.3.13-aix.patch b/net-misc/mico/files/mico-2.3.13-aix.patch
new file mode 100644
index 000000000000..feac0f71a293
--- /dev/null
+++ b/net-misc/mico/files/mico-2.3.13-aix.patch
@@ -0,0 +1,12 @@
+Do not add '-lstdc++' explicitly, this is c++ compiler's job.
+--- admin/mico-shld.aix.in.orig	2009-04-02 17:33:03 +0200
++++ admin/mico-shld.aix.in	2009-04-02 17:33:22 +0200
+@@ -87,7 +87,7 @@
+ 
+ 
+ ldcmd="@SHARED_CC@ @LDSOFLAGS@ @DLFLAGS@ $libdirs @LDFLAGS@ \
+- -Wl,-bE:lib.exp,-bnoentry -o '$outfile' $args @LIBS@ -lstdc++"
++ -Wl,-bE:lib.exp,-bnoentry -o '$outfile' $args @LIBS@"
+ 
+ echo "$ldcmd"
+ eval "$ldcmd"
diff --git a/net-misc/mico/files/mico-2.3.13-pthread.patch b/net-misc/mico/files/mico-2.3.13-pthread.patch
new file mode 100644
index 000000000000..f2c419e44235
--- /dev/null
+++ b/net-misc/mico/files/mico-2.3.13-pthread.patch
@@ -0,0 +1,46 @@
+When using gcc, use '-pthread' (or '-pthreads' on solaris)
+compiler flag to do all pthread specific things.
+--- configure.in.orig	2009-04-02 17:25:45 +0200
++++ configure.in	2009-04-02 17:32:00 +0200
+@@ -524,7 +524,19 @@
+       )
+       AC_CHECK_HEADERS(semaphore.h)
+       AC_DEFINE(HAVE_PTHREADS)
++      case "${GXX}:${target}" in
++      yes:*solaris*|yes:*sunos*)
++        CXXFLAGS="-pthreads ${CXXFLAGS}"
++        LDFLAGS="-pthreads ${LDFLAGS}"
++	;;
++      yes:*)
++	CXXFLAGS="-pthread ${CXXFLAGS}"
++	LDFLAGS="-pthread ${LDFLAGS}"
++	;;
++      *)
+       SHLIBS="-lpthread"
++      ;;
++      esac
+     else 
+       AC_CHECK_LIB(c_r, pthread_create, use_pthreads=yes, use_pthreads=no)
+       if test X"$use_pthreads" = Xyes; then
+--- configure.orig	2009-04-02 17:25:42 +0200
++++ configure	2009-04-02 17:32:00 +0200
+@@ -2738,7 +2738,19 @@
+ #define HAVE_PTHREADS 1
+ EOF
+ 
++      case "${GXX}:${target}" in
++      yes:*solaris*|yes:*sunos*)
++        CXXFLAGS="-pthreads ${CXXFLAGS}"
++        LDFLAGS="-pthreads ${LDFLAGS}"
++	;;
++      yes:*)
++	CXXFLAGS="-pthread ${CXXFLAGS}"
++	LDFLAGS="-pthread ${LDFLAGS}"
++	;;
++      *)
+       SHLIBS="-lpthread"
++        ;;
++      esac
+     else 
+       echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
+ echo "configure:2745: checking for pthread_create in -lc_r" >&5
diff --git a/net-misc/mico/mico-2.3.13.ebuild b/net-misc/mico/mico-2.3.13.ebuild
index 475cde80ecd9..707cd4ba129b 100644
--- a/net-misc/mico/mico-2.3.13.ebuild
+++ b/net-misc/mico/mico-2.3.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/mico-2.3.13.ebuild,v 1.3 2009/03/31 12:13:18 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mico/mico-2.3.13.ebuild,v 1.4 2009/04/16 20:25:03 haubi Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -37,6 +37,13 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/${P}-nolibcheck.patch
 	epatch "${FILESDIR}"/${P}-gcc43.patch
+	epatch "${FILESDIR}"/${P}-pthread.patch
+	epatch "${FILESDIR}"/${P}-aix.patch
+
+	# cannot use big TOC (AIX only), gdb doesn't like it.
+	# This assumes that the compiler (or -wrapper) uses
+	# gcc flag '-mminimal-toc' for compilation.
+	sed -i -e 's/,-bbigtoc//' "${S}"/configure
 }
 
 src_compile() {