diff options
| author | unknown <lenz@mysql.com> | 2002-05-03 12:31:25 +0200 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2002-05-03 12:31:25 +0200 |
| commit | 7c510b93c64773b609b97f04ae2d19c84b88045b (patch) | |
| tree | f018e0ba3a16dbef55c7195250c190640678514d /Build-tools | |
| parent | 3bf08c41b2451475ea4f9676c36c151ef567abc7 (diff) | |
| download | mariadb-git-7c510b93c64773b609b97f04ae2d19c84b88045b.tar.gz | |
Reworked the RPM spec file and added several fixes to make the
build scripts work again.
BUILD/compile-pentium-max:
Added "--with-embedded-server" to have the libmysqld files included
in the source distribution when using "make dist"
Build-tools/Do-linux-build:
Only use the "--with-other-libc" parameter, if another libc actually
exists, since this will also force static linking, which does not work
together with OpenSSL
Makefile.am:
Removed hard-coded file name for TAR, let configure do this instead
(many systems actually ship GNU tar installed as "tar" instead of
"gtar")
configure.in:
Added check for GNU tar named "gtar", fall back to "tar" if "gtar"
was not found (and hope, that it's a GNU tar as well - this should
probably be checked more properly)
include/Makefile.am:
Added "my_semaphore.h" to pkginclude_HEADERS since it was missing
from the distribution
strings/Makefile.am:
Added "longlong2str.c" since it was missing from the distribution
support-files/mysql.server.sh:
Added LSB-compatible header info to make init script more portable
support-files/mysql.spec.sh:
- Use more RPM macros (e.g. infodir, mandir) to make the spec
file more portable
- reorganized the installation of documentation files: let RPM
take care of this
- reorganized the file list: actually install man pages along
with the binaries of the respective subpackage
- don't include libmysqld.a in the devel subpackage as well, if we
have a special "embedded" subpackage
- reworked the package descriptions
Diffstat (limited to 'Build-tools')
| -rwxr-xr-x | Build-tools/Do-linux-build | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Build-tools/Do-linux-build b/Build-tools/Do-linux-build index e5b0a49fe75..a8b12d8b4ae 100755 --- a/Build-tools/Do-linux-build +++ b/Build-tools/Do-linux-build @@ -1,9 +1,17 @@ #! /bin/sh set -e -x + +# Only use the "--with-other-libc" parameter, if another libc actually +# exists, since this will also force static linking, which does not work +# together with OpenSSL OTHER_LIBC_DIR=/usr/local/mysql-glibc +OTHER_LIBC="" +if [ -d OTHER_LIBC_DIR ] ; then + OTHER_LIBC="--with-other-libc=$OTHER_LIBC_DIR" +fi -BUILD/compile-pentium-max --with-other-libc=$OTHER_LIBC_DIR \ +BUILD/compile-pentium-max $OTHER_LIBC \ --with-comment="Official MySQL Binary" \ --prefix=/usr/local/mysql --with-extra-charset=complex \ --enable-thread-safe-client --enable-local-infile \ |