diff options
| author | Andrew Lewman <andrew@torproject.org> | 2006-03-28 16:54:29 +0000 |
|---|---|---|
| committer | Andrew Lewman <andrew@torproject.org> | 2006-03-28 16:54:29 +0000 |
| commit | 0727300cba8d36e5a07004b4d9e4f4dfb8ae35ab (patch) | |
| tree | bca4f53d3cdf98031802271f4511e41c7d71d76b /tor.spec.in | |
| parent | 52cb456a19bdc46c2bcbda1954d40b9e187bbd75 (diff) | |
| download | tor-0727300cba8d36e5a07004b4d9e4f4dfb8ae35ab.tar.gz tor-0727300cba8d36e5a07004b4d9e4f4dfb8ae35ab.zip | |
Force rpmbuild to behave and honor target_cpu.
svn:r6269
Diffstat (limited to 'tor.spec.in')
| -rw-r--r-- | tor.spec.in | 19 |
1 files changed, 16 insertions, 3 deletions
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 <phobos@interloper.org> +- 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 <jbash@velvet.com> - Take runtime user and group names from configure system. Default user/group names are now "_tor"; blame Roger... |