From 0727300cba8d36e5a07004b4d9e4f4dfb8ae35ab Mon Sep 17 00:00:00 2001 From: Andrew Lewman Date: Tue, 28 Mar 2006 16:54:29 +0000 Subject: Force rpmbuild to behave and honor target_cpu. svn:r6269 --- tor.spec.in | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'tor.spec.in') diff --git a/tor.spec.in b/tor.spec.in index 330093a836..0fc267fd8a 100644 --- a/tor.spec.in +++ b/tor.spec.in @@ -22,6 +22,16 @@ %define target_cpu i386 %define target_os linux +## Override any system rpm macros +# +%define _arch %{target_cpu} +%define _build_arch %{target_cpu} +%define _vendor %{target_os} +%define _host %{target_cpu}-pc-%{target_os}-%{target} +%define _host_cpu %{target_cpu} +%define _host_vendor %{target_os} +%define optflags -march=%{target_cpu} -mcpu=%{target_cpu} -O + ## Version song and dance # # This should be the Tor version number, as it appears on the tarball, @@ -157,9 +167,7 @@ for high-stakes anonymity. %build %configure --with-tor-user=%{toruser} --with-tor-group=%{torgroup} \ - --build=%{target_cpu}-pc-%{target_os}-%{target} \ - --host=%{target_cpu}-pc-%{target_os}-%{target} \ - --target=%{target_cpu}-pc-%{target_os}-%{target} + --build=%{_host} --host=%{_host} --target=%{_host} %make %install @@ -275,6 +283,11 @@ exit 0 %changelog +* Tue Mar 28 2006 Andrew Lewman +- converted to build the specified target cpu and arch +- override related rpm macros to build correctly +- see OR-CVS for details + * Mon Jan 17 2005 John Bashinski - Take runtime user and group names from configure system. Default user/group names are now "_tor"; blame Roger... -- cgit v1.2.3-54-g00ecf