diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2013-11-30 11:36:11 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2013-11-30 11:36:11 +0100 |
| commit | d62af18c996a09a115e6610650be37e5e4daef57 (patch) | |
| tree | 74f5c2ad292fe0c504783910e824f731fe832300 /cross.mk | |
| parent | 2352cbc58e95b3fc69322c78966118b161af44a2 (diff) | |
| download | gnutls-d62af18c996a09a115e6610650be37e5e4daef57.tar.gz | |
updated cross.mk
Diffstat (limited to 'cross.mk')
| -rw-r--r-- | cross.mk | 15 |
1 files changed, 7 insertions, 8 deletions
@@ -16,6 +16,7 @@ NETTLE_VERSION=2.7.1 NETTLE_FILE:=nettle-$(NETTLE_VERSION).tar.gz NETTLE_DIR:=nettle-$(NETTLE_VERSION) +PKG_CONFIG_DIR:=$(PWD)/win32/lib/pkgconfig/ CROSS_DIR:=$(PWD)/win32 BIN_DIR:=$(CROSS_DIR)/bin LIB_DIR:=$(CROSS_DIR)/lib @@ -58,6 +59,7 @@ $(BIN_DIR): $(LIB_DIR): mkdir -p $(LIB_DIR) +CONFIG_ENV := PKG_CONFIG_LIBDIR="$(PKG_CONFIG_DIR):$(PKG_CONFIG_PATH)" CONFIG_FLAGS := --prefix=$(CROSS_DIR) --host=i686-w64-mingw32 --enable-shared --disable-static --bindir=$(BIN_DIR) --libdir=$(LIB_DIR) --includedir=$(HEADERS_DIR) $(P11_KIT_DIR)/.configured: @@ -65,7 +67,7 @@ $(P11_KIT_DIR)/.configured: test -f $(P11_KIT_FILE).sig || wget http://p11-glue.freedesktop.org/releases/$(P11_KIT_FILE).sig gpg --verify $(P11_KIT_FILE).sig test -d $(P11_KIT_DIR) || tar -xf $(P11_KIT_FILE) - cd $(P11_KIT_DIR) && LDFLAGS="$(LDFLAGS)" ./configure $(CONFIG_FLAGS) --without-libtasn1 && cd .. + cd $(P11_KIT_DIR) && LDFLAGS="$(LDFLAGS)" $(CONFIG_ENV) ./configure $(CONFIG_FLAGS) --without-libtasn1 && cd .. touch $@ $(P11_KIT_DIR)/.installed: $(P11_KIT_DIR)/.configured @@ -82,7 +84,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)" ./configure $(CONFIG_FLAGS) --enable-fat --exec-prefix=$(LIB_DIR) --oldincludedir=$(HEADERS_DIR) && cd .. + cd $(GMP_DIR) && LDFLAGS="$(LDFLAGS)" $(CONFIG_ENV) ./configure $(CONFIG_FLAGS) --enable-fat --exec-prefix=$(LIB_DIR) --oldincludedir=$(HEADERS_DIR) && cd .. cp $(GMP_DIR)/COPYING.LIB $(CROSS_DIR)/COPYING.GMP touch $@ @@ -99,7 +101,7 @@ $(NETTLE_DIR)/.configured: $(GMP_DIR)/.installed test -f $(NETTLE_FILE).sig || wget http://www.lysator.liu.se/~nisse/archive/$(NETTLE_FILE).sig gpg --verify $(NETTLE_FILE).sig test -d $(NETTLE_DIR) || tar -xf $(NETTLE_FILE) - cd $(NETTLE_DIR) && CFLAGS="-I$(HEADERS_DIR)" CXXFLAGS="-I$(HEADERS_DIR)" LDFLAGS="$(LDFLAGS)" ./configure $(CONFIG_FLAGS) --with-lib-path=$(LIB_DIR) && cd .. + cd $(NETTLE_DIR) && CFLAGS="-I$(HEADERS_DIR)" CXXFLAGS="-I$(HEADERS_DIR)" LDFLAGS="$(LDFLAGS)" $(CONFIG_ENV) ./configure $(CONFIG_FLAGS) --with-lib-path=$(LIB_DIR) && cd .. touch $@ #nettle messes up installation @@ -126,12 +128,9 @@ $(GNUTLS_DIR)/.configured: $(NETTLE_DIR)/.installed $(P11_KIT_DIR)/.installed gpg --verify $(GNUTLS_FILE).sig test -d $(GNUTLS_DIR) || tar -xf $(GNUTLS_FILE) cd $(GNUTLS_DIR) && \ - PKG_CONFIG_PATH="$(PWD)/$(NETTLE_DIR)/:$(PKG_CONFIG_PATH)" \ - P11_KIT_CFLAGS="-I$(HEADERS_DIR)" \ - P11_KIT_LIBS="$(LIB_DIR)/libp11-kit.la" \ LDFLAGS="$(LDFLAGS) -L$(LIB_DIR)" CFLAGS="-I$(HEADERS_DIR)" CXXFLAGS="-I$(HEADERS_DIR)" \ - ./configure $(CONFIG_FLAGS) --enable-local-libopts --with-libnettle-prefix=$(LIB_DIR) \ - --disable-libdane --disable-openssl-compatibility --with-included-libtasn1 && cd .. + $(CONFIG_ENV) ./configure $(CONFIG_FLAGS) --enable-local-libopts --with-libnettle-prefix=$(LIB_DIR) \ + --enable-gcc-warnings --disable-libdane --disable-openssl-compatibility --with-included-libtasn1 && cd .. touch $@ clean: |