diff options
| author | Volker Grabsch <vog@notjusthosting.com> | 2012-04-12 15:23:12 (GMT) |
|---|---|---|
| committer | Volker Grabsch <vog@notjusthosting.com> | 2012-04-12 15:23:12 (GMT) |
| commit | 1f86817ee82b162a1a5bd495886183ca81a68ba7 (patch) | |
| tree | 3116df65f83174295af8c6315a36583f460fe9e0 /src/postgresql.mk | |
| parent | 0f01e5e88f720fe5073c88f5cf1803d5c283904d (diff) | |
| parent | e513258770cdc39c0d6a904437f191aa61b3175c (diff) | |
| download | mxe-2.22.zip mxe-2.22.tar.gz mxe-2.22.tar.bz2 | |
Merge all well-tested changes into the stable branchv2.22
Diffstat (limited to 'src/postgresql.mk')
| -rw-r--r-- | src/postgresql.mk | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/src/postgresql.mk b/src/postgresql.mk index 248088e..925c3f7 100644 --- a/src/postgresql.mk +++ b/src/postgresql.mk @@ -1,16 +1,12 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. +# This file is part of MXE. +# See index.html for further information. -# PostgreSQL PKG := postgresql $(PKG)_IGNORE := -$(PKG)_VERSION := 9.0.4 -$(PKG)_CHECKSUM := 5c4ebc2abbbc63ce2973974a7d020e7d14a01e73 +$(PKG)_CHECKSUM := 1cf3044415df807c08bb8ad8e40e24e8d375cf34 $(PKG)_SUBDIR := postgresql-$($(PKG)_VERSION) $(PKG)_FILE := postgresql-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://www.postgresql.org/ -$(PKG)_URL := http://ftp2.nl.postgresql.org/source/v$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_URL_2 := http://ftp10.us.postgresql.org/postgresql/source/v$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_URL := http://ftp.postgresql.org/pub/source/v$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc zlib openssl define $(PKG)_UPDATE @@ -18,18 +14,13 @@ define $(PKG)_UPDATE grep 'refs/tags/REL9[0-9_]*"' | \ $(SED) 's,.*refs/tags/REL\(.*\)".*,\1,g;' | \ $(SED) 's,_,.,g' | \ + grep -v '^9\.\0' | \ head -1 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)' \ @@ -51,7 +42,7 @@ define $(PKG)_BUILD --without-libxslt \ --with-zlib \ --with-system-tzdata=/dev/null \ - LIBS='-lsecur32 -lws2_32 -lgdi32' + LIBS="-lsecur32 `'$(TARGET)-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= @@ -79,6 +70,6 @@ define $(PKG)_BUILD --without-zlib \ --with-system-tzdata=/dev/null $(MAKE) -C '$(1).native'/src/port -j '$(JOBS)' - $(MAKE) -C '$(1).native'/src/bin/pg_config -j '$(JOBS)' - $(INSTALL) -m755 '$(1).native'/src/bin/pg_config/pg_config '$(PREFIX)/bin/$(TARGET)-pg_config' + $(MAKE) -C '$(1).native'/src/bin/pg_config -j '$(JOBS)' install + ln -sf '$(PREFIX)/$(TARGET)/bin/pg_config' '$(PREFIX)/bin/$(TARGET)-pg_config' endef |