install macros.meson from 0.47 instead of patching incompatible macros.meson provided internally [release 0.49.0-2mamba;Mon Dec 24 2018]
This commit is contained in:
parent
9e4660ef0c
commit
d8efee7e4b
42
macros.meson
Normal file
42
macros.meson
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
%__meson %{_bindir}/meson
|
||||||
|
%__meson_wrap_mode nodownload
|
||||||
|
|
||||||
|
%meson \
|
||||||
|
export CFLAGS="${CFLAGS:-%optflags}" \
|
||||||
|
export CXXFLAGS="${CXXFLAGS:-%optflags}" \
|
||||||
|
export FFLAGS="${FFLAGS:-%optflags}" \
|
||||||
|
export FCFLAGS="${FCFLAGS}" \
|
||||||
|
export LDFLAGS="${LDFLAGS}" \
|
||||||
|
%{__meson} \\\
|
||||||
|
--buildtype=plain \\\
|
||||||
|
--prefix=%{_prefix} \\\
|
||||||
|
--libdir=%{_libdir} \\\
|
||||||
|
--libexecdir=%{_libexecdir} \\\
|
||||||
|
--bindir=%{_bindir} \\\
|
||||||
|
--sbindir=%{_sbindir} \\\
|
||||||
|
--includedir=%{_includedir} \\\
|
||||||
|
--datadir=%{_datadir} \\\
|
||||||
|
--mandir=%{_mandir} \\\
|
||||||
|
--infodir=%{_infodir} \\\
|
||||||
|
--localedir=%{_datadir}/locale \\\
|
||||||
|
--sysconfdir=%{_sysconfdir} \\\
|
||||||
|
--localstatedir=%{_localstatedir} \\\
|
||||||
|
--sharedstatedir=%{_sharedstatedir} \\\
|
||||||
|
--wrap-mode=%{__meson_wrap_mode} \\\
|
||||||
|
. build \\\
|
||||||
|
%{nil}
|
||||||
|
|
||||||
|
%meson_build \
|
||||||
|
ninja -C build
|
||||||
|
|
||||||
|
%meson_install \
|
||||||
|
export DESTDIR="%{buildroot}" \
|
||||||
|
ninja install -C build
|
||||||
|
|
||||||
|
%meson_test \
|
||||||
|
ninja test -C build || \
|
||||||
|
( rc=$?; \
|
||||||
|
echo "-----BEGIN TESTLOG-----"; \
|
||||||
|
cat %{_vpath_builddir}/meson-logs/testlog.txt; \
|
||||||
|
echo "-----END TESTLOG-----"; \
|
||||||
|
exit $rc; )
|
10
meson.spec
10
meson.spec
@ -1,6 +1,6 @@
|
|||||||
Name: meson
|
Name: meson
|
||||||
Version: 0.49.0
|
Version: 0.49.0
|
||||||
Release: 1mamba
|
Release: 2mamba
|
||||||
Summary: The Meson Build System
|
Summary: The Meson Build System
|
||||||
Group: Development/Tools
|
Group: Development/Tools
|
||||||
Vendor: openmamba
|
Vendor: openmamba
|
||||||
@ -9,6 +9,7 @@ Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
|||||||
URL: http://mesonbuild.com/
|
URL: http://mesonbuild.com/
|
||||||
## GITSOURCE https://github.com/mesonbuild/meson.git 0.43.0
|
## GITSOURCE https://github.com/mesonbuild/meson.git 0.43.0
|
||||||
Source: https://github.com/mesonbuild/meson.git/%{version}/meson-%{version}.tar.bz2
|
Source: https://github.com/mesonbuild/meson.git/%{version}/meson-%{version}.tar.bz2
|
||||||
|
Source1: macros.meson
|
||||||
Patch0: meson-0.48.1-rpm-macros.patch
|
Patch0: meson-0.48.1-rpm-macros.patch
|
||||||
License: Apache License 2.0
|
License: Apache License 2.0
|
||||||
## AUTOBUILDREQ-BEGIN
|
## AUTOBUILDREQ-BEGIN
|
||||||
@ -27,7 +28,7 @@ The Meson Build System.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1
|
#%patch0 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
CFLAGS="%{optflags}" %{__python36} setup.py build
|
CFLAGS="%{optflags}" %{__python36} setup.py build
|
||||||
@ -43,7 +44,7 @@ CFLAGS="%{optflags}" %{__python36} setup.py build
|
|||||||
|
|
||||||
sed -i "s,.*/man/.*,&.gz," %{name}.filelist
|
sed -i "s,.*/man/.*,&.gz," %{name}.filelist
|
||||||
|
|
||||||
install -D -m0644 data/macros.meson %{buildroot}%{_sysconfdir}/rpm/macros.meson
|
install -D -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm/macros.meson
|
||||||
|
|
||||||
%find_lang %{name} || touch %{name}.lang
|
%find_lang %{name} || touch %{name}.lang
|
||||||
|
|
||||||
@ -56,6 +57,9 @@ install -D -m0644 data/macros.meson %{buildroot}%{_sysconfdir}/rpm/macros.meson
|
|||||||
%doc COPYING
|
%doc COPYING
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Dec 24 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 0.49.0-2mamba
|
||||||
|
- install macros.meson from 0.47 instead of patching incompatible macros.meson provided internally
|
||||||
|
|
||||||
* Mon Dec 10 2018 Automatic Build System <autodist@mambasoft.it> 0.49.0-1mamba
|
* Mon Dec 10 2018 Automatic Build System <autodist@mambasoft.it> 0.49.0-1mamba
|
||||||
- automatic version update by autodist
|
- automatic version update by autodist
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user