rpms/mariadb
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix multilib header location for arm

Browse Source
This commit is contained in:
Honza Horák 2013-07-30 12:14:56 +02:00
parent ea30ccdab4
commit 0aac98ab5a
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mariadb.spec
View File

@ -394,12 +394,18 @@ find $RPM_BUILD_ROOT -print | sed "s|^$RPM_BUILD_ROOT||" | sort > ROOTFILES
# multilib header hacks # multilib header hacks
# we only apply this to known Red Hat multilib arches, per bug #181335 # we only apply this to known Red Hat multilib arches, per bug #181335
case `uname -i` in case `uname -i` in
i386 | x86_64 | ppc | ppc64 | ppc64p7 | s390 | s390x | sparc | sparc64 ) i386 | x86_64 | ppc | ppc64 | ppc64p7 | s390 | s390x | sparc | sparc64 | aarch64 )
mv $RPM_BUILD_ROOT%{_includedir}/mysql/my_config.h $RPM_BUILD_ROOT%{_includedir}/mysql/my_config_`uname -i`.h mv $RPM_BUILD_ROOT%{_includedir}/mysql/my_config.h $RPM_BUILD_ROOT%{_includedir}/mysql/my_config_`uname -i`.h
mv $RPM_BUILD_ROOT%{_includedir}/mysql/private/config.h $RPM_BUILD_ROOT%{_includedir}/mysql/private/my_config_`uname -i`.h mv $RPM_BUILD_ROOT%{_includedir}/mysql/private/config.h $RPM_BUILD_ROOT%{_includedir}/mysql/private/my_config_`uname -i`.h
install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_includedir}/mysql/ install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_includedir}/mysql/
install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_includedir}/mysql/private/config.h install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_includedir}/mysql/private/config.h
;; ;;
arm* )
mv $RPM_BUILD_ROOT%{_includedir}/mysql/my_config.h $RPM_BUILD_ROOT%{_includedir}/mysql/my_config_arm.h
mv $RPM_BUILD_ROOT%{_includedir}/mysql/private/config.h $RPM_BUILD_ROOT%{_includedir}/mysql/private/my_config_arm.h
install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_includedir}/mysql/
install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_includedir}/mysql/private/config.h
;;
*) *)
;; ;;
esac esac
@ -742,6 +748,7 @@ fi
- Remove unneeded systemd-sysv requires - Remove unneeded systemd-sysv requires
- Provide mysql-compat-server symbol - Provide mysql-compat-server symbol
- Create mariadb.service symlink - Create mariadb.service symlink
- Fix multilib header location for arm
* Sun Jul 28 2013 Dennis Gilmore <dennis@ausil.us> - 5.5.32-5 * Sun Jul 28 2013 Dennis Gilmore <dennis@ausil.us> - 5.5.32-5
- remove "Requires(pretrans): systemd" since its not possible - remove "Requires(pretrans): systemd" since its not possible

4
my_config.h
View File

@ -26,4 +26,8 @@
#include "my_config_sparc64.h" #include "my_config_sparc64.h"
#elif defined(__sparc__) #elif defined(__sparc__)
#include "my_config_sparc.h" #include "my_config_sparc.h"
#elif defined(__arm__)
#include "my_config_arm.h"
#elif defined(__aarch64__)
#include "my_config_aarch64.h"
#endif #endif