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

As nick commented, tor's configure doesn't know what --enable-static and

Browse Source 
--disable-shared actually are, so remove it from docs and spec file.


svn:r12321
This commit is contained in:
Andrew Lewman 2007-11-02 02:40:03 +00:00
parent 14be21f31e
commit 2136c82ae0
4 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/tor-osx-dmg-creation.txt
View File

@ -69,7 +69,7 @@ Extract the tarball.
11) Update three variables in contrib/osx/package.sh: 11) Update three variables in contrib/osx/package.sh:
PRIVOXY_PKG_ZIP=~/tmp/privoxyosx_setup_3.0.6.zip PRIVOXY_PKG_ZIP=~/tmp/privoxyosx_setup_3.0.6.zip
TORBUTTON_PATH=~/tmp/torbutton-1.1.8-alpha.xpi TORBUTTON_PATH=~/tmp/torbutton-1.1.9.1-alpha.xpi
TORBUTTON_LIC_PATH=~/tmp/LICENSE TORBUTTON_LIC_PATH=~/tmp/LICENSE
Make sure the paths are correct. The build will fail if they are not. Make sure the paths are correct. The build will fail if they are not.
@ -80,8 +80,7 @@ CFLAGS="-O -g -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" \
LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" \ LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" \
CONFDIR=/Library/Tor \ CONFDIR=/Library/Tor \
./configure --prefix=/Library/Tor --bindir=/Library/Tor \ ./configure --prefix=/Library/Tor --bindir=/Library/Tor \
--sysconfdir=/Library --enable-static --disable-shared \ --sysconfdir=/Library --disable-dependency-tracking
--disable-dependency-tracking
13) "make dist-osx" 13) "make dist-osx"
@ -138,7 +137,7 @@ tarball.
4) Update three variables in contrib/osx/package.sh: 4) Update three variables in contrib/osx/package.sh:
PRIVOXY_PKG_ZIP=~/tmp/privoxyosx_setup_3.0.6.zip PRIVOXY_PKG_ZIP=~/tmp/privoxyosx_setup_3.0.6.zip
TORBUTTON_PATH=~/tmp/torbutton-1.1.8-alpha.xpi TORBUTTON_PATH=~/tmp/torbutton-1.1.9.1-alpha.xpi
TORBUTTON_LIC_PATH=~/tmp/LICENSE TORBUTTON_LIC_PATH=~/tmp/LICENSE
Make sure the paths are correct. The build will fail if they are not. Make sure the paths are correct. The build will fail if they are not.
@ -146,8 +145,7 @@ Make sure the paths are correct. The build will fail if they are not.
5) In the top level, this means /path/to/tor/, not tor/contrib/osx, 5) In the top level, this means /path/to/tor/, not tor/contrib/osx,
do a configure with these parameters: do a configure with these parameters:
CONFDIR=/Library/Tor ./configure --prefix=/Library/Tor \ CONFDIR=/Library/Tor ./configure --prefix=/Library/Tor \
--bindir=/Library/Tor --sysconfdir=/Library \ --bindir=/Library/Tor --sysconfdir=/Library
--enable-eventdns --enable-static --disable-shared
6) In same top level dir, do a "make dist-osx". There now exists a 6) In same top level dir, do a "make dist-osx". There now exists a
.dmg file in the same directory. Install from this dmg. .dmg file in the same directory. Install from this dmg.

2
doc/tor-rpm-creation.txt
View File

@ -58,7 +58,7 @@ The process used to create the distributed rpms is as follows:
Download and Extract the latest tor source code from https://www.torproject.org/. Download and Extract the latest tor source code from https://www.torproject.org/.
In the Tor directory: In the Tor directory:
./configure --enable-eventdns --enable-static --disable-shared ./configure
make dist-rpm make dist-rpm
You should have at least two, maybe three, rpms. There should be the binary You should have at least two, maybe three, rpms. There should be the binary

8
doc/tor-win32-mingw-creation.txt
View File

@ -27,15 +27,15 @@ Stage Two: Download, extract, compile openssl
---------------------------------------------- ----------------------------------------------
Download openssl: Download openssl:
http://www.openssl.org/source/openssl-0.9.8e.tar.gz http://www.openssl.org/source/openssl-0.9.8g.tar.gz
Extract openssl: Extract openssl:
Copy the openssl tarball into the "tor-mingw" directory. Copy the openssl tarball into the "tor-mingw" directory.
Type "cd tor-mingw/" Type "cd tor-mingw/"
Type "tar zxf openssl-0.9.8e.tar.gz" Type "tar zxf openssl-0.9.8g.tar.gz"
Make openssl libraries: Make openssl libraries:
Type "cd tor-mingw/openssl-0.9.8e/" Type "cd tor-mingw/openssl-0.9.8g/"
Type "./Configure -no-idea -no-rc5 -no-mdc2 mingw" Type "./Configure -no-idea -no-rc5 -no-mdc2 mingw"
Edit Makefile and remove the "test:" and "tests:" sections. Edit Makefile and remove the "test:" and "tests:" sections.
Type "rm -rf ./test" Type "rm -rf ./test"
@ -107,7 +107,7 @@ Extract Tor:
Type "tar zxf latest-tor-alpha.tar.gz" Type "tar zxf latest-tor-alpha.tar.gz"
cd tor-<version> cd tor-<version>
Type "./configure --enable-static --disable-shared" Type "./configure"
Type "make" Type "make"
You now have a tor.exe in src/or/. This is Tor. You now have a tor.exe in src/or/. This is Tor.

3
tor.spec.in
View File

@ -170,8 +170,7 @@ for high-stakes anonymity.
%build %build
%if %{is_suse} %if %{is_suse}
%configure --with-tor-user=%{toruser} --with-tor-group=%{torgroup} \ %configure --with-tor-user=%{toruser} --with-tor-group=%{torgroup} \
--build=%{_host} --host=%{_host} --target=%{_host} \ --build=%{_host} --host=%{_host} --target=%{_host}
--enable-static --disable-shared
%else %else
%configure --with-tor-user=%{toruser} --with-tor-group=%{torgroup} \ %configure --with-tor-user=%{toruser} --with-tor-group=%{torgroup} \
--build=%{_host} --host=%{_host} --target=%{_host} --build=%{_host} --host=%{_host} --target=%{_host}