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

Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-chemistry/pdb-extract/files: pdb-extract-3.11-cflags-install.patch pdb-extract-3.11-gcc-4.7.patch
Date: Sat, 23 Jun 2012 18:57:15
Message-Id: 20120623185705.C5B4E2004C@flycatcher.gentoo.org
1 jlec 12/06/23 18:57:05
2
3 Added: pdb-extract-3.11-cflags-install.patch
4 pdb-extract-3.11-gcc-4.7.patch
5 Log:
6 sci-chemistry/pdb-extract: Version Bump, #379159
7
8 (Portage version: 2.2.0_alpha111/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.1 sci-chemistry/pdb-extract/files/pdb-extract-3.11-cflags-install.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/pdb-extract/files/pdb-extract-3.11-cflags-install.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/pdb-extract/files/pdb-extract-3.11-cflags-install.patch?rev=1.1&content-type=text/plain
15
16 Index: pdb-extract-3.11-cflags-install.patch
17 ===================================================================
18 Makefile | 2 +-
19 etc/make.platform.darwin3 | 4 ++--
20 etc/make.platform.darwin4 | 4 ++--
21 etc/make.platform.gnu3 | 20 +++++++++++---------
22 etc/make.platform.gnu4 | 20 +++++++++++---------
23 5 files changed, 27 insertions(+), 23 deletions(-)
24
25 diff --git a/Makefile b/Makefile
26 index 627d256..72c7e59 100644
27 --- a/Makefile
28 +++ b/Makefile
29 @@ -52,7 +52,7 @@ compile:
30 echo "------------------------------------------------------------"; \
31 echo "**** Making $$libdir ****"; \
32 echo "------------------------------------------------------------"; \
33 - (cd $$libdir && $(MAKE) -f $(MAKEFILE) "OPT=-O" install) || exit 1; \
34 + (cd $$libdir && $(MAKE) -f $(MAKEFILE) C_OPT="${CFLAGS}" CCC_OPT="${CXXFLAGS}" F_OPT="${FFLAGS}" LDFLAGS_OPT="${LDFLAGS}" install) || exit 1; \
35 done
36
37 beta:
38 diff --git a/etc/make.platform.darwin3 b/etc/make.platform.darwin3
39 index c5f7b06..4c1c97c 100644
40 --- a/etc/make.platform.darwin3
41 +++ b/etc/make.platform.darwin3
42 @@ -91,7 +91,7 @@ GDEFINES=$(PLATFORM) $(COMPILER)
43 DEFINES=$(GDEFINES) $(LDEFINES)
44
45 ## Global include directories
46 -GINCLUDES=
47 +GINCLUDES=-I@GENTOO_PORTAGE_EPREFIX@/usr/include/cifparse-obj
48
49 # Collect all include directories from global include directories and
50 # include directories specified in module makefile
51 @@ -159,7 +159,7 @@ F77LIBS=
52 STATIC_LINKING=
53
54 # Linker flags
55 -LDFLAGS=$(ABI) -w $(STATIC_LINKING)
56 +LDFLAGS=$(LDFLAGS_OPT) $(ABI) -w $(STATIC_LINKING)
57
58 # Fortran linker
59 F77_LINKER=f77
60 diff --git a/etc/make.platform.darwin4 b/etc/make.platform.darwin4
61 index 4619b34..f481fdb 100644
62 --- a/etc/make.platform.darwin4
63 +++ b/etc/make.platform.darwin4
64 @@ -92,7 +92,7 @@ GDEFINES=$(PLATFORM) $(COMPILER)
65 DEFINES=$(GDEFINES) $(LDEFINES)
66
67 ## Global include directories
68 -GINCLUDES=
69 +GINCLUDES=-I@GENTOO_PORTAGE_EPREFIX@/usr/include/cifparse-obj
70
71 # Collect all include directories from global include directories and
72 # include directories specified in module makefile
73 @@ -160,7 +160,7 @@ F77LIBS=
74 STATIC_LINKING=
75
76 # Linker flags
77 -LDFLAGS=$(ABI) -w $(STATIC_LINKING)
78 +LDFLAGS=$(LDFLAGS_OPT) $(ABI) -w $(STATIC_LINKING)
79
80 # Fortran linker
81 F77_LINKER=f77
82 diff --git a/etc/make.platform.gnu3 b/etc/make.platform.gnu3
83 index 7fd442e..9bec4dc 100644
84 --- a/etc/make.platform.gnu3
85 +++ b/etc/make.platform.gnu3
86 @@ -6,6 +6,8 @@
87 ##
88 ##########################################################################
89
90 +LIBDIR=@GENTOO_PORTAGE_EPREFIX@/usr/GENTOOLIBDIR
91 +
92 #-----Lexer and Parser section-------------------------------------------#
93
94 # Lexer executable
95 @@ -89,7 +91,7 @@ GDEFINES=$(PLATFORM) $(COMPILER)
96 DEFINES=$(GDEFINES) $(LDEFINES)
97
98 ## Global include directories
99 -GINCLUDES=
100 +GINCLUDES=-I@GENTOO_PORTAGE_EPREFIX@/usr/include/cifparse-obj
101
102 # Collect all include directories from global include directories and
103 # include directories specified in module makefile
104 @@ -107,8 +109,8 @@ NON_ANSI_C_FLAG=
105 C_WARNINGS=$(WARNINGS)
106
107 # C compiler flags
108 -CFLAGS=$(OPT) $(ABI) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES)
109 -CFLAGS_NONANSI=$(OPT) $(ABI) $(NON_ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) \
110 +CFLAGS=$(C_OPT) $(ABI) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES)
111 +CFLAGS_NONANSI=$(C_OPT) $(ABI) $(NON_ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) \
112 $(INCLUDES)
113
114 ## C++ compiler
115 @@ -128,9 +130,9 @@ C_PLUS_WARNINGS=$(WARNINGS) $(NO_DEPRECATED)
116 EXT=C
117
118 # C++ compiler flags
119 -C++FLAGS=$(OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) $(DEFINES) \
120 +C++FLAGS=$(CCC_OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) $(DEFINES) \
121 $(INCLUDES)
122 -C++FLAGS_NONANSI=$(OPT) $(ABI) $(NON_ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \
123 +C++FLAGS_NONANSI=$(CCC_OPT) $(ABI) $(NON_ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \
124 $(DEFINES) $(INCLUDES)
125 # C++FLAGS_RELAXED should be set to avoid warnings reported by third party
126 # source code that is not maintained by PDB
127 @@ -144,7 +146,7 @@ C++FLAGS_RELAXED=$(OPT) $(ABI) $(ANSI_C_PLUS_FLAG) $(NO_DEPRECATED) $(DEFINES) \
128 F77=f77
129
130 # Fortran compiler flags
131 -FFLAGS=-O -u
132 +FFLAGS=$(F_OPT)
133
134 # Additional Fortran libraries
135 F77LIBS=
136 @@ -154,11 +156,11 @@ F77LIBS=
137 #-----Linkers section----------------------------------------------------#
138
139 # Static linking option. If not defined, dynamic linking is used.
140 -STATIC_LINKING=-static
141 +STATIC_LINKING=
142
143 # Linker flags
144 -LDFLAGS=$(ABI) -w $(STATIC_LINKING)
145 -LDFLAGS_NO_STATIC=$(ABI) -w
146 +LDFLAGS=$(LDFLAGS_OPT) $(ABI) -w $(STATIC_LINKING)
147 +LDFLAGS_NO_STATIC=$(LDFLAGS_OPT) $(ABI) -w
148
149 # Fortran linker
150 F77_LINKER=f77
151 diff --git a/etc/make.platform.gnu4 b/etc/make.platform.gnu4
152 index 78a0007..bc85308 100644
153 --- a/etc/make.platform.gnu4
154 +++ b/etc/make.platform.gnu4
155 @@ -6,6 +6,8 @@
156 ##
157 ##########################################################################
158
159 +LIBDIR=@GENTOO_PORTAGE_EPREFIX@/usr/GENTOOLIBDIR
160 +
161 #-----Lexer and Parser section-------------------------------------------#
162
163 # Lexer executable
164 @@ -34,7 +36,7 @@ ABI=
165
166 # WARNINGS_AS_ERRORS defines flags to instruct all compilers to treat all
167 # warnings as errors.
168 -WARNINGS_AS_ERRORS=-Werror
169 +WARNINGS_AS_ERRORS=
170
171 # ALL_WARNINGS defines flags to instruct all compilers to report all
172 # warnings.
173 @@ -90,7 +92,7 @@ GDEFINES=$(PLATFORM) $(COMPILER)
174 DEFINES=$(GDEFINES) $(LDEFINES)
175
176 ## Global include directories
177 -GINCLUDES=
178 +GINCLUDES=-I@GENTOO_PORTAGE_EPREFIX@/usr/include/cifparse-obj
179
180 # Collect all include directories from global include directories and
181 # include directories specified in module makefile
182 @@ -108,8 +110,8 @@ NON_ANSI_C_FLAG=
183 C_WARNINGS=$(WARNINGS)
184
185 # C compiler flags
186 -CFLAGS=$(OPT) $(ABI) $(PIC) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES)
187 -CFLAGS_NONANSI=$(OPT) $(ABI) $(PIC) $(NON_ANSI_C_FLAG) $(DEFINES) $(INCLUDES)
188 +CFLAGS=$(C_OPT) $(ABI) $(PIC) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES)
189 +CFLAGS_NONANSI=$(C_OPT) $(ABI) $(PIC) $(NON_ANSI_C_FLAG) $(DEFINES) $(INCLUDES)
190
191 ## C++ compiler
192 ## This part defines C++ compiler information
193 @@ -128,9 +130,9 @@ C_PLUS_WARNINGS=$(WARNINGS) $(NO_DEPRECATED)
194 EXT=C
195
196 # C++ compiler flags
197 -C++FLAGS=$(OPT) $(ABI) $(PIC) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \
198 +C++FLAGS=$(CCC_OPT) $(ABI) $(PIC) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \
199 $(DEFINES) $(INCLUDES)
200 -C++FLAGS_NONANSI=$(OPT) $(ABI) $(PIC) $(NON_ANSI_C_PLUS_FLAG) \
201 +C++FLAGS_NONANSI=$(CCC_OPT) $(ABI) $(PIC) $(NON_ANSI_C_PLUS_FLAG) \
202 $(C_PLUS_WARNINGS) $(DEFINES) $(INCLUDES)
203
204 # C++FLAGS_RELAXED should be set to avoid warnings reported by third party
205 @@ -145,7 +147,7 @@ C++FLAGS_RELAXED=$(OPT) $(ABI) $(PIC) $(ANSI_C_PLUS_FLAG) $(NO_DEPRECATED) \
206 F77=f77
207
208 # Fortran compiler flags
209 -FFLAGS=-O -u
210 +FFLAGS=$(F_OPT)
211
212 # Additional Fortran libraries
213 F77LIBS=
214 @@ -158,8 +160,8 @@ F77LIBS=
215 STATIC_LINKING=
216
217 # Linker flags
218 -LDFLAGS=$(ABI) -w $(STATIC_LINKING)
219 -LDFLAGS_NO_STATIC=$(ABI) -w
220 +LDFLAGS=$(LDFLAGS_OPT) $(ABI) -w $(STATIC_LINKING)
221 +LDFLAGS_NO_STATIC=$(LDFLAGS_OPT) $(ABI) -w
222
223 # Fortran linker
224 F77_LINKER=f77
225
226
227
228 1.1 sci-chemistry/pdb-extract/files/pdb-extract-3.11-gcc-4.7.patch
229
230 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/pdb-extract/files/pdb-extract-3.11-gcc-4.7.patch?rev=1.1&view=markup
231 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/pdb-extract/files/pdb-extract-3.11-gcc-4.7.patch?rev=1.1&content-type=text/plain
232
233 Index: pdb-extract-3.11-gcc-4.7.patch
234 ===================================================================
235 common-v4.5/src/mapped_ptr_vector.C | 14 +++++++-------
236 1 files changed, 7 insertions(+), 7 deletions(-)
237
238 diff --git a/common-v4.5/src/mapped_ptr_vector.C b/common-v4.5/src/mapped_ptr_vector.C
239 index d7c61f3..e20a236 100644
240 --- a/common-v4.5/src/mapped_ptr_vector.C
241 +++ b/common-v4.5/src/mapped_ptr_vector.C
242 @@ -263,12 +263,12 @@ void mapped_ptr_vector<T, StringCompareT>::push_back(T* inP,
243 _vector.push_back(inP);
244
245 typename tIndex::value_type valuePair(inP->GetName(),
246 - make_pair(_vector.size() - 1, fileIndex));
247 + std::make_pair(_vector.size() - 1, fileIndex));
248
249 _index.insert(valuePair);
250
251 _currentName = inP->GetName();
252 - _currentIndices = make_pair(_vector.size() - 1, fileIndex);
253 + _currentIndices = std::make_pair(_vector.size() - 1, fileIndex);
254
255 }
256
257 @@ -281,12 +281,12 @@ void mapped_ptr_vector<T, StringCompareT>::push_back(const string& name,
258 _vector.push_back(NULL);
259
260 typename tIndex::value_type valuePair(name,
261 - make_pair(_vector.size() - 1, fileIndex));
262 + std::make_pair(_vector.size() - 1, fileIndex));
263
264 _index.insert(valuePair);
265
266 _currentName = name;
267 - _currentIndices = make_pair(_vector.size() - 1, fileIndex);
268 + _currentIndices = std::make_pair(_vector.size() - 1, fileIndex);
269 }
270
271
272 @@ -454,7 +454,7 @@ void mapped_ptr_vector<T, StringCompareT>::erase(const string& name)
273 if (is_equal(_currentName, name, keyComp))
274 {
275 _currentName.clear();
276 - _currentIndices = make_pair(_vector.size(), (unsigned int)0);
277 + _currentIndices = std::make_pair(_vector.size(), (unsigned int)0);
278 }
279
280 }
281 @@ -539,7 +539,7 @@ pair<unsigned int, unsigned int> mapped_ptr_vector<T, StringCompareT>::get_indic
282 if (_vector.empty())
283 {
284 // Empty container. Return invalid index.
285 - return(make_pair(_vector.size(), (unsigned int)0));
286 + return(std::make_pair(_vector.size(), (unsigned int)0));
287 }
288
289 typename tIndex::key_compare keyComp = _index.key_comp();
290 @@ -563,7 +563,7 @@ pair<unsigned int, unsigned int> mapped_ptr_vector<T, StringCompareT>::get_indic
291 else
292 {
293 // Not found. Return invalid index.
294 - return(make_pair(_vector.size(), (unsigned int)0));
295 + return(std::make_pair(_vector.size(), (unsigned int)0));
296 }
297 }
Report Message
Find on MARC Find on Google Groups