Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
981640a5
Commit
981640a5
authored
Aug 29, 2009
by
Joerg Bruehe
Browse files
Options
Browse Files
Download
Plain Diff
Merge 5.1 up into 5.4-build ("trunk").
parents
3d8f4e18
8aea2dcc
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
34 additions
and
1 deletion
+34
-1
support-files/mysql.spec.sh
support-files/mysql.spec.sh
+34
-1
No files found.
support-files/mysql.spec.sh
View file @
981640a5
...
...
@@ -31,6 +31,13 @@
%
{
?_with_yassl:%define YASSL_BUILD 1
}
%
{!
?_with_yassl:%define YASSL_BUILD 0
}
# ----------------------------------------------------------------------
# use "rpmbuild --with bundled_zlib" or "rpm --define '_with_bundled_zlib 1'"
# (for RPM 3.x) to build using the bundled zlib (off by default)
# ----------------------------------------------------------------------
%
{
?_with_bundled_zlib:%define WITH_BUNDLED_ZLIB 1
}
%
{!
?_with_bundled_zlib:%define WITH_BUNDLED_ZLIB 0
}
# use "rpmbuild --with cluster" or "rpm --define '_with_cluster 1'" (for RPM 3.x)
# to build with cluster support (off by default)
%
{
?_with_cluster:%define CLUSTER_BUILD 1
}
...
...
@@ -301,8 +308,13 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \
--with-csv-storage-engine
\
--with-blackhole-storage-engine
\
--with-federated-storage-engine
\
--without-plugin-daemon_example
\
--without-plugin-example
\
--with-partition
\
--with-big-tables
\
%if %{WITH_BUNDLED_ZLIB}
--with-zlib-dir=bundled
\
%endif
--enable-shared
\
"
make
...
...
@@ -426,7 +438,7 @@ install -d $RBR%{_sbindir}
# Install all binaries
(
cd
$MBD
&&
make
install
DESTDIR
=
$RBR
benchdir_
root
=
%
{
_datadir
})
(
cd
$MBD
&&
make
install
DESTDIR
=
$RBR
test
root
=
%
{
_datadir
})
# Old packages put shared libs in %{_libdir}/ (not %{_libdir}/mysql), so do
# the same here.
mv
$RBR
/%
{
_libdir
}
/mysql/
*
.so
*
$RBR
/%
{
_libdir
}
/
...
...
@@ -693,6 +705,8 @@ fi
%attr
(
755, root, root
)
%
{
_bindir
}
/resolve_stack_dump
%attr
(
755, root, root
)
%
{
_bindir
}
/resolveip
%attr
(
755, root, root
)
%
{
_libdir
}
/plugin/
*
.so
*
%attr
(
755, root, root
)
%
{
_sbindir
}
/mysqld
%attr
(
755, root, root
)
%
{
_sbindir
}
/mysqld-debug
%attr
(
755, root, root
)
%
{
_sbindir
}
/mysqlmanager
...
...
@@ -818,6 +832,8 @@ fi
%
{
_libdir
}
/mysql/libvio.a
%
{
_libdir
}
/mysql/libz.a
%
{
_libdir
}
/mysql/libz.la
%
{
_libdir
}
/plugin/
*
.a
%
{
_libdir
}
/plugin/
*
.la
%files shared
%defattr
(
-, root, root, 0755
)
...
...
@@ -847,6 +863,23 @@ fi
# itself - note that they must be ordered by date (important when
# merging BK trees)
%changelog
*
Fri Aug 28 2009 Joerg Bruehe <joerg.bruehe@sun.com>
- Merge up form 5.1 to 5.4: Remove handling
for
the InnoDB plugin.
*
Mon Aug 24 2009 Jonathan Perkin <jperkin@sun.com>
- Add conditionals
for
bundled zlib and innodb plugin
*
Fri Aug 21 2009 Jonathan Perkin <jperkin@sun.com>
- Install plugin libraries
in
appropriate packages.
- Disable example plugins.
*
Thu Aug 20 2009 Jonathan Perkin <jperkin@stripped>
- Update variable used
for
mysql-test suite location to match source.
*
Fri Nov 07 2008 Joerg Bruehe <joerg@mysql.com>
- Correct yesterday
's fix, so that it also works for the last flag,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment