summaryrefslogtreecommitdiff
path: root/cross.mk
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2013-11-21 23:09:26 +0100
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2013-11-21 23:09:45 +0100
commitdf7dd16b152f1687401d29b0f471b7a4548d0a31 (patch)
tree7c281d49696c135b289b950d7c57d143cd58ae30 /cross.mk
parent255de8917e948fbfb5948465b96336ce9c88fa2e (diff)
downloadgnutls-df7dd16b152f1687401d29b0f471b7a4548d0a31.tar.gz
updated cross.mk
Diffstat (limited to 'cross.mk')
-rw-r--r--cross.mk11
1 files changed, 7 insertions, 4 deletions
diff --git a/cross.mk b/cross.mk
index 73304fe32f..5ade1cb935 100644
--- a/cross.mk
+++ b/cross.mk
@@ -1,9 +1,9 @@
+SMP=-j4
+
GNUTLS_VERSION:=3.2.7
GNUTLS_FILE:=gnutls-$(GNUTLS_VERSION).tar.xz
GNUTLS_DIR:=gnutls-$(GNUTLS_VERSION)
-SMP=-j4
-
GMP_VERSION=5.1.2
GMP_FILE:=gmp-$(GMP_VERSION).tar.bz2
GMP_DIR:=gmp-$(GMP_VERSION)
@@ -21,7 +21,7 @@ BIN_DIR:=$(CROSS_DIR)/bin
LIB_DIR:=$(CROSS_DIR)/lib
HEADERS_DIR:=$(CROSS_DIR)/include
DEVCPP_DIR:=$(PWD)/devcpp
-LDFLAGS=-static-libgcc
+LDFLAGS=
all: update-gpg-keys gnutls-w32
@@ -83,6 +83,7 @@ $(GMP_DIR)/.configured:
gpg --verify $(GMP_FILE).sig
test -d $(GMP_DIR) || tar -xf $(GMP_FILE)
cd $(GMP_DIR) && LDFLAGS="$(LDFLAGS)" ./configure $(CONFIG_FLAGS) --enable-fat --exec-prefix=$(LIB_DIR) --oldincludedir=$(HEADERS_DIR) && cd ..
+ cp $(GMP_DIR)/COPYING.LIB $(CROSS_DIR)/COPYING.GMP
touch $@
$(GMP_DIR)/.installed: $(GMP_DIR)/.configured
@@ -112,9 +113,11 @@ $(NETTLE_DIR)/.installed: $(NETTLE_DIR)/.configured
$(GNUTLS_DIR)/.installed: $(GNUTLS_DIR)/.configured
make -C $(GNUTLS_DIR) $(SMP)
- make -C $(GNUTLS_DIR) -C tests check
+ sed -i 's/^"$$@" >$$log_file/echo $$@|grep exe >\/dev\/null; if [ $$? == 0 ];then wine "$$@" >$$log_file;else \/bin\/true >$$log_file;fi/g' $(GNUTLS_DIR)/build-aux/test-driver
+ make -C $(GNUTLS_DIR) -C tests check $(SMP)
make -C $(GNUTLS_DIR) install -i
cp $(GNUTLS_DIR)/COPYING $(GNUTLS_DIR)/COPYING.LESSER $(CROSS_DIR)
+ cp /usr/i686-w64-mingw32/sys-root/mingw/bin/libgcc_s_sjlj-1.dll $(BIN_DIR)/
touch $@
$(GNUTLS_DIR)/.configured: $(NETTLE_DIR)/.installed $(P11_KIT_DIR)/.installed