author | Mike Sullivan <Mike.Sullivan@Oracle.COM> |
Mon, 01 Jul 2013 23:01:39 -0700 | |
branch | s11-update |
changeset 2661 | 9eb4a163bb23 |
parent 444 | a2a87847a213 |
permissions | -rw-r--r-- |
444
a2a87847a213
7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff
changeset
|
1 |
--- scripts/mysql_config.sh 2009-07-13 16:10:59.000000000 -0700 |
a2a87847a213
7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff
changeset
|
2 |
+++ scripts/mysql_config.sh.org 2010-01-11 21:48:38.243564639 -0800 |
a2a87847a213
7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff
changeset
|
3 |
@@ -85,7 +85,6 @@ |
a2a87847a213
7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff
changeset
|
4 |
# If installed, search for the compiled in directory first (might be "lib64") |
a2a87847a213
7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff
changeset
|
5 |
pkglibdir='@pkglibdir@' |
a2a87847a213
7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff
changeset
|
6 |
pkglibdir_rel=`echo $pkglibdir | sed -e "s;^$basedir/;;"` |
a2a87847a213
7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff
changeset
|
7 |
-fix_path pkglibdir $pkglibdir_rel lib/mysql lib |
a2a87847a213
7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff
changeset
|
8 |
|
a2a87847a213
7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff
changeset
|
9 |
plugindir='@pkgplugindir@' |
a2a87847a213
7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff
changeset
|
10 |
|
a2a87847a213
7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff
changeset
|
11 |
@@ -104,10 +103,10 @@ |
a2a87847a213
7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff
changeset
|
12 |
|
a2a87847a213
7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff
changeset
|
13 |
# Create options |
a2a87847a213
7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff
changeset
|
14 |
# We intentionally add a space to the beginning and end of lib strings, simplifies replace later |
a2a87847a213
7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff
changeset
|
15 |
-libs=" $ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" |
a2a87847a213
7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff
changeset
|
16 |
+libs=" $ldflags -L$pkglibdir -R$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" |
a2a87847a213
7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff
changeset
|
17 |
libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ " |
a2a87847a213
7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff
changeset
|
18 |
-libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @LIBS@ @openssl_libs@ " |
a2a87847a213
7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff
changeset
|
19 |
-embedded_libs=" $ldflags -L$pkglibdir -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @innodb_system_libs@ @openssl_libs@ " |
a2a87847a213
7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff
changeset
|
20 |
+libs_r=" $ldflags -L$pkglibdir -R$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @LIBS@ @openssl_libs@ " |
a2a87847a213
7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff
changeset
|
21 |
+embedded_libs=" $ldflags -L$pkglibdir -R$pkglibdir -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @innodb_system_libs@ @openssl_libs@ " |
a2a87847a213
7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff
changeset
|
22 |
|
a2a87847a213
7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff
changeset
|
23 |
if [ -r "$pkglibdir/libmygcc.a" ]; then |
a2a87847a213
7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff
changeset
|
24 |
# When linking against the static library with a different version of GCC |