Merge pull request #1754 from LuaAndC/tor-0.3.0.6

Update tor to 0.3.0.7, enable build out-of-tree, install with -j 1 and enable shared targets
This commit is contained in:
Boris Nagaev 2017-05-19 08:13:33 +00:00 committed by GitHub
commit bc5f9fc914
3 changed files with 17 additions and 56 deletions

View File

@ -144,6 +144,16 @@ MXE_DISABLE_DOCS = \
dist_man7_MANS= \
dist_man8_MANS= \
dist_man9_MANS= \
nodist_man_MANS= \
nodist_man1_MANS= \
nodist_man2_MANS= \
nodist_man3_MANS= \
nodist_man4_MANS= \
nodist_man5_MANS= \
nodist_man6_MANS= \
nodist_man7_MANS= \
nodist_man8_MANS= \
nodist_man9_MANS= \
notrans_dist_man_MANS= \
MANLINKS= \
info_TEXINFOS= \

View File

@ -1,49 +0,0 @@
This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Sun, 21 Feb 2016 22:51:30 +0300
Subject: [PATCH] do not use mman-win32
tor can be compiled without mman-win32, because it has own
implementation of mmap using Windows API. But if mman-win32
is installed, tor tries to use it resulting in linking errors.
(In MXE mman-win32 installs DLLs even for static targets!)
diff --git a/src/common/compat.c b/src/common/compat.c
index 1111111..2222222 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -116,7 +116,7 @@ SecureZeroMemory(PVOID ptr, SIZE_T cnt)
#ifdef HAVE_SIGNAL_H
#include <signal.h>
#endif
-#ifdef HAVE_SYS_MMAN_H
+#if 0
#include <sys/mman.h>
#endif
#ifdef HAVE_SYS_SYSLIMITS_H
@@ -204,7 +204,7 @@ tor_rename(const char *path_old, const char *path_new)
sandbox_intern_string(path_new));
}
-#if defined(HAVE_SYS_MMAN_H) || defined(RUNNING_DOXYGEN)
+#if 0
/** Try to create a memory mapping for <b>filename</b> and return it. On
* failure, return NULL. Sets errno properly, using ERANGE to mean
* "empty file". */
diff --git a/src/common/compat.h b/src/common/compat.h
index 1111111..2222222 100644
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -311,7 +311,7 @@ typedef struct tor_mmap_t {
size_t size; /**< Size of the file. */
/* None of the fields below should be accessed from outside compat.c */
-#ifdef HAVE_SYS_MMAN_H
+#if 0
size_t mapping_size; /**< Size of the actual mapping. (This is this file
* size, rounded up to the nearest page.) */
#elif defined _WIN32

View File

@ -2,8 +2,8 @@
PKG := tor
$(PKG)_IGNORE :=
$(PKG)_VERSION := 0.2.9.9
$(PKG)_CHECKSUM := 33325d2b250fd047ba2ddc5d11c2190c4e2951f4b03ec48ebd8bf0666e990d43
$(PKG)_VERSION := 0.3.0.7
$(PKG)_CHECKSUM := 9640c4448ef3cad7237c68ed6984e705db8fb2b9d6bb74c8815d01bb06527d02
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := https://torproject.org/dist/$($(PKG)_FILE)
@ -18,11 +18,11 @@ $(WGET) -q -O- 'https://torproject.org/download/download' | \
endef
define $(PKG)_BUILD
cd '$(1)' && \
cd '$(BUILD_DIR)' && \
LIBS="`'$(TARGET)-pkg-config' --libs-only-l openssl`" \
./configure \
'$(SOURCE_DIR)/configure' \
$(MXE_CONFIGURE_OPTS)
$(MAKE) -C '$(1)' -j '$(JOBS)' install $(MXE_DISABLE_DOCS)
$(SED) 's@#define HAVE_SYS_MMAN_H 1@// Disabled in MXE #define HAVE_SYS_MMAN_H 1@' -i '$(BUILD_DIR)/orconfig.h'
$(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' $(MXE_DISABLE_DOCS)
$(MAKE) -C '$(BUILD_DIR)' -j 1 install $(MXE_DISABLE_DOCS)
endef
$(PKG)_BUILD_SHARED =