| 1 |
haubi 09/04/16 20:25:04 |
| 2 |
|
| 3 |
Added: mico-2.3.13-aix.patch mico-2.3.13-pthread.patch |
| 4 |
Log: |
| 5 |
use gcc pthread flag instead of -lpthread. |
| 6 |
do not link -lstdc++ explicitly on aix. |
| 7 |
(Portage version: 2.1.6.7/cvs/Linux i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-misc/mico/files/mico-2.3.13-aix.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/mico/files/mico-2.3.13-aix.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/mico/files/mico-2.3.13-aix.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: mico-2.3.13-aix.patch |
| 16 |
=================================================================== |
| 17 |
Do not add '-lstdc++' explicitly, this is c++ compiler's job. |
| 18 |
--- admin/mico-shld.aix.in.orig 2009-04-02 17:33:03 +0200 |
| 19 |
+++ admin/mico-shld.aix.in 2009-04-02 17:33:22 +0200 |
| 20 |
@@ -87,7 +87,7 @@ |
| 21 |
|
| 22 |
|
| 23 |
ldcmd="@SHARED_CC@ @LDSOFLAGS@ @DLFLAGS@ $libdirs @LDFLAGS@ \ |
| 24 |
- -Wl,-bE:lib.exp,-bnoentry -o '$outfile' $args @LIBS@ -lstdc++" |
| 25 |
+ -Wl,-bE:lib.exp,-bnoentry -o '$outfile' $args @LIBS@" |
| 26 |
|
| 27 |
echo "$ldcmd" |
| 28 |
eval "$ldcmd" |
| 29 |
|
| 30 |
|
| 31 |
|
| 32 |
1.1 net-misc/mico/files/mico-2.3.13-pthread.patch |
| 33 |
|
| 34 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/mico/files/mico-2.3.13-pthread.patch?rev=1.1&view=markup |
| 35 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/mico/files/mico-2.3.13-pthread.patch?rev=1.1&content-type=text/plain |
| 36 |
|
| 37 |
Index: mico-2.3.13-pthread.patch |
| 38 |
=================================================================== |
| 39 |
When using gcc, use '-pthread' (or '-pthreads' on solaris) |
| 40 |
compiler flag to do all pthread specific things. |
| 41 |
--- configure.in.orig 2009-04-02 17:25:45 +0200 |
| 42 |
+++ configure.in 2009-04-02 17:32:00 +0200 |
| 43 |
@@ -524,7 +524,19 @@ |
| 44 |
) |
| 45 |
AC_CHECK_HEADERS(semaphore.h) |
| 46 |
AC_DEFINE(HAVE_PTHREADS) |
| 47 |
+ case "${GXX}:${target}" in |
| 48 |
+ yes:*solaris*|yes:*sunos*) |
| 49 |
+ CXXFLAGS="-pthreads ${CXXFLAGS}" |
| 50 |
+ LDFLAGS="-pthreads ${LDFLAGS}" |
| 51 |
+ ;; |
| 52 |
+ yes:*) |
| 53 |
+ CXXFLAGS="-pthread ${CXXFLAGS}" |
| 54 |
+ LDFLAGS="-pthread ${LDFLAGS}" |
| 55 |
+ ;; |
| 56 |
+ *) |
| 57 |
SHLIBS="-lpthread" |
| 58 |
+ ;; |
| 59 |
+ esac |
| 60 |
else |
| 61 |
AC_CHECK_LIB(c_r, pthread_create, use_pthreads=yes, use_pthreads=no) |
| 62 |
if test X"$use_pthreads" = Xyes; then |
| 63 |
--- configure.orig 2009-04-02 17:25:42 +0200 |
| 64 |
+++ configure 2009-04-02 17:32:00 +0200 |
| 65 |
@@ -2738,7 +2738,19 @@ |
| 66 |
#define HAVE_PTHREADS 1 |
| 67 |
EOF |
| 68 |
|
| 69 |
+ case "${GXX}:${target}" in |
| 70 |
+ yes:*solaris*|yes:*sunos*) |
| 71 |
+ CXXFLAGS="-pthreads ${CXXFLAGS}" |
| 72 |
+ LDFLAGS="-pthreads ${LDFLAGS}" |
| 73 |
+ ;; |
| 74 |
+ yes:*) |
| 75 |
+ CXXFLAGS="-pthread ${CXXFLAGS}" |
| 76 |
+ LDFLAGS="-pthread ${LDFLAGS}" |
| 77 |
+ ;; |
| 78 |
+ *) |
| 79 |
SHLIBS="-lpthread" |
| 80 |
+ ;; |
| 81 |
+ esac |
| 82 |
else |
| 83 |
echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 |
| 84 |
echo "configure:2745: checking for pthread_create in -lc_r" >&5 |
Archives