User helper macro to fixup config.h for multilib

This commit is contained in:
Tom Stellard 2018-11-06 00:28:53 +00:00
parent 120d6498d7
commit 816ea521a1
2 changed files with 8 additions and 14 deletions

View File

@ -1,9 +0,0 @@
#include <bits/wordsize.h>
#if __WORDSIZE == 32
#include "config-32.h"
#elif __WORDSIZE == 64
#include "config-64.h"
#else
#error "Unknown word size"
#endif

View File

@ -58,7 +58,7 @@
Name: %pkg_name Name: %pkg_name
Version: %{maj_ver}.%{min_ver}.%{patch_ver} Version: %{maj_ver}.%{min_ver}.%{patch_ver}
Release: 2%{?dist} Release: 3%{?dist}
Summary: A C language family front-end for LLVM Summary: A C language family front-end for LLVM
License: NCSA License: NCSA
@ -76,8 +76,6 @@ Source1: http://llvm.org/releases/%{version}/%{clang_tools_srcdir}.tar.xz
Source2: %{test_suite_srcdir}.tar.xz Source2: %{test_suite_srcdir}.tar.xz
%endif %endif
Source100: clang-config.h
Patch0: 0001-lit.cfg-Add-hack-so-lit-can-find-not-and-FileCheck.patch Patch0: 0001-lit.cfg-Add-hack-so-lit-can-find-not-and-FileCheck.patch
Patch1: 0001-GCC-compatibility-Ignore-fstack-clash-protection.patch Patch1: 0001-GCC-compatibility-Ignore-fstack-clash-protection.patch
Patch2: 0001-Driver-Prefer-vendor-supplied-gcc-toolchain.patch Patch2: 0001-Driver-Prefer-vendor-supplied-gcc-toolchain.patch
@ -120,6 +118,9 @@ BuildRequires: libatomic
# We need python3-devel for pathfix.py. # We need python3-devel for pathfix.py.
BuildRequires: python3-devel BuildRequires: python3-devel
# Needed for %%multilib_fix_c_header
BuildRequires: multilib-rpm-config
Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release}
# clang requires gcc, clang++ requires libstdc++-devel # clang requires gcc, clang++ requires libstdc++-devel
@ -337,8 +338,7 @@ mkdir -p %{buildroot}%{python2_sitelib}/clang/
install -p -m644 bindings/python/clang/* %{buildroot}%{python2_sitelib}/clang/ install -p -m644 bindings/python/clang/* %{buildroot}%{python2_sitelib}/clang/
# multilib fix # multilib fix
mv -v %{buildroot}%{_includedir}/clang/Config/config{,-%{__isa_bits}}.h %multilib_fix_c_header --file %{_includedir}/clang/Config/config.h
install -m 0644 %{SOURCE100} %{buildroot}%{_includedir}/clang/Config/config.h
# Move emacs integration files to the correct directory # Move emacs integration files to the correct directory
mkdir -p %{buildroot}%{_emacs_sitestartdir} mkdir -p %{buildroot}%{_emacs_sitestartdir}
@ -448,6 +448,9 @@ false
%endif %endif
%changelog %changelog
* Mon Nov 05 2018 Tom Stellard <tstellar@redhat.com> - 7.0.0-3
- User helper macro to fixup config.h for multilib
* Tue Oct 02 2018 Tom Stellard <tstellar@redhat.com> - 7.0.0-2 * Tue Oct 02 2018 Tom Stellard <tstellar@redhat.com> - 7.0.0-2
- Use correct shebang substitution for python scripts - Use correct shebang substitution for python scripts