[packages/ruby-ffi] drop setup.rb use
glen
glen at pld-linux.org
Mon Apr 24 22:29:27 CEST 2017
commit 090d52d273b5d7a08e665e51ca99908f97f2eaa0
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Mon Apr 24 23:21:21 2017 +0300
drop setup.rb use
not really needed, and broken with ruby 2.3
ruby-ffi.spec | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/ruby-ffi.spec b/ruby-ffi.spec
index 828d99f..e4c5b6f 100644
--- a/ruby-ffi.spec
+++ b/ruby-ffi.spec
@@ -20,7 +20,6 @@ BuildRequires: libffi-devel >= %{ffi_req}
BuildRequires: rpm-rubyprov
BuildRequires: rpmbuild(macros) >= 1.665
BuildRequires: ruby-devel
-BuildRequires: setup.rb
%if %{with tests}
BuildRequires: ruby-rspec
BuildRequires: ruby-rspec-mocks
@@ -95,15 +94,13 @@ find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
%build
%__gem_helper spec
-%{__ruby} setup.rb config \
- --rbdir=%{ruby_rubylibdir} \
- --sodir=%{ruby_archdir} \
- --makeprog=true
-
-%{__ruby} setup.rb setup
-
-%{__make} -C ext/ffi_c \
- CC="%{__cc}"
+cd ext/ffi_c
+%{__ruby} extconf.rb
+%{__make} \
+ CC="%{__cc}" \
+ ldflags="%{rpmldflags}" \
+ optflags="%{rpmcflags} -fPIC"
+cd -
%if %{with tests}
%{__make} -f libtest/GNUmakefile \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ruby-ffi.git/commitdiff/e8f068f9a16bfa85b78bc801ec415a00c47438cd
More information about the pld-cvs-commit
mailing list