From 7651971fd74bf072ee99ae7d6926c12d33442c69 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Mon, 24 Oct 2011 20:21:15 +1100 Subject: [PATCH 1/3] package qwtplot3d: use $(MAKE) variable --- src/qwtplot3d.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qwtplot3d.mk b/src/qwtplot3d.mk index b95688d1..c996fa07 100644 --- a/src/qwtplot3d.mk +++ b/src/qwtplot3d.mk @@ -20,7 +20,7 @@ endef define $(PKG)_BUILD cd '$(1)' && '$(PREFIX)/bin/$(TARGET)-qmake' - cd '$(1)' && make -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j '$(JOBS)' $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' $(INSTALL) -m644 '$(1)/lib/libqwtplot3d.a' '$(PREFIX)/$(TARGET)/lib/' $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' From 7c5a6741b8311a555b2729a2c18f72a149f6fd48 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Mon, 24 Oct 2011 23:57:30 +1100 Subject: [PATCH 2/3] package libssh2: use libgcrypt instead of openssl --- src/curl.mk | 3 +-- src/libssh2.mk | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/curl.mk b/src/curl.mk index 18432d9b..2cac7c3c 100644 --- a/src/curl.mk +++ b/src/curl.mk @@ -27,8 +27,7 @@ define $(PKG)_BUILD --prefix='$(PREFIX)/$(TARGET)' \ --with-gnutls \ --with-libidn \ - LIBS="-lgcrypt -liconv `$(PREFIX)/$(TARGET)/bin/gpg-error-config --libs`\ - `'i686-pc-mingw32-pkg-config' openssl --libs` -lssh2" + LIBS="-lgcrypt -liconv `$(PREFIX)/$(TARGET)/bin/gpg-error-config --libs` -lssh2" $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= '$(TARGET)-gcc' \ diff --git a/src/libssh2.mk b/src/libssh2.mk index 01ced795..36c9c82e 100644 --- a/src/libssh2.mk +++ b/src/libssh2.mk @@ -10,7 +10,7 @@ $(PKG)_SUBDIR := libssh2-$($(PKG)_VERSION) $(PKG)_FILE := libssh2-$($(PKG)_VERSION).tar.gz $(PKG)_WEBSITE := http://www.libssh2.org $(PKG)_URL := http://www.libssh2.org/download/$($(PKG)_FILE) -$(PKG)_DEPS := gcc openssl zlib +$(PKG)_DEPS := gcc libgcrypt zlib define $(PKG)_UPDATE wget -q -O- 'http://www.libssh2.org/download/?C=M;O=D' | \ @@ -24,6 +24,8 @@ define $(PKG)_BUILD --host='$(TARGET)' \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ + --without-openssl \ + --with-libgcrypt \ PKG_CONFIG='$(TARGET)-pkg-config' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= html_DATA= From d31b6ec92d0779dad8f9f4981eac32135e41713c Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Mon, 24 Oct 2011 17:47:39 +0200 Subject: [PATCH 3/3] package postgresql: replace sed with patch --- src/postgresql-1-fixes.patch | 59 ++++++++++++++++++++++++++++++++++++ src/postgresql.mk | 10 ++---- 2 files changed, 61 insertions(+), 8 deletions(-) create mode 100644 src/postgresql-1-fixes.patch diff --git a/src/postgresql-1-fixes.patch b/src/postgresql-1-fixes.patch new file mode 100644 index 00000000..0be138e1 --- /dev/null +++ b/src/postgresql-1-fixes.patch @@ -0,0 +1,59 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +Contains ad hoc patches for cross building. + +From 778910e8d10e548c50abe80342490b8725ea6244 Mon Sep 17 00:00:00 2001 +From: mingw-cross-env +Date: Mon, 24 Oct 2011 14:02:33 +0200 +Subject: [PATCH 1/2] use unix style names for openssl on mingw-cross-env + + +diff --git a/configure.in b/configure.in +index 79b565d..db30511 100644 +--- a/configure.in ++++ b/configure.in +@@ -941,13 +941,8 @@ fi + + if test "$with_openssl" = yes ; then + dnl Order matters! +- if test "$PORTNAME" != "win32"; then +- AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])]) +- AC_CHECK_LIB(ssl, SSL_library_init, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])]) +- else +- AC_CHECK_LIB(eay32, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'eay32' is required for OpenSSL])]) +- AC_CHECK_LIB(ssleay32, SSL_library_init, [], [AC_MSG_ERROR([library 'ssleay32' is required for OpenSSL])]) +- fi ++ AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])]) ++ AC_CHECK_LIB(ssl, SSL_library_init, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])]) + fi + + if test "$with_pam" = yes ; then +-- +1.7.7 + + +From ebeea4b87a1b11205b5870e738882117ad0f628c Mon Sep 17 00:00:00 2001 +From: mingw-cross-env +Date: Mon, 24 Oct 2011 14:09:38 +0200 +Subject: [PATCH 2/2] do not check autoconf version + + +diff --git a/configure.in b/configure.in +index db30511..4da0143 100644 +--- a/configure.in ++++ b/configure.in +@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros + + AC_INIT([PostgreSQL], [9.1.1], [pgsql-bugs@postgresql.org]) + +-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required. +-Untested combinations of 'autoconf' and PostgreSQL versions are not +-recommended. You can remove the check from 'configure.in' but it is then +-your responsibility whether the result works or not.])]) + AC_COPYRIGHT([Copyright (c) 1996-2011, PostgreSQL Global Development Group]) + AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) + AC_CONFIG_AUX_DIR(config) +-- +1.7.7 + diff --git a/src/postgresql.mk b/src/postgresql.mk index 06423ca4..902e97ad 100644 --- a/src/postgresql.mk +++ b/src/postgresql.mk @@ -23,14 +23,8 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD + cd '$(1)' && autoconf cp -Rp '$(1)' '$(1).native' - # The static OpenSSL libraries are in unix (not win32) naming style. - $(SED) -i 's,SSLEAY32,SSL,' '$(1)'/configure - $(SED) -i 's,ssleay32,ssl,' '$(1)'/configure - $(SED) -i 's,EAY32,CRYPTO,' '$(1)'/configure - $(SED) -i 's,eay32,crypto,' '$(1)'/configure - $(SED) -i 's,ssleay32,ssl,' '$(1)'/src/interfaces/libpq/Makefile - $(SED) -i 's,eay32,crypto,' '$(1)'/src/interfaces/libpq/Makefile # Since we build only client libary, use bogus tzdata to satisfy configure. cd '$(1)' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ @@ -52,7 +46,7 @@ define $(PKG)_BUILD --without-libxslt \ --with-zlib \ --with-system-tzdata=/dev/null \ - LIBS='-lsecur32 -lws2_32 -lgdi32' + LIBS="-lsecur32 `'i686-pc-mingw32-pkg-config' openssl --libs`" $(MAKE) -C '$(1)'/src/interfaces/libpq -j '$(JOBS)' install haslibarule= shlib= $(MAKE) -C '$(1)'/src/port -j '$(JOBS)' haslibarule= shlib= $(MAKE) -C '$(1)'/src/bin/psql -j '$(JOBS)' install haslibarule= shlib=