diff options
| author | unknown <kent@kent-amd64.(none)> | 2007-01-05 17:30:40 +0100 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2007-01-05 17:30:40 +0100 |
| commit | 0275fa0eb235e56af21282d43f2d9ed3bc4eee41 (patch) | |
| tree | 3e836d9784cda5a4a68e8e619207ea0dff64b21e /support-files | |
| parent | 9aaac61e8517e438fe7c6fb9beb08aec11c01d58 (diff) | |
| parent | 6f3343eeb990d70c9f60bd6077615b93f8b5fc55 (diff) | |
| download | mariadb-git-0275fa0eb235e56af21282d43f2d9ed3bc4eee41.tar.gz | |
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
scripts/make_binary_distribution.sh:
Auto merged
support-files/mysql.spec.sh:
- Put back "libmygcc.a", found no real reason it was removed.
- Add CFLAGS to gcc call with --print-libgcc-file, to make sure the
correct "libgcc.a" path is returned for the 32/64 bit architecture.
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.spec.sh | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index a75e652cd29..85a43f31efc 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -369,6 +369,19 @@ cd ../.. ############################################################################## +# 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 + +############################################################################## + %install RBR=$RPM_BUILD_ROOT MBD=$RPM_BUILD_DIR/mysql-%{mysql_version}/mysql-release-%{mysql_version} @@ -654,6 +667,9 @@ fi %{_includedir}/mysql/* %{_libdir}/mysql/libdbug.a %{_libdir}/mysql/libheap.a +%if %{have_libgcc} +%{_libdir}/mysql/libmygcc.a +%endif %{_libdir}/mysql/libmyisam.a %{_libdir}/mysql/libmyisammrg.a %{_libdir}/mysql/libmysqlclient.a @@ -689,6 +705,13 @@ fi # itself - note that they must be ordered by date (important when # merging BK trees) %changelog +* Fri Jan 05 2007 Kent Boortz <kent@mysql.com> + +- Put back "libmygcc.a", found no real reason it was removed. + +- Add CFLAGS to gcc call with --print-libgcc-file, to make sure the + correct "libgcc.a" path is returned for the 32/64 bit architecture. + * Mon Dec 18 2006 Joerg Bruehe <joerg@mysql.com> - Fix the move of "mysqlmanager" to section 8: Directory name was wrong. |