Support cross compilation by compiling "zic" with a native compiler. This

relies on the output of zic being platform independent, but that is
currently the case.

diff --git a/configure b/configure
index ed8faf10becdfa00a008847c9487a1b4f525be7b..217c133b40ef07e9a3732bb1119115e7b6572afa 100755 (executable)
--- a/configure
+++ b/configure
@@ -314,7 +314,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS configure_args build build_cpu build_vendor build_os host host_cpu host_vendor host_os PORTNAME docdir enable_nls WANTED_LANGUAGES default_port enable_shared enable_rpath enable_debug CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP GCC TAS autodepend INCLUDES enable_thread_safety with_tcl with_perl with_python with_krb5 krb_srvtab with_pam with_bonjour with_openssl EGREP ELF_SYS LDFLAGS_SL AWK FLEX FLEXFLAGS LN_S LD with_gnu_ld ld_R_works RANLIB ac_ct_RANLIB LORDER TAR STRIP ac_ct_STRIP STRIP_STATIC_LIB STRIP_SHARED_LIB YACC YFLAGS PERL perl_archlibexp perl_privlibexp perl_useshrplib perl_embed_ldflags PYTHON python_version python_configdir python_includespec python_libdir python_libspec python_additional_libs HAVE_IPV6 LIBOBJS acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS HAVE_POSIX_SIGNALS MSGFMT MSGMERGE XGETTEXT localedir TCLSH TCL_CONFIG_SH TCL_INCLUDE_SPEC TCL_LIB_FILE TCL_LIBS TCL_LIB_SPEC TCL_SHARED_BUILD TCL_SHLIB_LD_LIBS NSGMLS JADE have_docbook DOCBOOKSTYLE COLLATEINDEX SGMLSPL vpath_build LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS configure_args build build_cpu build_vendor build_os host host_cpu host_vendor host_os PORTNAME docdir enable_nls WANTED_LANGUAGES default_port enable_shared enable_rpath enable_debug CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP GCC CC_FOR_BUILD TAS autodepend INCLUDES enable_thread_safety with_tcl with_perl with_python with_krb5 krb_srvtab with_pam with_bonjour with_openssl EGREP ELF_SYS LDFLAGS_SL AWK FLEX FLEXFLAGS LN_S LD with_gnu_ld ld_R_works RANLIB ac_ct_RANLIB LORDER TAR STRIP ac_ct_STRIP STRIP_STATIC_LIB STRIP_SHARED_LIB YACC YFLAGS PERL perl_archlibexp perl_privlibexp perl_useshrplib perl_embed_ldflags PYTHON python_version python_configdir python_includespec python_libdir python_libspec python_additional_libs HAVE_IPV6 LIBOBJS acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS HAVE_POSIX_SIGNALS MSGFMT MSGMERGE XGETTEXT localedir TCLSH TCL_CONFIG_SH TCL_INCLUDE_SPEC TCL_LIB_FILE TCL_LIBS TCL_LIB_SPEC TCL_SHARED_BUILD TCL_SHLIB_LD_LIBS NSGMLS JADE have_docbook DOCBOOKSTYLE COLLATEINDEX SGMLSPL vpath_build LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -3305,6 +3305,17 @@ _ACEOF
 
 
 
+#
+# Native compiler
+#
+
+if test -z "$CC_FOR_BUILD"; then
+  CC_FOR_BUILD=$CC
+fi
+
+
+
+
 #
 # Set up TAS assembly code if needed; the template file has now had its
 # chance to request this.
@@ -22892,6 +22903,7 @@ s,@EXEEXT@,$EXEEXT,;t t
 s,@OBJEXT@,$OBJEXT,;t t
 s,@CPP@,$CPP,;t t
 s,@GCC@,$GCC,;t t
+s,@CC_FOR_BUILD@,$CC_FOR_BUILD,;t t
 s,@TAS@,$TAS,;t t
 s,@autodepend@,$autodepend,;t t
 s,@INCLUDES@,$INCLUDES,;t t

diff --git a/configure.in b/configure.in
index 9999db5cb60ef3e6a4892b94f797fefd4bcae02b..328ddb846faa7834acfa187aa5d42c508d352fd3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -303,6 +303,17 @@ AC_DEFINE_UNQUOTED(PG_VERSION_STR,
                    [A string containing the version number, platform, and C compiler])
 
 
+#
+# Native compiler
+#
+
+if test -z "$CC_FOR_BUILD"; then
+  CC_FOR_BUILD=$CC
+fi
+
+AC_SUBST(CC_FOR_BUILD)
+
+
 #
 # Set up TAS assembly code if needed; the template file has now had its
 # chance to request this.

diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml
index 62752893e4b9707a78f4fc1d93c9d48f0c4aa6f8..6cf73f9a140bda1bd398bd3a5b94c17151cf38d9 100644 (file)
--- a/doc/src/sgml/installation.sgml
+++ b/doc/src/sgml/installation.sgml
@@ -993,6 +993,23 @@ su - postgres
 <userinput>./configure CC=/opt/bin/gcc CFLAGS='-O2 -pipe'</>
 </screen>
     </para>
+
+    <para>
+     If you are cross-compiling<indexterm><primary>cross
+     compilation</primary></indexterm> (compiling on one architecture
+     with the intent to run on a different architecture), special care
+     needs to be taken.  First of all, specify the host architecture
+     (the architecture PostgreSQL will run on) using the option
+     <option>--host</option>.  The variables <envar>CC</>,
+     <envar>CFLAGS</>, etc. should refer to the build tools for the
+     host architecture.  During the build process, the time-zone
+     database for PostgreSQL is created and a special tool to do that
+     is compiled and run during the build process.  This tool needs to
+     be compiled using a native compiler.  Specify this compiler using
+     the variable <envar>CC_FOR_BUILD</envar>.  Cross compilation
+     requires expert knowledge and the support for this process in the
+     PostgreSQL tree should be considered somewhat experimental.
+    </para>
    </step>
 
   <step>

diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 56773b3a8e46efbf84fe13de38ffff474b57b203..266a57655f8e080916153201d238576c3a7ff4f2 100644 (file)
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -182,6 +182,7 @@ endif
 endif # not PGXS
 
 CC = @CC@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 GCC = @GCC@
 CFLAGS = @CFLAGS@
 

diff --git a/src/timezone/Makefile b/src/timezone/Makefile
index 934b565d90333e9f5e324e2652cbfcbf7d9cb52e..a1430e827d2bf123ba64e01d9fa4aae1afb121f7 100644 (file)
--- a/src/timezone/Makefile
+++ b/src/timezone/Makefile
@@ -18,7 +18,7 @@ override CPPFLAGS := $(CPPFLAGS)
 OBJS= localtime.o strftime.o pgtz.o
 
 # files needed to build zic utility program
-ZICOBJS= zic.o ialloc.o scheck.o localtime.o
+ZICOBJS= zic.o ialloc.o scheck.o localtime-zic.o
 
 # timezone data files
 TZDATA := africa antarctica asia australasia europe northamerica southamerica \
@@ -30,8 +30,17 @@ all: SUBSYS.o submake-libpgport zic
 SUBSYS.o: $(OBJS)
        $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
 
+# In case of cross-compilation, zic needs to be built with a native
+# compiler because it is run during the build, not on the final
+# system.
+
+localtime-zic.c: localtime.c
+       $(LN_S) $< $@
+
+$(ZICOBJS): CC=$(CC_FOR_BUILD)
+
 zic: $(ZICOBJS)
-       $(CC) $(CFLAGS) $(ZICOBJS) $(LDFLAGS) $(LIBS) -o $@$(X)
+       $(CC_FOR_BUILD) $(CFLAGS) $(ZICOBJS) -o $@$(X)
 
 install: all installdirs
        ./zic -d $(DESTDIR)$(datadir)/timezone $(TZDATAFILES)
@@ -40,4 +49,4 @@ installdirs:
        $(mkinstalldirs) $(DESTDIR)$(datadir)
 
 clean distclean maintainer-clean:
-       rm -f SUBSYS.o zic$(X) $(OBJS) $(ZICOBJS)
+       rm -f SUBSYS.o zic zic$(X) $(OBJS) $(ZICOBJS) localtime-zic.c