commit 2ad755b15b27c46282fe3017e9d42c292366ea64
Author: Elan Ruusamäe <[email protected]>
Date: Sun Feb 9 13:53:05 2014 +0200
use configure to pass cc/cflags/ldflags
prosody.spec | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/prosody.spec b/prosody.spec
index 219dfd0..9d6959b 100644
--- a/prosody.spec
+++ b/prosody.spec
@@ -25,9 +25,9 @@ Requires: lua-filesystem
Requires: lua-sec
Requires: systemd-units >= 0.38
Requires(post,preun,postun): systemd-units >= 38
-BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
Requires(pre): /usr/sbin/groupadd
Requires(pre): /usr/sbin/useradd
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
Prosody is a flexible communications server for Jabber/XMPP written in
@@ -40,17 +40,18 @@ rapidly develop added functionality, or prototype new
protocols.
%patch0 -p1
sed -e 's|$(PREFIX)/lib|$(PREFIX)/%{_lib}|' -i Makefile
# fix wrong end of line encoding
-sed -i -e 's|\r||g' doc/stanza.txt doc/session.txt doc/roster_format.txt
+%undos doc/stanza.txt doc/session.txt doc/roster_format.txt
%build
./configure \
- --with-lua-include=%{_includedir}/lua51 \
- --lua-suffix=51 \
- --prefix=%{_prefix} \
- --runwith=lua51
-%{__make} \
- CC=%{__cc} \
- CFLAGS="%{rpmcflags} -fPIC"
+ --prefix=%{_prefix} \
+ --with-lua-include=%{_includedir}/lua51 \
+ --lua-suffix=51 \
+ --runwith=lua51 \
+ --c-compiler="%{__cc}" \
+ --cflags="%{rpmcppflags} %{rpmcflags} -fPIC -Wall -D_GNU_SOURCE" \
+ --ldflags="%{rpmldflags} -shared"
+%{__make}
%install
rm -rf $RPM_BUILD_ROOT
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/prosody.git/commitdiff/2ad755b15b27c46282fe3017e9d42c292366ea64
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
