# HG changeset patch # User John Donoghue # Date 1402317534 14400 # Node ID b3e27f5b5b33ce18deaf9d30ba777f94fb3f195f # Parent 9b46971891ddb3313770db117dbb3aee18f95cd2 postgresql: only build additional native tools in cross build * src/postgresql.mk: only build native tools when cross building diff -r 9b46971891dd -r b3e27f5b5b33 src/postgresql.mk --- a/src/postgresql.mk Mon Jun 09 08:45:21 2014 -0400 +++ b/src/postgresql.mk Mon Jun 09 08:38:54 2014 -0400 @@ -61,30 +61,30 @@ $(INSTALL) -m644 '$(1)/src/include/postgres_ext.h' '$(3)$(HOST_INCDIR)' $(INSTALL) -d '$(3)$(HOST_INCDIR)/libpq' $(INSTALL) -m644 '$(1)'/src/include/libpq/* '$(3)$(HOST_INCDIR)/libpq/' - # Build a native pg_config. - $(SED) -i 's,-DVAL_,-D_DISABLED_VAL_,g' '$(1).native'/src/bin/pg_config/Makefile - cd '$(1).native' && ./configure \ - --prefix='$(BUILD_TOOLS_PREFIX)' \ - $(ENABLE_SHARED_OR_STATIC) \ - --disable-rpath \ - --without-tcl \ - --without-perl \ - --without-python \ - --without-gssapi \ - --without-krb5 \ - --without-pam \ - --without-ldap \ - --without-bonjour \ - --without-openssl \ - --without-readline \ - --without-ossp-uuid \ - --without-libxml \ - --without-libxslt \ - --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 DESTDIR=$(3) + # Build a native pg_config (if cross build). if [ $(MXE_NATIVE_BUILD) = no ]; then \ - $(INSTALL) -m755 '$(3)$(BUILD_TOOLS_PREFIX)/bin/pg_config' '$(3)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)pg_config'; \ + $(SED) -i 's,-DVAL_,-D_DISABLED_VAL_,g' '$(1).native'/src/bin/pg_config/Makefile; \ + cd '$(1).native' && ./configure \ + --prefix='$(BUILD_TOOLS_PREFIX)' \ + $(ENABLE_SHARED_OR_STATIC) \ + --disable-rpath \ + --without-tcl \ + --without-perl \ + --without-python \ + --without-gssapi \ + --without-krb5 \ + --without-pam \ + --without-ldap \ + --without-bonjour \ + --without-openssl \ + --without-readline \ + --without-ossp-uuid \ + --without-libxml \ + --without-libxslt \ + --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 DESTDIR=$(3); \ + $(INSTALL) -m755 '$(3)$(BUILD_TOOLS_PREFIX)/bin/pg_config' '$(3)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)pg_config'; \ fi endef