diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2016-02-17 05:43:24 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2016-02-17 06:41:59 +0100 |
| commit | 8a8790fc65644b1c59e078048d0a67d481ed1c8b (patch) | |
| tree | aa92e62b5f58dee25cbcfff06c0fbd540a465cec /cross.mk | |
| parent | 50ce516eebaf011f041002ecbfdb61b113159282 (diff) | |
| download | gnutls-8a8790fc65644b1c59e078048d0a67d481ed1c8b.tar.gz | |
cross.mk: updated for gnutls 3.4.9, nettle 3.2, gmp 6.1.0 and p11-kit 0.23.2 [ci skip]
Diffstat (limited to 'cross.mk')
| -rw-r--r-- | cross.mk | 27 |
1 files changed, 14 insertions, 13 deletions
@@ -1,6 +1,6 @@ SMP=-j4 -GNUTLS_VERSION:=3.4.7 +GNUTLS_VERSION:=3.4.9 GNUTLS_FILE:=gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_DIR:=gnutls-$(GNUTLS_VERSION) @@ -8,9 +8,9 @@ OPENCONNECT_VERSION:=6.00 OPENCONNECT_FILE:=openconnect-$(OPENCONNECT_VERSION).tar.gz OPENCONNECT_DIR:=openconnect-$(OPENCONNECT_VERSION) -GMP_VERSION=6.0.0 -GMP_VERSIONA=6.0.0a -GMP_FILE:=gmp-$(GMP_VERSIONA).tar.bz2 +GMP_VERSION=6.1.0 +GMP_VERSIONA=6.1.0 +GMP_FILE:=gmp-$(GMP_VERSIONA).tar.lz GMP_SERV_DIR:=gmp-$(GMP_VERSIONA) GMP_DIR:=gmp-$(GMP_VERSION) @@ -22,22 +22,23 @@ LIBZ_VERSION=1.2.8 LIBZ_FILE:=zlib-$(LIBZ_VERSION).tar.gz LIBZ_DIR:=zlib-$(LIBZ_VERSION) -P11_KIT_VERSION=0.23.1 +P11_KIT_VERSION=0.23.2 P11_KIT_FILE:=p11-kit-$(P11_KIT_VERSION).tar.gz P11_KIT_DIR:=p11-kit-$(P11_KIT_VERSION) -NETTLE_VERSION=3.1 +NETTLE_VERSION=3.2 NETTLE_FILE:=nettle-$(NETTLE_VERSION).tar.gz NETTLE_DIR:=nettle-$(NETTLE_VERSION) ifeq ($(BITS),64) -HOST:=x86_64-w64-mingw64 +HOST:=x86_64-w64-mingw32 CROSS_DIR:=$(PWD)/win64 ZIPNAME:=$(GNUTLS_DIR)-w64.zip else HOST:=i686-w64-mingw32 CROSS_DIR:=$(PWD)/win32 ZIPNAME:=$(GNUTLS_DIR)-w32.zip +GMP_FLAGS=--enable-fat endif PKG_CONFIG_DIR:=$(CROSS_DIR)/lib/pkgconfig/ @@ -116,7 +117,7 @@ $(GMP_DIR)/.configured: test -f $(GMP_FILE).sig || wget ftp://ftp.gmplib.org/pub/$(GMP_DIR)/$(GMP_FILE).sig gpg --verify $(GMP_FILE).sig test -d $(GMP_DIR) || tar -xf $(GMP_FILE) - cd $(GMP_DIR) && LDFLAGS="$(LDFLAGS)" $(CONFIG_ENV) ./configure $(CONFIG_FLAGS) --enable-fat --exec-prefix=$(LIB_DIR) --oldincludedir=$(HEADERS_DIR) && cd .. + cd $(GMP_DIR) && LDFLAGS="$(LDFLAGS)" CC=$(HOST)-gcc $(CONFIG_ENV) ./configure $(GMP_FLAGS) $(CONFIG_FLAGS) --exec-prefix=$(LIB_DIR) --oldincludedir=$(HEADERS_DIR) && cd .. cp $(GMP_DIR)/COPYING.LESSERv3 $(CROSS_DIR)/COPYING.GMP touch $@ @@ -145,18 +146,18 @@ $(NETTLE_DIR)/.installed: $(NETTLE_DIR)/.configured cp $(NETTLE_DIR)/libnettle*.dll $(NETTLE_DIR)/libhogweed*.dll $(BIN_DIR)/ touch $@ -GCC_DLLS_PATH=/usr/$(HOST)/sys-root/mingw/bin/ -GCC_DLLS=libgcc_s_sjlj-1.dll libwinpthread-1.dll +GCC_DLLS_PATH=/usr/lib/gcc/$(HOST)/4.9-win32/ +GCC_DLLS=libgcc_s_sjlj-1.dll libgcc_s_seh-1.dll libwinpthread-1.dll $(GNUTLS_DIR)/.installed: $(GNUTLS_DIR)/.configured make -C $(GNUTLS_DIR) $(SMP) -for j in $(GNUTLS_DIR)/tests $(GNUTLS_DIR)/tests/safe-renegotiation $(GNUTLS_DIR)/tests/slow;do \ - for i in $(GCC_DLLS);do cp $(GCC_DLLS_PATH)/$$i $$j;done;done + for i in $(GCC_DLLS);do cp $(GCC_DLLS_PATH)/$$i $$j && echo $$i;done;done 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)/tests check $(SMP) + -make -C $(GNUTLS_DIR)/tests check $(SMP) make -C $(GNUTLS_DIR) install -i cp $(GNUTLS_DIR)/COPYING $(GNUTLS_DIR)/COPYING.LESSER $(CROSS_DIR) - -cp $(GCC_DLLS) $(BIN_DIR)/ + -for i in $(GCC_DLLS);do cp $(GCC_DLLS_PATH)/$$i $(BIN_DIR)/ && echo $$i;done touch $@ $(GNUTLS_DIR)/.configured: $(NETTLE_DIR)/.installed $(P11_KIT_DIR)/.installed |