changeset 3607:b3e27f5b5b33

postgresql: only build additional native tools in cross build * src/postgresql.mk: only build native tools when cross building
author John Donoghue
date Mon, 09 Jun 2014 08:38:54 -0400
parents 9b46971891dd
children 7bccd055043e
files src/postgresql.mk
diffstat 1 files changed, 24 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- 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