Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Markus Dittrich (markusle)" <markusle@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-cluster/mpich2/files: mpich2-1.0.6-fPIC.patch
Date: Fri, 09 May 2008 13:27:34
Message-Id: E1JuSdE-0001mU-7v@stork.gentoo.org
1 markusle 08/05/09 13:27:28
2
3 Modified: mpich2-1.0.6-fPIC.patch
4 Log:
5 Fixed broken patch (bug #220877).
6 (Portage version: 2.1.5_rc7)
7
8 Revision Changes Path
9 1.2 sys-cluster/mpich2/files/mpich2-1.0.6-fPIC.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/mpich2/files/mpich2-1.0.6-fPIC.patch?rev=1.2&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/mpich2/files/mpich2-1.0.6-fPIC.patch?rev=1.2&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/mpich2/files/mpich2-1.0.6-fPIC.patch?r1=1.1&r2=1.2
14
15 Index: mpich2-1.0.6-fPIC.patch
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/files/mpich2-1.0.6-fPIC.patch,v
18 retrieving revision 1.1
19 retrieving revision 1.2
20 diff -u -r1.1 -r1.2
21 --- mpich2-1.0.6-fPIC.patch 3 Dec 2007 06:03:03 -0000 1.1
22 +++ mpich2-1.0.6-fPIC.patch 9 May 2008 13:27:27 -0000 1.2
23 @@ -1,13 +1,35 @@
24 ---- configure.orig 2007-10-10 20:59:53.000000000 -0700
25 -+++ configure 2007-10-10 21:04:17.000000000 -0700
26 -@@ -8783,24 +8783,24 @@
27 +diff -Naur mpich2-1.0.6p1/confdb/aclocal_shl.m4 mpich2-1.0.6p1.new/confdb/aclocal_shl.m4
28 +--- mpich2-1.0.6p1/confdb/aclocal_shl.m4 2007-05-16 09:39:01.000000000 -0400
29 ++++ mpich2-1.0.6p1.new/confdb/aclocal_shl.m4 2008-05-09 09:04:35.000000000 -0400
30 +@@ -89,7 +89,7 @@
31 + # For example, include the libname as ${LIBNAME_SHL}
32 + #C_LINK_SHL='${CC} -shared -Wl,-h,<finallibname>'
33 + # May need -fPIC
34 +- CC_SHL='${CC} -fpic'
35 ++ CC_SHL='${CC} -fPIC'
36 + #C_LINKPATH_SHL="-Wl,-rpath -Wl,"
37 + # More recent versions allow multiple args, separated by commas
38 + C_LINKPATH_SHL="-Wl,-rpath,"
39 +@@ -233,7 +233,7 @@
40 + gcc)
41 + # For example, include the libname as ${LIBNAME_SHL}
42 + #C_LINK_SHL='${CC} -shared -Wl,-h,<finallibname>'
43 +- pac_cc_sharedlibs='gcc -shared -fpic'
44 ++ pac_cc_sharedlibs='gcc -shared -fPIC'
45 + pac_clink_sharedlibs='gcc -shared'
46 + ;;
47 + libtool)
48 +diff -Naur mpich2-1.0.6p1/configure mpich2-1.0.6p1.new/configure
49 +--- mpich2-1.0.6p1/configure 2008-05-09 09:08:14.000000000 -0400
50 ++++ mpich2-1.0.6p1.new/configure 2008-05-09 09:06:52.000000000 -0400
51 +@@ -9061,24 +9061,24 @@
52 # if the compiler allows it (e.g., building with gcc but
53 # a different Fortran compiler. Another option is to
54 # *require* g77.
55 -- { echo "$as_me:$LINENO: checking whether $F77 allows -shared -fpic" >&5
56 --echo $ECHO_N "checking whether $F77 allows -shared -fpic... $ECHO_C" >&6; }
57 -+ { echo "$as_me:$LINENO: checking whether $F77 allows -shared -fPIC" >&5
58 -+echo $ECHO_N "checking whether $F77 allows -shared -fPIC... $ECHO_C" >&6; }
59 +- { $as_echo "$as_me:$LINENO: checking whether $F77 allows -shared -fpic" >&5
60 +-$as_echo_n "checking whether $F77 allows -shared -fpic... " >&6; }
61 ++ { $as_echo "$as_me:$LINENO: checking whether $F77 allows -shared -fPIC" >&5
62 ++$as_echo_n "checking whether $F77 allows -shared -fPIC... " >&6; }
63 rm -f conftest.f
64 cat > conftest.f <<EOF
65 program main
66 @@ -17,23 +39,23 @@
67 - FC_SHL="$F77 -shared -fpic"
68 + if $F77 -shared -fPIC -o conftest conftest.f >/dev/null 2>&1 ; then
69 + FC_SHL="$F77 -shared -fPIC"
70 - { echo "$as_me:$LINENO: result: yes" >&5
71 - echo "${ECHO_T}yes" >&6; }
72 + { $as_echo "$as_me:$LINENO: result: yes" >&5
73 + $as_echo "yes" >&6; }
74 else
75 - { echo "$as_me:$LINENO: result: no" >&5
76 - echo "${ECHO_T}no" >&6; }
77 -- { echo "$as_me:$LINENO: checking whether $F77 allows -fpic" >&5
78 --echo $ECHO_N "checking whether $F77 allows -fpic... $ECHO_C" >&6; }
79 + { $as_echo "$as_me:$LINENO: result: no" >&5
80 + $as_echo "no" >&6; }
81 +- { $as_echo "$as_me:$LINENO: checking whether $F77 allows -fpic" >&5
82 +-$as_echo_n "checking whether $F77 allows -fpic... " >&6; }
83 - if $F77 -fpic -o conftest conftest.f >/dev/null 2>&1 ; then
84 - FC_SHL="$F77 -fpic"
85 -+ { echo "$as_me:$LINENO: checking whether $F77 allows -fPIC" >&5
86 -+echo $ECHO_N "checking whether $F77 allows -fPIC... $ECHO_C" >&6; }
87 ++ { $as_echo "$as_me:$LINENO: checking whether $F77 allows -fPIC" >&5
88 ++$as_echo_n "checking whether $F77 allows -fPIC... " >&6; }
89 + if $F77 -fPIC -o conftest conftest.f >/dev/null 2>&1 ; then
90 + FC_SHL="$F77 -fPIC"
91 - { echo "$as_me:$LINENO: result: yes" >&5
92 - echo "${ECHO_T}yes" >&6; }
93 + { $as_echo "$as_me:$LINENO: result: yes" >&5
94 + $as_echo "yes" >&6; }
95 else
96 -@@ -9837,7 +9837,7 @@
97 +@@ -10118,7 +10118,7 @@
98 gcc)
99 if test "$pac_cv_f90_vendor" = gnu -o "$F90" = "g95" ; then
100 # If we have the GNU Fortran 95 compiler (untested)
101 @@ -42,7 +64,7 @@
102 F90_LINKPATH_SHL="-Wl,-rpath -Wl,"
103 else
104 case "$pac_cv_f90_vendor" in
105 -@@ -9848,13 +9848,13 @@
106 +@@ -10129,13 +10129,13 @@
107
108 intel)
109 # Intel implements the GNU options
110 @@ -58,7 +80,7 @@
111 F90_LINKPATH_SHL="-Wl,-rpath -Wl,"
112 ;;
113
114 -@@ -10852,7 +10852,7 @@
115 +@@ -11155,7 +11155,7 @@
116 ;;
117 gcc)
118 # Assume that the compiler is g++ if gcc style shared libraries chosen
119 @@ -67,7 +89,7 @@
120 CXX_LINKPATH_SHL="-Wl,-rpath -Wl,"
121 ;;
122 cygwin|cygwin-gcc)
123 -@@ -12571,7 +12571,7 @@
124 +@@ -12906,7 +12906,7 @@
125 # For example, include the libname as ${LIBNAME_SHL}
126 #C_LINK_SHL='${CC} -shared -Wl,-h,<finallibname>'
127 # May need -fPIC
128 @@ -76,27 +98,7 @@
129 #C_LINKPATH_SHL="-Wl,-rpath -Wl,"
130 # More recent versions allow multiple args, separated by commas
131 C_LINKPATH_SHL="-Wl,-rpath,"
132 -@@ -12839,7 +12839,7 @@
133 - gcc)
134 - # For example, include the libname as ${LIBNAME_SHL}
135 - #C_LINK_SHL='${CC} -shared -Wl,-h,<finallibname>'
136 -- pac_cc_sharedlibs='gcc -shared -fpic'
137 -+ pac_cc_sharedlibs='gcc -shared -fPIC'
138 - pac_clink_sharedlibs='gcc -shared'
139 - ;;
140 - libtool)
141 ---- confdb/aclocal_shl.m4.orig 2007-05-16 06:39:01.000000000 -0700
142 -+++ confdb/aclocal_shl.m4 2007-10-10 21:05:15.000000000 -0700
143 -@@ -89,7 +89,7 @@
144 - # For example, include the libname as ${LIBNAME_SHL}
145 - #C_LINK_SHL='${CC} -shared -Wl,-h,<finallibname>'
146 - # May need -fPIC
147 -- CC_SHL='${CC} -fpic'
148 -+ CC_SHL='${CC} -fPIC'
149 - #C_LINKPATH_SHL="-Wl,-rpath -Wl,"
150 - # More recent versions allow multiple args, separated by commas
151 - C_LINKPATH_SHL="-Wl,-rpath,"
152 -@@ -233,7 +233,7 @@
153 +@@ -13174,7 +13174,7 @@
154 gcc)
155 # For example, include the libname as ${LIBNAME_SHL}
156 #C_LINK_SHL='${CC} -shared -Wl,-h,<finallibname>'
157
158
159
160 --
161 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups