diff options
| author | Chad MILLER <chad@mysql.com> | 2009-05-06 09:06:32 -0400 |
|---|---|---|
| committer | Chad MILLER <chad@mysql.com> | 2009-05-06 09:06:32 -0400 |
| commit | 128afdc3e5d06381f525e0d9cdc2df7c497e886c (patch) | |
| tree | b7a5df1540af07a49f7d577804919b7027fc4edf /support-files/mysql.spec.sh | |
| parent | 0f95bd31058f21f0872191eac49809622725564d (diff) | |
| parent | 9d58239dea8c615a10a0939e34d052b22808e75f (diff) | |
| download | mariadb-git-128afdc3e5d06381f525e0d9cdc2df7c497e886c.tar.gz | |
Merge community up to enterprise, thus ending the community-server
adventure.
Diffstat (limited to 'support-files/mysql.spec.sh')
| -rw-r--r-- | support-files/mysql.spec.sh | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 59ad308086c..fa3c3a8b4ce 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -330,7 +330,7 @@ do BuildMySQL "\ %if %{STATIC_BUILD} - --disable-shared \ + --enable-shared \ --with-mysqld-ldflags='-all-static' \ --with-client-ldflags='-all-static' \ $USE_OTHER_LIBC_DIR \ @@ -364,6 +364,22 @@ done ./libtool --mode=execute nm --numeric-sort sql/mysqld > sql/mysqld.sym +# Include libgcc.a in the devel subpackage (BUG 4921) +if expr "$CC" : ".*gcc.*" > /dev/null ; +then + libgcc=`$CC $CFLAGS --print-libgcc-file` + if [ -f $libgcc ] + then + %define have_libgcc 1 + install -m 644 $libgcc $RBR%{_libdir}/mysql/libmygcc.a + fi +fi + +# Save the libraries +(cd libmysql/.libs; tar cf $RBR/shared-libs.tar *.so*) +(cd libmysql_r/.libs; tar rf $RBR/shared-libs.tar *.so*) +(cd ndb/src/.libs; tar rf $RBR/shared-libs.tar *.so*) + # We might want to save the config log file if test -n "$MYSQL_CONFLOG_DEST" then @@ -396,18 +412,7 @@ make install-strip DESTDIR=$RBR benchdir_root=%{_datadir} install -s -m 755 $MBD/sql/mysqld-debug $RBR%{_sbindir}/mysqld-debug # Install shared libraries (Disable for architectures that don't support it) -# (cd $RBR%{_libdir}; tar xf $RBR/shared-libs.tar; rm -f $RBR/shared-libs.tar) - -# Include libgcc.a in the devel subpackage (BUG 4921) -if expr "$CC" : ".*gcc.*" > /dev/null ; -then - libgcc=`$CC $CFLAGS --print-libgcc-file` - if [ -f $libgcc ] - then - %define have_libgcc 1 - install -m 644 $libgcc $RBR%{_libdir}/mysql/libmygcc.a - fi -fi +(cd $RBR%{_libdir}; tar xf $RBR/shared-libs.tar; rm -f $RBR/shared-libs.tar) # install symbol files ( for stack trace resolution) # install -m 644 $MBD/sql/mysqld-max.sym $RBR%{_libdir}/mysql/mysqld-max.sym |