Skip to content

Commit

Permalink
Merge pull request mxe#1754 from LuaAndC/tor-0.3.0.6
Browse files Browse the repository at this point in the history
Update tor to 0.3.0.7, enable build out-of-tree, install with -j 1 and enable shared targets
  • Loading branch information
starius authored May 19, 2017
2 parents e2dc29e + 47c6a67 commit bc5f9fc
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 56 deletions.
10 changes: 10 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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= \
Expand Down
49 changes: 0 additions & 49 deletions plugins/apps/tor-1-fixes.patch

This file was deleted.

14 changes: 7 additions & 7 deletions plugins/apps/tor.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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 =

0 comments on commit bc5f9fc

Please sign in to comment.