From 261ffd03f72daf0c52973b6e928e6433d68ba92e Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Wed, 6 Jul 2005 21:04:14 +0000 Subject: [PATCH] Reverse out because the lack of using pgport in timezone/ is causing problems: --------------------------------------------------------------------------- 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. --- configure | 14 +------------- configure.in | 13 +------------ doc/src/sgml/installation.sgml | 19 +------------------ src/Makefile.global.in | 3 +-- src/timezone/Makefile | 17 ++++------------- 5 files changed, 8 insertions(+), 58 deletions(-) diff --git a/configure b/configure index 8c29ae3d51..84ce2bcc83 100755 --- a/configure +++ b/configure @@ -314,7 +314,7 @@ ac_includes_default="\ # include #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 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 with_zlib 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 TAS autodepend INCLUDES enable_thread_safety with_tcl with_perl with_python with_krb5 krb_srvtab with_pam with_bonjour with_openssl with_zlib 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,17 +3305,6 @@ _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. @@ -22904,7 +22893,6 @@ 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 9679b24b8f..3baed6c79f 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -dnl $PostgreSQL: pgsql/configure.in,v 1.416 2005/07/05 23:13:57 tgl Exp $ +dnl $PostgreSQL: pgsql/configure.in,v 1.417 2005/07/06 21:04:13 momjian Exp $ dnl dnl Developers, please strive to achieve this order: dnl @@ -303,17 +303,6 @@ 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 7606e03e3f..4f9f50cc01 100644 --- a/doc/src/sgml/installation.sgml +++ b/doc/src/sgml/installation.sgml @@ -1,4 +1,4 @@ - + <![%standalone-include[<productname>PostgreSQL</>]]> @@ -993,23 +993,6 @@ 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 0735ecdcc4..aea8d67089 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -1,5 +1,5 @@ # -*-makefile-*- -# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.216 2005/07/05 23:13:57 tgl Exp $ +# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.217 2005/07/06 21:04:14 momjian Exp $ #------------------------------------------------------------------------------ # All PostgreSQL makefiles include this file and use the variables it sets, @@ -184,7 +184,6 @@ 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 fa3b9dadff..d5fd05d0cd 100644 --- a/src/timezone/Makefile +++ b/src/timezone/Makefile @@ -4,7 +4,7 @@ # Makefile for the timezone library # IDENTIFICATION -# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.20 2005/07/04 19:54:51 momjian Exp $ +# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.21 2005/07/06 21:04:14 momjian Exp $ # #------------------------------------------------------------------------- @@ -18,7 +18,7 @@ override CPPFLAGS := $(CPPFLAGS) -I$(srcdir) -DNO_PGPORT OBJS= localtime.o strftime.o pgtz.o # files needed to build zic utility program -ZICOBJS= zic.o ialloc.o scheck.o localtime-zic.o +ZICOBJS= zic.o ialloc.o scheck.o localtime.o # timezone data files TZDATA := africa antarctica asia australasia europe northamerica southamerica \ @@ -30,17 +30,8 @@ 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_FOR_BUILD) $(CFLAGS) $(ZICOBJS) -o $@$(X) + $(CC) $(CFLAGS) $(ZICOBJS) $(LDFLAGS) $(LIBS) -o $@$(X) install: all installdirs ./zic -d $(DESTDIR)$(datadir)/timezone $(TZDATAFILES) @@ -49,4 +40,4 @@ installdirs: $(mkinstalldirs) $(DESTDIR)$(datadir) clean distclean maintainer-clean: - rm -f SUBSYS.o zic zic$(X) $(OBJS) $(ZICOBJS) localtime-zic.c + rm -f SUBSYS.o zic$(X) $(OBJS) $(ZICOBJS) -- 2.40.0