forked from pool/mariadb
Accepting request 195809 from server:database
- fix includedir in configuration file - Fix INSTALL_LIBDIR_RPM and INSTALL_PLUGINDIR_RPM, they need to point to %_lib, not %_libdir - Drop so symlink generation and removal, that is not necessary and breaks non x86_64 builds of dependent packages OBS-URL: https://build.opensuse.org/request/show/195809 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb?expand=0&rev=31
This commit is contained in:
Tomáš Chvátal
Git OBS Bridge
commit
e996da5c80
@ -114,8 +114,8 @@ BuildMySQL() {
|
||||
-DWITH_EMBEDDED_SERVER=true \
|
||||
-DCOMPILATION_COMMENT="openSUSE package" \
|
||||
-DDENABLE_DOWNLOADS=false \
|
||||
-DINSTALL_PLUGINDIR_RPM="%{_libdir}/mysql/plugin" \
|
||||
-DINSTALL_LIBDIR_RPM="%{_libdir}" \
|
||||
-DINSTALL_PLUGINDIR_RPM="%{_lib}/mysql/plugin" \
|
||||
-DINSTALL_LIBDIR_RPM="%{_lib}" \
|
||||
"$@" ..
|
||||
make %{?jobs:-j%jobs}
|
||||
nm --numeric-sort sql/mysqld > sql/mysqld.sym
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5e1d7b3da204d4812554888639fd49101b3a2d87c41bac802df35cf794ef088c
|
||||
size 312
|
||||
oid sha256:a5824b02d7cfe00333ac4adfec1856311fd27fafea7affc1656c5543a44db4a6
|
||||
size 318
|
||||
|
||||
26
install.inc
26
install.inc
@ -1,5 +1,4 @@
|
||||
# install the debug server first, so that we don't overwrite the standard
|
||||
# /usr/sbin/mysqld
|
||||
mkdir -p %buildroot%_libdir/mysql
|
||||
make -C _build-debug/sql install DESTDIR=%buildroot
|
||||
mv %buildroot/usr/sbin/mysqld %buildroot/usr/sbin/mysqld-debug
|
||||
@ -10,16 +9,13 @@ install -m 644 _build/sql/mysqld.sym %buildroot%_libdir/mysql/mysqld.sym
|
||||
# remove handler socket client
|
||||
rm -f %buildroot%_libdir/libhsclient*
|
||||
rm -f %buildroot%_bindir/hsclient*
|
||||
if [ -f "%{buildroot}%{_bindir}/mytop" ]; then
|
||||
mv %{buildroot}%{_bindir}/mytop %{buildroot}%{_bindir}/%{name}_mytop
|
||||
fi
|
||||
[ \! -f "%{buildroot}%{_bindir}/mytop" ] || mv %{buildroot}%{_bindir}/mytop %{buildroot}%{_bindir}/%{name}_mytop
|
||||
rm -f %buildroot%_libdir/mysql/plugin/handlersocket.so
|
||||
# remove most static libs (FIXME: don't build them at all...)
|
||||
[ \! -f "%buildroot%_libdir/"libmysqld.a ] || mv "%buildroot%_libdir/"libmysqld.a "%buildroot%_libdir/"libmysqld.static
|
||||
rm -f %buildroot%_libdir/*.a
|
||||
[ \! -f "%buildroot%_libdir/"libmysqld.static ] || mv "%buildroot%_libdir/"libmysqld.static "%buildroot%_libdir/"libmysqld.a
|
||||
rm -f %buildroot%_libdir/mysql/{,plugin}/*.{a,la}
|
||||
# XXX: package these? The ndb tools are linked statically atm
|
||||
rm -f %buildroot%_libdir/mysql/libndbclient.*
|
||||
rm -f %{buildroot}/usr/share/mysql-test/{mysql-test-run,mtr}
|
||||
rm -f %{buildroot}/usr/share/mysql/{binary-configure,errmsg-utf8.txt,magic,mysql-log-rotate,mysql*.server}
|
||||
@ -27,8 +23,7 @@ rm -f %{buildroot}%{_libdir}/mysql/plugin/daemon_example.ini
|
||||
ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mtr
|
||||
ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mysql-test-run
|
||||
mv %{buildroot}/usr/share/mysql-test/lib/My/SafeProcess/my_safe_process %{buildroot}%{_bindir}
|
||||
# generate filelist for binaries and their manpages (easier than enumerating
|
||||
# all the binaries and manapages manually
|
||||
# generate filelist for binaries and their manpages
|
||||
filelist()
|
||||
{
|
||||
echo '%%defattr(-, root, root)'
|
||||
@ -125,23 +120,6 @@ cat mysql-ndb-storage.files mysql-ndb-management.files \
|
||||
rm -f .$tmp
|
||||
done
|
||||
%endif
|
||||
pushd '%buildroot'/%_libdir
|
||||
for i in *.so.*.*.*; do
|
||||
if [ -L "$i" ]; then
|
||||
trg="`readlink "$i"`"
|
||||
rm "$i"
|
||||
mv "$trg" "$i"
|
||||
ln -s "$i" "$trg"
|
||||
fi
|
||||
done
|
||||
for i in *.so.*; do
|
||||
if [ -L "$i" ] && [ -L "`readlink "$i"`" ]; then
|
||||
trg="`readlink "$i"`"
|
||||
rm "$i"
|
||||
ln -s "`readlink "$trg"`" "$i"
|
||||
fi
|
||||
done
|
||||
popd
|
||||
%if ! 0%{prefered} > 0
|
||||
cat libmysqlclient-devel.files | sed 's|%%doc\ ||' | while read tmp; do
|
||||
cd '%buildroot'
|
||||
|
||||
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 21 14:52:43 CEST 2013 - mhrusecky@suse.cz
|
||||
|
||||
- fix includedir in configuration file
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Aug 17 13:46:26 UTC 2013 - hrvoje.senjan@gmail.com
|
||||
|
||||
- Fix INSTALL_LIBDIR_RPM and INSTALL_PLUGINDIR_RPM, they need to
|
||||
point to %_lib, not %_libdir
|
||||
- Drop so symlink generation and removal, that is not necessary and
|
||||
breaks non x86_64 builds of dependent packages
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 12 14:32:51 CEST 2013 - mhrusecky@suse.cz
|
||||
|
||||
|
||||
@ -447,7 +447,7 @@ end
|
||||
%posttrans
|
||||
if [ -d /var/lib/mysql ]; then
|
||||
touch /var/lib/mysql/.run-mysql_upgrade
|
||||
chown -R mysql:mysql /var/lib/mysql
|
||||
chown -R --no-dereference mysql:mysql /var/lib/mysql
|
||||
fi
|
||||
for i in /var/lib/mysql/{.protected,.tmp}; do
|
||||
( [ -d "$i" ] && rmdir "$i" ) || :
|
||||
|
||||
4
my.ini
4
my.ini
@ -98,6 +98,6 @@ log = /var/log/mysqld_multi.log
|
||||
# socket = /var/lib/mysql-databases/mysqld6/mysql.sock
|
||||
# user = mysql
|
||||
|
||||
!include_dir /etc/mysql
|
||||
!include_dir /etc/my.cnf.d
|
||||
!includedir /etc/mysql
|
||||
!includedir /etc/my.cnf.d
|
||||
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3c9a38335384fb99e0ac76488a2dd72cefa8fbca5f9f2b191c2348ecc64d6b0b
|
||||
size 13306
|
||||
oid sha256:166945cf5ab12a72f10c01211781dc3da69d71e6d24e55756220d2865af8654e
|
||||
size 13346
|
||||
|
||||
Loading…
Reference in New Issue
Block a user