From mboxrd@z Thu Jan 1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
by finch.gentoo.org with esmtp (Exim 4.60)
(envelope-from <gentoo-commits+bounces-336916-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1QBIqx-0007iD-DS
for garchives@archives.gentoo.org; Sun, 17 Apr 2011 03:40:51 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id BA61F1C018;
Sun, 17 Apr 2011 03:40:43 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 787951C018
for <gentoo-commits@lists.gentoo.org>; Sun, 17 Apr 2011 03:40:43 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id C61371B4003
for <gentoo-commits@lists.gentoo.org>; Sun, 17 Apr 2011 03:40:42 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 0DF3C80065
for <gentoo-commits@lists.gentoo.org>; Sun, 17 Apr 2011 03:40:42 +0000 (UTC)
From: "Jorge Manuel B. S. Vicetto" <jmbsvicetto@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Jorge Manuel B. S. Vicetto" <jmbsvicetto@gentoo.org>
Message-ID: <3f32777cce99d3295f64851220ae63733116b3b6.jmbsvicetto@gentoo>
Subject: [gentoo-commits] proj/mysql-extras:master commit in: /
X-VCS-Repository: proj/mysql-extras
X-VCS-Files: 15020_fix_hardcoded_lib_paths.patch
X-VCS-Directories: /
X-VCS-Committer: jmbsvicetto
X-VCS-Committer-Name: Jorge Manuel B. S. Vicetto
X-VCS-Revision: 3f32777cce99d3295f64851220ae63733116b3b6
Date: Sun, 17 Apr 2011 03:40:42 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: 692f7e9f33c6c8d7c4f786688f398974
commit: 3f32777cce99d3295f64851220ae63733116b3b6
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> ge=
ntoo <DOT> org>
AuthorDate: Sun Apr 17 03:37:20 2011 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org=
>
CommitDate: Sun Apr 17 03:37:20 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mysql-extras.=
git;a=3Dcommit;h=3D3f32777c
Added patch to fix the hardcoded lib paths on mysql ac macros.
Thanks to Jonathan Callen (abcd) for calling our attention.
---
15020_fix_hardcoded_lib_paths.patch | 121 +++++++++++++++++++++++++++++=
++++++
1 files changed, 121 insertions(+), 0 deletions(-)
diff --git a/15020_fix_hardcoded_lib_paths.patch b/15020_fix_hardcoded_li=
b_paths.patch
new file mode 100644
index 0000000..f62d1d0
--- /dev/null
+++ b/15020_fix_hardcoded_lib_paths.patch
@@ -0,0 +1,121 @@
+diff -urN mysql-orig//config/ac-macros/ha_ndbcluster.m4 mysql/config/ac-=
macros/ha_ndbcluster.m4
+--- mysql-orig//config/ac-macros/ha_ndbcluster.m4 2011-04-17 02:29:26.66=
0000016 +0000
++++ mysql/config/ac-macros/ha_ndbcluster.m4 2011-04-17 02:33:40.29333335=
0 +0000
+@@ -24,7 +24,7 @@
+ AC_HELP_STRING([--with-ndb-sci=3DDIR],
+ [Provide MySQL with a custom location of
+ sci library. Given DIR, sci library is=20
+- assumed to be in $DIR/lib and header files
++ assumed to be in $DIR/${LIBDIR} and header=
files
+ in $DIR/include.]),
+ [mysql_sci_dir=3D${withval}],
+ [mysql_sci_dir=3D""])
+@@ -35,19 +35,19 @@
+ AC_MSG_RESULT([-- not including sci transporter])
+ ;;
+ * )
+- if test -f "$mysql_sci_dir/lib/libsisci.a" -a \=20
++ if test -f "$mysql_sci_dir/${LIBDIR}/libsisci.a" -a \=20
+ -f "$mysql_sci_dir/include/sisci_api.h"; then
+ NDB_SCI_INCLUDES=3D"-I$mysql_sci_dir/include"
+- NDB_SCI_LIBS=3D"$mysql_sci_dir/lib/libsisci.a"
++ NDB_SCI_LIBS=3D"$mysql_sci_dir/${LIBDIR}/libsisci.a"
+ AC_MSG_RESULT([-- including sci transporter])
+ AC_DEFINE([NDB_SCI_TRANSPORTER], [1],
+ [Including Ndb Cluster DB sci transporter])
+ AC_SUBST(NDB_SCI_INCLUDES)
+ AC_SUBST(NDB_SCI_LIBS)
+ have_ndb_sci=3D"yes"
+- AC_MSG_RESULT([found sci transporter in $mysql_sci_dir/{include=
, lib}])
++ AC_MSG_RESULT([found sci transporter in $mysql_sci_dir/{include=
, ${LIBDIR}}])
+ else
+- AC_MSG_RESULT([could not find sci transporter in $mysql_sci_dir=
/{include, lib}])
++ AC_MSG_RESULT([could not find sci transporter in $mysql_sci_dir=
/{include, {LIBDIR}}])
+ fi
+ ;;
+ esac
+diff -urN mysql-orig//config/ac-macros/ssl.m4 mysql/config/ac-macros/ssl=
.m4
+--- mysql-orig//config/ac-macros/ssl.m4 2011-04-17 02:29:26.660000016 +0=
000
++++ mysql/config/ac-macros/ssl.m4 2011-04-17 02:32:26.143333350 +0000
+@@ -111,7 +111,7 @@
+ #
+ # Try to link with openSSL libs in <location>
+ #
+- openssl_libs=3D"-L$location/lib/ -lssl -lcrypto"
++ openssl_libs=3D"-L$location/${LIBDIR}/ -lssl -lcrypto"
+ MYSQL_CHECK_SSL_DIR([$openssl_includes], [$openssl_libs])
+=20
+ if test "$mysql_ssl_found" =3D=3D "no"
+@@ -163,7 +163,7 @@
+ dnl bundled along with MySQL sources
+ dnl - ssl location prefix - given location prefix, the macro expects
+ dnl to find the header files in $prefix/include/, and libraries in
+-dnl $prefix/lib. If headers or libraries weren't found at $prefix, th=
e
++dnl $prefix/${LIBDIR}. If headers or libraries weren't found at $pref=
ix, the
+ dnl macro bails out with error.
+ dnl
+ dnl -------------------------------------------------------------------=
-----
+diff -urN mysql-orig//config/ac-macros/zlib.m4 mysql/config/ac-macros/zl=
ib.m4
+--- mysql-orig//config/ac-macros/zlib.m4 2011-04-17 02:29:26.660000016 +=
0000
++++ mysql/config/ac-macros/zlib.m4 2011-04-17 02:33:10.790000017 +0000
+@@ -51,12 +51,12 @@
+ dnl bundled zlib
+ dnl - zlib location prefix - given location prefix, the macro expects
+ dnl to find the library headers in $prefix/include, and binaries in
+-dnl $prefix/lib. If zlib headers or binaries weren't found at $prefix=
, the
++dnl $prefix/${LIBDIR}. If zlib headers or binaries weren't found at $=
prefix, the
+ dnl macro bails out with error.
+ dnl=20
+ dnl If the library was found, this function #defines HAVE_COMPRESS
+ dnl and configure variables ZLIB_INCLUDES (i.e. -I/path/to/zlib/include=
),
+-dnl ZLIB_LIBS (i. e. -L/path/to/zlib/lib -lz) and ZLIB_DEPS which is
++dnl ZLIB_LIBS (i. e. -L/path/to/zlib/${LIBDIR} -lz) and ZLIB_DEPS which=
is
+ dnl used in mysql_config and is always the same as ZLIB_LIBS except to
+ dnl when we use the bundled zlib. In the latter case ZLIB_LIBS points t=
o the
+ dnl build dir ($top_builddir/zlib), while mysql_config must point to th=
e
+@@ -78,7 +78,7 @@
+ AC_HELP_STRING([--with-zlib-dir=3Dno|bundled|DIR],
+ [Provide MySQL with a custom location of
+ compression library. Given DIR, zlib bin=
ary is=20
+- assumed to be in $DIR/lib and header fil=
es
++ assumed to be in $DIR/${LIBDIR} and head=
er files
+ in $DIR/include.]),
+ [mysql_zlib_dir=3D${withval}],
+ [mysql_zlib_dir=3D""])
+@@ -102,13 +102,13 @@
+ ;;
+ *)
+ # Test for libz using all known library file endings
+- if test \( -f "$mysql_zlib_dir/lib/libz.a" -o \
+- -f "$mysql_zlib_dir/lib/libz.so" -o \
+- -f "$mysql_zlib_dir/lib/libz.sl" -o \
+- -f "$mysql_zlib_dir/lib/libz.dylib" \) \
++ if test \( -f "$mysql_zlib_dir/${LIBDIR}/libz.a" -o \
++ -f "$mysql_zlib_dir/${LIBDIR}/libz.so" -o \
++ -f "$mysql_zlib_dir/${LIBDIR}/libz.sl" -o \
++ -f "$mysql_zlib_dir/${LIBDIR}/libz.dylib" \) \
+ -a -f "$mysql_zlib_dir/include/zlib.h"; then
+ ZLIB_INCLUDES=3D"-I$mysql_zlib_dir/include"
+- ZLIB_LIBS=3D"-L$mysql_zlib_dir/lib -lz"
++ ZLIB_LIBS=3D"-L$mysql_zlib_dir/${LIBDIR} -lz"
+ MYSQL_CHECK_ZLIB_DIR
+ fi
+ if test "x$mysql_cv_compress" !=3D "xyes"; then=20
+diff -urN mysql-orig//configure.in mysql/configure.in
+--- mysql-orig//configure.in 2011-04-17 02:29:26.650000015 +0000
++++ mysql/configure.in 2011-04-17 02:58:57.133333350 +0000
+@@ -64,6 +64,14 @@
+ MYSQL_TCP_PORT_DEFAULT=3D3306
+ MYSQL_UNIX_ADDR_DEFAULT=3D"/tmp/mysql.sock"
+=20
++AC_ARG_WITH(LIBDIR,
++[AS_HELP_STRING([--with-LIBDIR],[base name of the library dirs])],
++[LIBDIR=3D$withval],
++[LIBDIR=3Dlib]
++)
++
++AC_SUBST([LIBDIR])
++
+ dnl Include m4=20
+ sinclude(config/ac-macros/maintainer.m4)
+ sinclude(config/ac-macros/alloca.m4)