Only in postgresql-8.2.9x: autom4te.cache diff -c -r -x libpq.rc -x '*~' -x configure postgresql-8.2.9/configure.in postgresql-8.2.9x/configure.in *** postgresql-8.2.9/configure.in 2008-06-09 01:34:32.000000000 +0100 --- postgresql-8.2.9x/configure.in 2008-08-09 20:31:29.000000000 +0100 *************** *** 599,604 **** --- 599,633 ---- AC_PATH_PROG(TAR, tar) PGAC_CHECK_STRIP + # + # Additional tools for win32 + # + if test "$PORTNAME" = "win32"; then + AC_CHECK_TOOL(DLLWRAP, dllwrap, :) + AC_CHECK_TOOL(DLLTOOL, dlltool, :) + AC_CHECK_TOOL(WINDRES, windres, :) + fi + + AC_CHECK_TOOL(AR, ar, :) + + # + # zic if cross-compiling + # + if test "$build_os" != "$host_os"; then + PGAC_ARG_REQ(with, zic, [ --with-zic=path set location of zic tool], + [ZIC=$withval], + [ZIC=:]) + + if test "$ZIC" = ":"; then + AC_PATH_TOOL(ZIC, zic, :) + fi + + if test "$ZIC" = ":"; then + AC_MSG_ERROR([zic is required for cross-compilation. + Use --with-zic to set the location.]) + fi + fi + if test -z "$YACC"; then AC_CHECK_PROGS(YACC, ['bison -y']) diff -c -r -x libpq.rc -x '*~' -x configure postgresql-8.2.9/src/bin/pgevent/Makefile postgresql-8.2.9x/src/bin/pgevent/Makefile *** postgresql-8.2.9/src/bin/pgevent/Makefile 2006-07-15 04:33:14.000000000 +0100 --- postgresql-8.2.9x/src/bin/pgevent/Makefile 2008-08-09 19:50:50.000000000 +0100 *************** *** 21,31 **** install: all install-lib ! pgevent.dll: $(OBJS) pgevent.def ! dllwrap --def pgevent.def -o $(NAME) $(OBJS) ! pgmsgevent.o: pgmsgevent.rc win32ver.rc ! windres pgmsgevent.rc -o pgmsgevent.o --include-dir=$(top_builddir)/src/include all-lib: $(NAME) --- 21,36 ---- install: all install-lib ! pgevent.dll: $(OBJS) $(srcdir)/pgevent.def ! $(DLLWRAP) --def $(srcdir)/pgevent.def -o $(NAME) $(OBJS) ! # windres from binutils 2.18 can segfault if the input file name contains / or \. For safety, ! # copy to the local directory. ! ! pgmsgevent.o: $(srcdir)/pgmsgevent.rc win32ver.rc ! cp $(srcdir)/pgmsgevent.rc localpgmsgevent.rc ! $(WINDRES) localpgmsgevent.rc -o pgmsgevent.o --include-dir=$(top_srcdir)/src/include --include-dir=$(top_builddir)/src/include --include-dir=$(srcdir) ! rm -f localpgmsgevent.rc all-lib: $(NAME) diff -c -r -x libpq.rc -x '*~' -x configure postgresql-8.2.9/src/interfaces/ecpg/Makefile postgresql-8.2.9x/src/interfaces/ecpg/Makefile *** postgresql-8.2.9/src/interfaces/ecpg/Makefile 2006-08-19 14:42:40.000000000 +0100 --- postgresql-8.2.9x/src/interfaces/ecpg/Makefile 2008-08-09 19:49:47.000000000 +0100 *************** *** 8,14 **** $(MAKE) -C ecpglib $@ $(MAKE) -C compatlib $@ $(MAKE) -C preproc $@ - $(MAKE) -C test $@ clean distclean maintainer-clean: -$(MAKE) -C include $@ --- 8,13 ---- diff -c -r -x libpq.rc -x '*~' -x configure postgresql-8.2.9/src/interfaces/ecpg/test/Makefile postgresql-8.2.9x/src/interfaces/ecpg/test/Makefile *** postgresql-8.2.9/src/interfaces/ecpg/test/Makefile 2006-09-08 14:32:26.000000000 +0100 --- postgresql-8.2.9x/src/interfaces/ecpg/test/Makefile 2008-08-09 19:43:46.000000000 +0100 *************** *** 17,23 **** NOLOCALE += --no-locale endif ! ifneq ($(PORTNAME),win32) abs_builddir := $(shell pwd) else abs_builddir := $(shell pwd -W) --- 17,23 ---- NOLOCALE += --no-locale endif ! ifneq ($(BUILDOS),mingw32) abs_builddir := $(shell pwd) else abs_builddir := $(shell pwd -W) diff -c -r -x libpq.rc -x '*~' -x configure postgresql-8.2.9/src/interfaces/libpq/Makefile postgresql-8.2.9x/src/interfaces/libpq/Makefile *** postgresql-8.2.9/src/interfaces/libpq/Makefile 2008-04-16 15:24:38.000000000 +0100 --- postgresql-8.2.9x/src/interfaces/libpq/Makefile 2008-08-09 19:11:03.000000000 +0100 *************** *** 20,26 **** SO_MINOR_VERSION= 0 DLTYPE= library ! override CPPFLAGS := -DFRONTEND -DUNSAFE_STAT_OK -I$(srcdir) $(CPPFLAGS) -I$(top_builddir)/src/port ifneq ($(PORTNAME), win32) override CFLAGS += $(PTHREAD_CFLAGS) endif --- 20,26 ---- SO_MINOR_VERSION= 0 DLTYPE= library ! override CPPFLAGS := -DFRONTEND -DUNSAFE_STAT_OK -I$(srcdir) $(CPPFLAGS) -I$(top_srcdir)/src/port -I$(top_builddir)/src/port ifneq ($(PORTNAME), win32) override CFLAGS += $(PTHREAD_CFLAGS) endif *************** *** 42,51 **** ifeq ($(PORTNAME), win32) OBJS += win32.o libpqrc.o ! DLL_DEFFILE=libpqdll.def libpqrc.o: libpq.rc ! windres -i libpq.rc -o libpqrc.o ifeq ($(enable_thread_safety), yes) OBJS += pthread-win32.o --- 42,51 ---- ifeq ($(PORTNAME), win32) OBJS += win32.o libpqrc.o ! DLL_DEFFILE=$(srcdir)/libpqdll.def libpqrc.o: libpq.rc ! $(WINDRES) -i $(srcdir)/libpq.rc -o libpqrc.o ifeq ($(enable_thread_safety), yes) OBJS += pthread-win32.o diff -c -r -x libpq.rc -x '*~' -x configure postgresql-8.2.9/src/Makefile.global.in postgresql-8.2.9x/src/Makefile.global.in *** postgresql-8.2.9/src/Makefile.global.in 2006-10-08 18:15:33.000000000 +0100 --- postgresql-8.2.9x/src/Makefile.global.in 2008-08-09 19:15:02.000000000 +0100 *************** *** 230,235 **** --- 230,239 ---- LDOUT = -o RANLIB = @RANLIB@ X = @EXEEXT@ + AR = @AR@ + DLLTOOL = @DLLTOOL@ + DLLWRAP = @DLLWRAP@ + WINDRES = @WINDRES@ # Perl *************** *** 256,261 **** --- 260,267 ---- PL_TESTDB = pl_regression CONTRIB_TESTDB = contrib_regression + ZIC = @ZIC@ + # Installation. INSTALL = $(SHELL) $(top_srcdir)/config/install-sh -c *************** *** 294,299 **** --- 300,307 ---- # Additional platform-specific settings # + BUILDOS = @build_os@ + # Name of the "template" PORTNAME= @PORTNAME@ *************** *** 457,467 **** ifneq (,$(PGAPPICON)) PGICOSTR=$(subst /,\/,IDI_ICON ICON \"$(top_builddir)/src/port/$(PGAPPICON).ico\") endif ! win32ver.rc: $(top_builddir)/src/port/win32ver.rc ! sed -e 's;FILEDESC;$(PGFILEDESC);' -e 's;VFT_APP;$(PGFTYPE);' -e 's;_ICO_;$(PGICOSTR);' -e 's;\(VERSION.*\),0 *$$;\1,'`date '+%y%j' | sed 's/^0*//'`';' $(top_builddir)/src/port/win32ver.rc > win32ver.rc ! win32ver.o: $(top_builddir)/src/port/win32ver.rc ! sed -e 's;FILEDESC;$(PGFILEDESC);' -e 's;VFT_APP;$(PGFTYPE);' -e 's;_ICO_;$(PGICOSTR);' -e 's;\(VERSION.*\),0 *$$;\1,'`date '+%y%j' | sed 's/^0*//'`';' $(top_builddir)/src/port/win32ver.rc > win32ver.rc ! windres -i win32ver.rc -o win32ver.o --include-dir=$(top_builddir)/src/include rm -f win32ver.rc endif --- 465,475 ---- ifneq (,$(PGAPPICON)) PGICOSTR=$(subst /,\/,IDI_ICON ICON \"$(top_builddir)/src/port/$(PGAPPICON).ico\") endif ! win32ver.rc: $(top_srcdir)/src/port/win32ver.rc ! sed -e 's;FILEDESC;$(PGFILEDESC);' -e 's;VFT_APP;$(PGFTYPE);' -e 's;_ICO_;$(PGICOSTR);' -e 's;\(VERSION.*\),0 *$$;\1,'`date '+%y%j' | sed 's/^0*//'`';' $(top_srcdir)/src/port/win32ver.rc > win32ver.rc ! win32ver.o: $(top_srcdir)/src/port/win32ver.rc ! sed -e 's;FILEDESC;$(PGFILEDESC);' -e 's;VFT_APP;$(PGFTYPE);' -e 's;_ICO_;$(PGICOSTR);' -e 's;\(VERSION.*\),0 *$$;\1,'`date '+%y%j' | sed 's/^0*//'`';' $(top_srcdir)/src/port/win32ver.rc > win32ver.rc ! $(WINDRES) -i win32ver.rc -o win32ver.o --include-dir=$(top_builddir)/src/include --include-dir=$(srcdir) rm -f win32ver.rc endif diff -c -r -x libpq.rc -x '*~' -x configure postgresql-8.2.9/src/makefiles/Makefile.win32 postgresql-8.2.9x/src/makefiles/Makefile.win32 *** postgresql-8.2.9/src/makefiles/Makefile.win32 2006-06-23 00:50:35.000000000 +0100 --- postgresql-8.2.9x/src/makefiles/Makefile.win32 2008-08-09 19:16:56.000000000 +0100 *************** *** 3,10 **** --- 3,17 ---- # Use replacement include files for those missing on Win32 override CPPFLAGS+="-I$(top_srcdir)/src/include/port/win32" + ifndef DLLTOOL DLLTOOL= dlltool + endif + ifndef DLLWRAP DLLWRAP= dllwrap + endif + ifndef WINDRES + WINDRES = windres + endif ifdef PGXS BE_DLLLIBS= -L$(libdir) -lpostgres else diff -c -r -x libpq.rc -x '*~' -x configure postgresql-8.2.9/src/pl/plperl/GNUmakefile postgresql-8.2.9x/src/pl/plperl/GNUmakefile *** postgresql-8.2.9/src/pl/plperl/GNUmakefile 2006-07-21 01:24:04.000000000 +0100 --- postgresql-8.2.9x/src/pl/plperl/GNUmakefile 2008-08-09 19:20:26.000000000 +0100 *************** *** 53,59 **** # test script can find them. See comments in src/test/regress/GNUmakefile. ifdef VPATH ! ifneq ($(PORTNAME),win32) abs_srcdir := $(shell cd $(srcdir) && pwd) abs_builddir := $(shell pwd) else --- 53,59 ---- # test script can find them. See comments in src/test/regress/GNUmakefile. ifdef VPATH ! ifneq ($(BUILDOS),mingw32) abs_srcdir := $(shell cd $(srcdir) && pwd) abs_builddir := $(shell pwd) else diff -c -r -x libpq.rc -x '*~' -x configure postgresql-8.2.9/src/pl/plpython/Makefile postgresql-8.2.9x/src/pl/plpython/Makefile *** postgresql-8.2.9/src/pl/plpython/Makefile 2006-07-21 01:24:04.000000000 +0100 --- postgresql-8.2.9x/src/pl/plpython/Makefile 2008-08-09 19:20:03.000000000 +0100 *************** *** 72,78 **** # test script can find them. See comments in src/test/regress/GNUmakefile. ifdef VPATH ! ifneq ($(PORTNAME),win32) abs_srcdir := $(shell cd $(srcdir) && pwd) abs_builddir := $(shell pwd) else --- 72,78 ---- # test script can find them. See comments in src/test/regress/GNUmakefile. ifdef VPATH ! ifneq ($(BUILDOS),mingw32) abs_srcdir := $(shell cd $(srcdir) && pwd) abs_builddir := $(shell pwd) else diff -c -r -x libpq.rc -x '*~' -x configure postgresql-8.2.9/src/pl/tcl/Makefile postgresql-8.2.9x/src/pl/tcl/Makefile *** postgresql-8.2.9/src/pl/tcl/Makefile 2006-07-21 01:24:04.000000000 +0100 --- postgresql-8.2.9x/src/pl/tcl/Makefile 2008-08-09 19:19:38.000000000 +0100 *************** *** 56,62 **** # test script can find them. See comments in src/test/regress/GNUmakefile. ifdef VPATH ! ifneq ($(PORTNAME),win32) abs_srcdir := $(shell cd $(srcdir) && pwd) abs_builddir := $(shell pwd) else --- 56,62 ---- # test script can find them. See comments in src/test/regress/GNUmakefile. ifdef VPATH ! ifneq ($(BUILDOS),mingw32) abs_srcdir := $(shell cd $(srcdir) && pwd) abs_builddir := $(shell pwd) else diff -c -r -x libpq.rc -x '*~' -x configure postgresql-8.2.9/src/test/regress/GNUmakefile postgresql-8.2.9x/src/test/regress/GNUmakefile *** postgresql-8.2.9/src/test/regress/GNUmakefile 2006-07-21 01:24:04.000000000 +0100 --- postgresql-8.2.9x/src/test/regress/GNUmakefile 2008-08-09 19:21:34.000000000 +0100 *************** *** 91,97 **** all: $(input_files) $(output_files) ! ifneq ($(PORTNAME),win32) abs_srcdir := $(shell cd $(srcdir) && pwd) abs_builddir := $(shell pwd) else --- 91,97 ---- all: $(input_files) $(output_files) ! ifneq ($(BUILDOS),mingw32) abs_srcdir := $(shell cd $(srcdir) && pwd) abs_builddir := $(shell pwd) else diff -c -r -x libpq.rc -x '*~' -x configure postgresql-8.2.9/src/timezone/Makefile postgresql-8.2.9x/src/timezone/Makefile *** postgresql-8.2.9/src/timezone/Makefile 2007-03-14 17:38:15.000000000 +0000 --- postgresql-8.2.9x/src/timezone/Makefile 2008-08-09 19:22:58.000000000 +0100 *************** *** 29,34 **** --- 29,40 ---- # for POSIX-style timezone specs POSIXRULES = US/Eastern + # ZIC is set when cross compiling + + ifeq (,$(ZIC)) + ZIC=./zic + endif + all: SUBSYS.o submake-libpgport zic SUBSYS.o: $(OBJS) *************** *** 38,44 **** $(CC) $(CFLAGS) $(ZICOBJS) $(LDFLAGS) $(LIBS) -o $@$(X) install: all installdirs ! ./zic -d '$(DESTDIR)$(datadir)/timezone' -p '$(POSIXRULES)' $(TZDATAFILES) $(MAKE) -C tznames $@ installdirs: --- 44,50 ---- $(CC) $(CFLAGS) $(ZICOBJS) $(LDFLAGS) $(LIBS) -o $@$(X) install: all installdirs ! $(ZIC) -d '$(DESTDIR)$(datadir)/timezone' -p '$(POSIXRULES)' $(TZDATAFILES) $(MAKE) -C tznames $@ installdirs: