nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implement first version of the ability to target arch and OS in rpm

Browse Source 
builds.  This also implements the resulting dist-rpm filename to match the
target arch.


svn:r6023
This commit is contained in:
Andrew Lewman 2006-02-16 21:53:18 +00:00
parent fc2522dd02
commit fab7268bf0
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -23,8 +23,8 @@ dist-rpm: dist
mkdir $$RPM_BUILD_DIR/$$subdir; \ mkdir $$RPM_BUILD_DIR/$$subdir; \
done; \ done; \
cp tor-$(VERSION).tar.gz $$RPM_BUILD_DIR/SOURCES; \ cp tor-$(VERSION).tar.gz $$RPM_BUILD_DIR/SOURCES; \
rpmbuild -ba --define "_topdir $$RPM_BUILD_DIR" \ rpmbuild -ba --define "_topdir $$RPM_BUILD_DIR" tor.spec;
$$RPMBUILD_OPTIONS tor.spec; \ # $$RPMBUILD_OPTIONS tor.spec; \
mv $$RPM_BUILD_DIR/SRPMS/* .; \ mv $$RPM_BUILD_DIR/SRPMS/* .; \
mv $$RPM_BUILD_DIR/RPMS/*/* .; \ mv $$RPM_BUILD_DIR/RPMS/*/* .; \
rm -rf $$RPM_BUILD_DIR rm -rf $$RPM_BUILD_DIR

17
tor.spec.in
View File

@ -15,6 +15,13 @@
%define toruser @TORUSER@ %define toruser @TORUSER@
%define torgroup @TORGROUP@ %define torgroup @TORGROUP@
## Target a specific arch and OS
#
# default is i386 linux
%define target gnu
%define target_cpu i386
%define target_os linux
## Version song and dance ## Version song and dance
# #
# This should be the Tor version number, as it appears on the tarball, # This should be the Tor version number, as it appears on the tarball,
@ -25,6 +32,11 @@
%define version %(echo %{native_version} | sed -e 's/-/./g') %define version %(echo %{native_version} | sed -e 's/-/./g')
## Define output filename
#
# This creates filenames based upon the value of target_cpu defined above
%define _build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%{target_cpu}.rpm
## Release and OS identification song and dance ## Release and OS identification song and dance
# #
# This identifies the lineage of the spec file. This file is the # This identifies the lineage of the spec file. This file is the
@ -144,7 +156,10 @@ for high-stakes anonymity.
%setup -q -n %{name}-%{native_version} %setup -q -n %{name}-%{native_version}
%build %build
%configure --with-tor-user=%{toruser} --with-tor-group=%{torgroup} %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}
%make %make
%install %install