commit 298be30fce26ad1fa620ddd831922136f7931fc5 Author: Sebastian Hahn sebastian@torproject.org Date: Fri Feb 3 05:27:58 2012 +0100

Remove the zlib patch, specify env variables instead --- build-scripts/windows.mk | 7 +--- .../zlib/0001-zlib-update-Makefile.patch | 38 -------------------- 2 files changed, 2 insertions(+), 43 deletions(-)

diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index a8ddb91..143d82c 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -71,12 +71,9 @@ source-dance: fetch-source unpack-source

ZLIB_DIR=$(FETCH_DIR)/zlib-$(ZLIB_VER) build-zlib: - cp ../src/current-patches/zlib/* $(ZLIB_DIR) - cp patch-any-src.sh $(ZLIB_DIR) - cd $(ZLIB_DIR) && ./patch-any-src.sh cd $(ZLIB_DIR) && sed -i -e "s%prefix = /usr/local%prefix = ${BUILT_DIR}%" win32/Makefile.gcc - cd $(ZLIB_DIR) && make -f win32/Makefile.gcc - cd $(ZLIB_DIR) && make -f win32/Makefile.gcc install + cd $(ZLIB_DIR) && LDFLAGS="-Wl,--nxcompat -Wl,--dynamicbase" make -f win32/Makefile.gcc + cd $(ZLIB_DIR) && BINARY_PATH="$(BUILT_DIR)/bin" INCLUDE_PATH="$(BUILT_DIR)/include" LIBRARY_PATH="$(BUILT_DIR)/lib" make -f win32/Makefile.gcc install

OPENSSL_DIR=$(FETCH_DIR)/openssl-$(OPENSSL_VER) OPENSSL_OPTS=-no-idea -no-rc5 -no-md2 shared zlib --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -L$(BUILT_DIR)/lib -Wl,--nxcompat -Wl,--dynamicbase -I$(BUILT_DIR)/include diff --git a/src/current-patches/zlib/0001-zlib-update-Makefile.patch b/src/current-patches/zlib/0001-zlib-update-Makefile.patch deleted file mode 100644 index 07b9d48..0000000 --- a/src/current-patches/zlib/0001-zlib-update-Makefile.patch +++ /dev/null @@ -1,38 +0,0 @@ -From b45561038c1819c5d6264b025e872c82b7adf94f Mon Sep 17 00:00:00 2001 -From: Erinn Clark erinn@torproject.org -Date: Sat, 29 Oct 2011 01:59:59 +0100 -Subject: [PATCH] update zlib Makefile.gcc - -zlib's Makefile is inadequate for building TBB from source, so patch it to use -DEP/ASLR build options and have some actually working include and library -paths. - ---- - win32/Makefile.gcc | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -diff --git a/win32/Makefile.gcc b/win32/Makefile.gcc -index 0a33bf6..79cad54 100644 ---- a/win32/Makefile.gcc -+++ b/win32/Makefile.gcc -@@ -44,7 +44,7 @@ AS = $(CC) - ASFLAGS = $(LOC) -Wall - - LD = $(CC) --LDFLAGS = $(LOC) -+LDFLAGS = $(LOC) -Wl,--nxcompat -Wl,--dynamicbase - - AR = $(PREFIX)ar - ARFLAGS = rcs -@@ -113,6 +113,8 @@ zlibrc.o: win32/zlib1.rc - - - # BINARY_PATH, INCLUDE_PATH and LIBRARY_PATH must be set. -+INCLUDE_PATH=$(prefix)/include -+LIBRARY_PATH=$(prefix)/lib - - .PHONY: install uninstall clean - --- -1.7.5.4 -