#3 Use make_build macro instead of just make
Closed a year ago by pwu. Opened 4 years ago by tstellar.
rpms/ tstellar/marisa make_build  into  rawhide

file modified
+10 -6
@@ -8,7 +8,7 @@ 

  

  Name:          marisa

  Version:       0.2.4

- Release:       45%{?dist}

+ Release:       46%{?dist}

  Summary:       Static and spece-efficient trie data structure library

  

  License:       BSD or LGPLv2+
@@ -112,17 +112,17 @@ 

  %configure --disable-static

  sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool

  sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool

- make %{?_smp_mflags}

+ %{make_build}

  

  # build Perl bindings

  pushd bindings/perl

  %{__perl} Makefile.PL INC="-I%{_builddir}/%{name}-%{version}/lib" LIBS="-L%{_builddir}/%{name}-%{version}/lib/.libs -lmarisa" INSTALLDIRS=vendor

- make %{?_smp_mflags}

+ %{make_build}

  popd

  

  # build Python bindings

  # Regenerate Python bindings

- make --directory=bindings swig-python

+ %{make_build} --directory=bindings swig-python

  

  pushd bindings/python

  %if %{with python2}
@@ -137,12 +137,12 @@ 

  # build Ruby bindings

  # Regenerate ruby bindings

  pushd bindings

- make swig-ruby

+ %{make_build} swig-ruby

  popd

  

  pushd bindings/ruby

  ruby extconf.rb --with-opt-include="%{_builddir}/%{name}-%{version}/lib" --with-opt-lib="%{_builddir}/%{name}-%{version}/lib/.libs" --vendor

- make

+ %{make_build}

  popd

  

  %install
@@ -222,6 +222,10 @@ 

  %{ruby_vendorarchdir}/marisa.so

  

  %changelog

+ * Tue May 26 2020 Tom Stellard <tstellar@redhat.com> - 0.2.4-46

+ - Use make_build macro instead of just make

+ - https://docs.fedoraproject.org/en-US/packaging-guidelines/#_parallel_make

+ 

  * Tue May 26 2020 Miro HronĨok <mhroncok@redhat.com> - 0.2.4-45

  - Rebuilt for Python 3.9

  

rebased onto da6aa1e

4 years ago

Thanks for the patch! I just switch to use the macro in the spec file.

Pull-Request has been closed by pwu

a year ago