diff options
author | Jackie Huang <jackie.huang@windriver.com> | 2014-09-28 02:19:41 -0400 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-10-04 00:28:30 +0200 |
commit | 66182220e8b1133af83f58e40d9d3fa3d358299a (patch) | |
tree | c1ed9e8eebe48eac15971f79df1b36cd1152a2b1 /meta-networking/recipes-daemons/vsftpd | |
parent | 047058ac18f8d26247c9cd394b3748b9eee8aadb (diff) | |
download | meta-openembedded-contrib-66182220e8b1133af83f58e40d9d3fa3d358299a.tar.gz |
mariadb: drop the anonymous function and use proper install layout
The anonymous function redefined bindir to bindir_noprefix (and
others), which broke the sstate between build dirs.
The redefined *_noprefix was to used to pass to the INSTALL_*
variables to change the layout as we want, but in fact we can
do this in other ways instead of the pain one:
1) Change the default layout and a little adjustment.
There are 4 install layout: STANDALONE(default), RPM, DEB and SVR4.
And RPM is the one close to what we are using.
2) Don't use prefix and pass full paths to INSTALL_*.
The mariadb's cmake define some of the INSTALL_* relative to
CMAKE_INSTALL_PREFIX, So we can use empty CMAKE_INSTALL_PREFIX,
then we can pass our full paths to INSTALL_* directly.
This patch set the default layout to RPM and pass paths only for:
- INSTALL_DOCDIR: no prefix prepending, so ${datadir} works.
- INSTALL_LIBDIR/INSTALL_PLUGINDIR: use ${baselib}.
The mysql-test is moved from /usr to /usr/share which is more
reasonable, fix the FILES inclusion accordingly.
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-networking/recipes-daemons/vsftpd')
0 files changed, 0 insertions, 0 deletions