Commit graph

431 commits

Author SHA1 Message Date
Jonathan Perkin
37ca19e01f Revert library changes, let's just stick with keeping to existing
setup for now, leave large changes to later.
2010-04-08 12:30:04 +02:00
Jonathan Perkin
7cf98dc3c2 RPM doesn't like %install in comments, doh 2010-04-01 15:10:05 +02:00
Jonathan Perkin
990bfbe1e2 Put libmygcc back in %build, needs $CC etc of course... 2010-04-01 13:48:44 +02:00
Jonathan Perkin
1f5ce2fb1f Actually, move the libgcc stuff to %install where it belongs. 2010-04-01 12:24:00 +02:00
Jonathan Perkin
d8883b8def We do need the mkdir. 2010-04-01 12:18:51 +02:00
Jonathan Perkin
3e2c17d244 Just put libs in %{_libdir}.
Can't see how mysqld_safe can work with current setup, so make it look
in $pkglibdir/mysql too.

Other cleanups.
2010-04-01 10:32:29 +02:00
Jonathan Perkin
ee85029bbc Try some more fixes. 2010-04-01 02:20:41 +02:00
Jonathan Perkin
910e84216d Try a bunch of fixes. 2010-03-31 23:52:49 +02:00
Jonathan Perkin
eca8a74a3e Put back libmysqlclient_r.a, not sure it was supposed to be removed.
Remove libmysqld-debug.a, it doesn't exist in current packages?
2010-03-31 19:04:22 +02:00
Jonathan Perkin
4bfa7af22d Fix socket path in RPMs. XXX should be put into cmake/* somewhere. 2010-03-31 12:04:21 +02:00
Jonathan Perkin
0f6794a9d8 Default to CXX=gcc 2010-03-30 12:01:30 +02:00
Jonathan Perkin
45b56ba0f2 Must specify -DDCMAKE_BUILD_TYPE=RelWithDebInfo now that compiler
flags are being used correctly.
2010-03-30 11:54:25 +02:00
Jonathan Perkin
91cd9e2637 Variables need to be exported so cmake can pick them up. 2010-03-29 17:54:08 +02:00
Jonathan Perkin
eb96d2fddd Fix environment setup.
Don't create empty ChangeLog.
2010-03-29 17:01:15 +02:00
Jonathan Perkin
fcc9f31a59 Move libmysqlclient*.a out of the WITH_LIBGCC section. 2010-03-26 11:25:02 +01:00
Jonathan Perkin
9e0643a114 Put back libmysqlclient*.a
Add ChangeLog.
2010-03-25 19:54:47 +01:00
Jonathan Perkin
0fed5e3125 Merge latest mysql-5.5.3-m3-release 2010-03-25 17:23:08 +01:00
Jonathan Perkin
d9851896b9 Fix some paths. 2010-03-25 17:15:34 +01:00
Jonathan Perkin
9ac7a429ea Current iteration of spec file cleanup. 2010-03-25 13:29:02 +01:00
Jonathan Perkin
21dbbe750a Fix source layout. 2010-03-24 22:30:39 +01:00
Jonathan Perkin
e97be6d429 Initial attempt at CMake support. 2010-03-24 21:17:13 +01:00
Joerg Bruehe
8b79e6209c Add "--with-perfschema" to the configure options for RPMs. 2010-03-24 20:30:33 +01:00
Joerg Bruehe
81cbce56bb Some fixes developed during the build of 5.5.3-m3
about handling the debug plugin files,
also "ha_example.*" are dropped.
2010-03-24 20:01:01 +01:00
Joerg Bruehe
3139b90494 Part of the fixes for bug#49022
Plugins included into bin release cannot be
    installed on debug version of server

Ensure that the plugin files of the debug build
get into the optimized tree, so that they find
their way into the final RPMs.


support-files/mysql.spec.sh:
  Use "make install" in the debug build tree to get the debug
  plugin files to a temporary location,
  then move them to "plugin/debug/" in the optimized build tree
  so that the install hook in "plugin/Makefile.am" forwards them
  into the final installation.
  
  This fixes bug#49022 for the generic RPMs.
  
  Unrelated:
  The plugin objects were listed twice in the file list,
  do a cleanup.
2010-03-10 14:36:27 +01:00
Alexander Nozdrin
c575b15a12 Manual merge from mysql-5.1.
Conflicts:
  - support-files/mysql.spec.sh
  - configure.in
2010-03-01 21:49:06 +03:00
Joerg Bruehe
a8c21d271f Spec file for RPMs:
Now that Oracle has legally acquired Sun, change the copyright owner
and the vendor.

support-files/mysql.spec.sh:
  Introduce a new macro "vendor 2" and set it to Sun,
  so that we can have a whole series of vendors if such events continue.
2010-03-01 11:42:44 +01:00
Alexander Nozdrin
e7e1a36755 Manual merge from mysql-trunk. 2010-02-23 17:06:06 +03:00
Alexey Kopytov
0afa209018 Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. 2010-02-22 00:33:11 +03:00
Joerg Bruehe
688811b913 Fix a bug in the RPM spec file:
A "%define" is no shell command, so it must not be the
only line in the "then" or "else" branch of an "if".

Add a ':' line to make the branch non-empty.
2010-02-17 11:13:15 +01:00
Joerg Bruehe
c25ea41c5a Upmerge the RPM spec file correction: "release" was missing. 2010-02-12 17:26:22 +01:00
Joerg Bruehe
b7302312fe Correction: The "release" setting had got lost in the RPM spec file. 2010-02-12 17:23:22 +01:00
Joerg Bruehe
1c15c2b74a Upmerge the spec file alignment from 5.1 to 5.5,
no other functional changes.
2010-02-12 13:20:42 +01:00
Joerg Bruehe
2813cd5899 Upmerge changes done to the generic spec file in 5.0 to 5.1,
this includes a major whitespace (formatting) alignment
and sequence changes to better agree with other spec files.

Further changes:
- All features are controlled by "%define" set from call
  options or builtin.
- "bundled zlib" is on by default.
- "with libgcc" is controlled by runtime detection of gcc.
- Handling of "CFLAGS" and "CXXFLAGS" is more concentrated.
- Several missing man pages were added.
2010-02-11 21:33:48 +01:00
Joerg Bruehe
a835c80dec Cleanup in the RPM spec file:
Get rid of trailing blanks.
2010-02-02 17:53:52 +01:00
Joerg Bruehe
219422f346 Spec file for "generic" RPMs:
Cleanup, formatting improvements,
vendor is Sun (since MySQL AB was bought).

Backport the change so that RPM doesn't magically
create a dependency on "Perl-DBI".
2010-02-02 16:28:59 +01:00
Alexander Nozdrin
0835775b7c Manual merge from mysql-trunk.
Conflicts:
  - support-files/mysql.spec.sh
2010-01-18 23:15:17 +03:00
Alexey Kopytov
0a5b406fc5 Manual merge from mysql-5.1-bugteam into mysql-trunk-merge.
Conflicts:

Text conflict in .bzr-mysql/default.conf
Text conflict in mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
Text conflict in mysql-test/suite/rpl/r/rpl_stm_log.result
Text conflict in mysql-test/t/mysqlbinlog.test
Text conflict in sql/sql_acl.cc
Text conflict in sql/sql_servers.cc
Text conflict in sql/sql_update.cc
Text conflict in support-files/mysql.spec.sh
2010-01-15 14:26:53 +03:00
Georgi Kodinov
90274e3709 merge 2010-01-13 12:47:42 +02:00
Georgi Kodinov
6e72f4171f merge 5.1-main to 5.1-bugteam 2010-01-13 12:28:42 +02:00
Joerg Bruehe
c591ee5923 Upmerge the changes for RPM versioning/naming from 5.0 to 5.1.
This includes "MYSQL_U_SCORE_VERSION" in "configure.in".
2010-01-12 12:57:51 +01:00
Joerg Bruehe
71465af9d4 Implement the change of RPM versioning and file naming:
- "release" starts from 1
- "level" ("m2", "rc", ...) is included in the RPM version.
2010-01-12 12:41:18 +01:00
Joerg Bruehe
3c9322e73f Implement the change of RPM versioning and file naming:
- "release" starts from 1
- "level" ("m2", "rc", ...) is included in the RPM version.
2010-01-11 19:23:36 +01:00
Kent Boortz
71061de025 Removed unwanted Perl DBI dependency 2009-12-30 23:06:14 +01:00
Joerg Bruehe
3be15fa67c Remove the "fix_privilege_tables" manual from the RPM spec file,
there is none in 5.5.
2009-12-23 22:42:44 +01:00
Joerg Bruehe
f7c24a2e20 The "semisync" plugin file name has lost its introductory "lib",
adapt the file lists for the subpackages.

This is a part missing from the fix for bug#48351.
2009-12-23 13:06:41 +01:00
Joerg Bruehe
7a84896d71 Change RPM file naming:
- Suffix like "-m2", "-rc" becomes part of version as "_m2", "_rc".
- Release counts from 1, not 0.

This is done for both the "generic" RPMs and the "shared-compat" ones.
It includes introducing a new version variable "MYSQL_U_SCORE_VERSION"
in "configure.in", where the dash is replaced by an underscore:
  5.5.1-m2   ->  5.5.1_m2
2009-12-22 23:22:42 +01:00
MySQL Build Team
4746239b37 Handle the "semisync" plugin in
- binary distributions for Windows,
- "generic" RPM packages.
2009-11-26 19:55:33 +01:00
MySQL Build Team
63a044f31f Remove erroneous traces of the InnoDB plugin (that is 5.1 only)
from the "spec" file for generic RPMs.
2009-11-18 11:42:20 +01:00
MySQL Build Team
1da38990cb Change the control structures which the RPM spec file uses to govern
the inclusion of a separate malloc library (used for Google's "tcmalloc")
to follow the pattern used for other optional parts.

This is still experimental, there are some "rpmbuild" issues around this.
2009-11-17 17:19:00 +01:00
Alexander Nozdrin
2c3d501189 Automerge from mysql-trunk-merge. 2009-10-19 22:41:18 +04:00