Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (8d0713e6ef5dee3f070d62d8d18f74124b0fc4e0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (8d0713e6ef5dee3f070d62d8d18f74124b0fc4e0)
  • Date: Fri, 22 Mar 2013 21:37:39 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

database/mysql/HISTORY | 4 ++++
database/mysql/PRE_BUILD | 6 +++++-
2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 8d0713e6ef5dee3f070d62d8d18f74124b0fc4e0
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

mysql: Add -fpermissive in CXXFLAGS with 5.1.67 (!$OLD)
Add -fpermissive in CXXFLAGS with 5.1.67 (!$OLD)
for extra/yassl/taocrypt/src/Makefile.in

$ cast mysql
...
Making all in src
make[5]: Entering directory
`/usr/src/mysql-5.1.67/extra/yassl/taocrypt/src' /bin/sh
../../../../libtool --preserve-dup-deps --tag=CXX --mode=compile g++
-DHAVE_CONFIG_H -I. -I../../../../include -I./../include -I./../mySTL
-D_GNU_SOURCE -DYASSL_PURE_C -DYASSL_THREAD_SAFE -march=native -mtune=native
-m32 -pipe -DPIC -fPIC -O2 -fno-implicit-templates -fno-exceptions
-fno-rtti -MT libtaocrypt_la-integer.lo -MD -MP -MF
.deps/libtaocrypt_la-integer.Tpo -c -o libtaocrypt_la-integer.lo `test -f
'integer.cpp' || echo './'`integer.cpp libtool: compile: g++ -DHAVE_CONFIG_H
-I. -I../../../../include -I./../include -I./../mySTL -D_GNU_SOURCE
-DYASSL_PURE_C -DYASSL_THREAD_SAFE -march=native -mtune=native -m32 -pipe
-DPIC -fPIC -O2 -fno-implicit-templates -fno-exceptions -fno-rtti -MT
libtaocrypt_la-integer.lo -MD -MP -MF .deps/libtaocrypt_la-integer.Tpo -c
integer.cpp -fPIC -DPIC -o .libs/libtaocrypt_la-integer.o
integer.cpp: In member function 'TaoCrypt::AlignedAllocator<T>::pointer
TaoCrypt::AlignedAllocator<T>::allocate(TaoCrypt::AlignedAllocator<T>::size_type,
const void*)':
integer.cpp:76:22: error: there are no arguments to 'max_size' that
depend on a template parameter, so a declaration of 'max_size' must be
available [-fpermissive]
integer.cpp:76:22: note: (if you use '-fpermissive', G++ will accept your
code, but allowing the use of an undeclared name is deprecated)
make[5]: *** [libtaocrypt_la-integer.lo] Error 1
make[5]: Leaving directory
`/usr/src/mysql-5.1.67/extra/yassl/taocrypt/src'

diff --git a/database/mysql/HISTORY b/database/mysql/HISTORY
index 7e461c3..21e33a1 100644
--- a/database/mysql/HISTORY
+++ b/database/mysql/HISTORY
@@ -1,3 +1,7 @@
+2013-03-22 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Add -fpermissive in CXXFLAGS with 5.1.67 (!$OLD) for
+ extra/yassl/taocrypt/src/Makefile.in
+
2013-02-01 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 5.1.67, 5.0.96 (old); SECURITY_PATCH++

diff --git a/database/mysql/PRE_BUILD b/database/mysql/PRE_BUILD
index a28c410..f5ac745 100755
--- a/database/mysql/PRE_BUILD
+++ b/database/mysql/PRE_BUILD
@@ -4,4 +4,8 @@ cd $SOURCE_DIRECTORY &&
patch -p1 < "$SPELL_DIRECTORY/big_tables.patch" &&

sedit 's:$(libdir)/@PACKAGE@:$(libdir):' libmysql/Makefile.in &&
-sedit 's:$(libdir)/@PACKAGE@:$(libdir):' libmysql_r/Makefile.in
+sedit 's:$(libdir)/@PACKAGE@:$(libdir):' libmysql_r/Makefile.in &&
+
+if [[ "x$OLD" == "xn" ]]; then
+ sedit 's:^CXXFLAGS.*:& -fpermissive :' extra/yassl/taocrypt/src/Makefile.in
+fi



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (8d0713e6ef5dee3f070d62d8d18f74124b0fc4e0), Eric Sandall, 03/22/2013

Archive powered by MHonArc 2.6.24.

Top of Page