X-Original-To: pgsql-interfaces-postgresql.org@localhost.postgresql.org Received: from localhost (unknown [200.46.204.144]) by svr1.postgresql.org (Postfix) with ESMTP id 88D708B9B6A for ; Mon, 21 Feb 2005 21:24:22 +0000 (GMT) Received: from svr1.postgresql.org ([200.46.204.71]) by localhost (av.hub.org [200.46.204.144]) (amavisd-new, port 10024) with ESMTP id 02746-08 for ; Mon, 21 Feb 2005 21:24:10 +0000 (GMT) Received: from candle.pha.pa.us (candle.pha.pa.us [64.139.89.126]) by svr1.postgresql.org (Postfix) with ESMTP id DDA688B9B69 for ; Mon, 21 Feb 2005 21:24:11 +0000 (GMT) Received: (from pgman@localhost) by candle.pha.pa.us (8.11.6/8.11.6) id j1LLO7M06236; Mon, 21 Feb 2005 16:24:07 -0500 (EST) From: Bruce Momjian Message-Id: <200502212124.j1LLO7M06236@candle.pha.pa.us> Subject: Re: bcc32.mak for libpq broken? (distro 8.0.0) (fwd) In-Reply-To: <6BCB9D8A16AC4241919521715F4D8BCE476938@algol.sollentuna.se> To: Magnus Hagander Date: Mon, 21 Feb 2005 16:24:07 -0500 (EST) Cc: =?ISO-8859-1?Q?Ber=E9nyi_G=E1bor?= , pgsql-interfaces@postgresql.org X-Mailer: ELM [version 2.4ME+ PL121 (25)] MIME-Version: 1.0 Content-Type: multipart/mixed; boundary=ELM1109021047-13902-0_ Content-Transfer-Encoding: 7bit X-Virus-Scanned: by amavisd-new at hub.org X-Spam-Status: No, hits=0.113 tagged_above=0 required=5 tests=AWL, UPPERCASE_25_50 X-Spam-Level: X-Archive-Number: 200502/76 X-Sequence-Number: 5321 --ELM1109021047-13902-0_ Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII Please try the attached patch. I have applied it to CVS HEAD and 8.0.X as well. Please report back any failure. Thanks. (The win32.mak changes are only reordering for consistency, and the Borland CC compile doesn't work so we might as well try to get it working with this change.) --------------------------------------------------------------------------- Magnus Hagander wrote: > That I can do. Coming up, off-list. > > //Magnus > > >-----Original Message----- > >From: pgsql-interfaces-owner@postgresql.org > >[mailto:pgsql-interfaces-owner@postgresql.org] On Behalf Of > >Ber?nyi G?bor > >Sent: den 21 februari 2005 15:26 > >To: pgsql-interfaces@postgresql.org > >Subject: [INTERFACES] bcc32.mak for libpq broken? (distro 8.0.0) (fwd) > > > > > >Dears, > > > >Alternatively, please email me the dll file in win32 binary format. > > > >Thank you, Gabor > > > >---------- Tov?bb?tott lev?l ---------- > >D?tum: Sun, 20 Feb 2005 18:09:19 +0100 (CET) > >Felad?: Ber?nyi G?bor > >C?mzett: pgsql-interfaces@postgresql.org > >T?rgy: [INTERFACES] bcc32.mak for libpq broken? (distro 8.0.0) > > > >Dear libpq programmers, > > > >src\interfaces\libpq> make -f bcc32.mak > > > >fails with the message > > > >'".\Release\win32.obj"' does not exist - don't know how to make it > > > >Please, help. > > > >With love, Gabor > > > >---------------------------(end of > >broadcast)--------------------------- > >TIP 7: don't forget to increase your free space map settings > > > > > >---------------------------(end of > >broadcast)--------------------------- > >TIP 8: explain analyze is your friend > > > > ---------------------------(end of broadcast)--------------------------- > TIP 6: Have you searched our list archives? > > http://archives.postgresql.org > -- Bruce Momjian | http://candle.pha.pa.us pgman@candle.pha.pa.us | (610) 359-1001 + If your life is a hard drive, | 13 Roberts Road + Christ can be your backup. | Newtown Square, Pennsylvania 19073 --ELM1109021047-13902-0_ Content-Transfer-Encoding: 7bit Content-Type: text/plain Content-Disposition: inline; filename="/bjm/diff" Index: src/interfaces/libpq/bcc32.mak =================================================================== RCS file: /cvsroot/pgsql/src/interfaces/libpq/bcc32.mak,v retrieving revision 1.11 diff -c -c -r1.11 bcc32.mak *** src/interfaces/libpq/bcc32.mak 13 Nov 2004 03:18:50 -0000 1.11 --- src/interfaces/libpq/bcc32.mak 21 Feb 2005 21:18:50 -0000 *************** *** 42,51 **** DEBUG=1 OUTDIR=.\Debug INTDIR=.\Debug ! !else OUTDIR=.\Release INTDIR=.\Release ! !endif USERDEFINES=FRONTEND;NDEBUG;WIN32;_WINDOWS;HAVE_VSNPRINTF;HAVE_STRDUP; --- 42,53 ---- DEBUG=1 OUTDIR=.\Debug INTDIR=.\Debug ! !ELSE OUTDIR=.\Release INTDIR=.\Release ! !ENDIF ! ! OUTFILENAME=blibpq USERDEFINES=FRONTEND;NDEBUG;WIN32;_WINDOWS;HAVE_VSNPRINTF;HAVE_STRDUP; *************** *** 59,74 **** CPP_PROJ = $(CPP_PROJ) -O -Oi -OS -DNDEBUG !endif LIB32=tlib.exe LIB32_FLAGS= LIB32_OBJS= \ ! "$(OUTDIR)\win32.obj" \ "$(INTDIR)\getaddrinfo.obj" \ "$(INTDIR)\thread.obj" \ "$(INTDIR)\inet_aton.obj" \ "$(INTDIR)\crypt.obj" \ "$(INTDIR)\noblock.obj" \ - "$(INTDIR)\pgstrcasecmp.obj" \ "$(INTDIR)\md5.obj" \ "$(INTDIR)\ip.obj" \ "$(INTDIR)\fe-auth.obj" \ --- 61,108 ---- CPP_PROJ = $(CPP_PROJ) -O -Oi -OS -DNDEBUG !endif + CLEAN : + -@erase "$(INTDIR)\getaddrinfo.obj" + -@erase "$(INTDIR)\pgstrcasecmp.obj" + -@erase "$(INTDIR)\thread.obj" + -@erase "$(INTDIR)\inet_aton.obj" + -@erase "$(INTDIR)\crypt.obj" + -@erase "$(INTDIR)\noblock.obj" + -@erase "$(INTDIR)\md5.obj" + -@erase "$(INTDIR)\ip.obj" + -@erase "$(INTDIR)\fe-auth.obj" + -@erase "$(INTDIR)\fe-protocol2.obj" + -@erase "$(INTDIR)\fe-protocol3.obj" + -@erase "$(INTDIR)\fe-connect.obj" + -@erase "$(INTDIR)\fe-exec.obj" + -@erase "$(INTDIR)\fe-lobj.obj" + -@erase "$(INTDIR)\fe-misc.obj" + -@erase "$(INTDIR)\fe-print.obj" + -@erase "$(INTDIR)\fe-secure.obj" + -@erase "$(INTDIR)\pqexpbuffer.obj" + -@erase "$(INTDIR)\pqsignal.obj" + -@erase "$(OUTDIR)\libpqdll.obj" + -@erase "$(OUTDIR)\win32.obj" + -@erase "$(INTDIR)\wchar.obj" + -@erase "$(INTDIR)\encnames.obj" + -@erase "$(INTDIR)\pthread-win32.obj" + -@erase "$(OUTDIR)\$(OUTFILENAME).lib" + -@erase "$(OUTDIR)\$(OUTFILENAME)dll.lib" + -@erase "$(OUTDIR)\libpq.res" + -@erase "$(OUTDIR)\$(OUTFILENAME).dll" + -@erase "$(OUTDIR)\$(OUTFILENAME).tds" + -@erase "$(INTDIR)\pg_config_paths.h" + LIB32=tlib.exe LIB32_FLAGS= LIB32_OBJS= \ ! "$(INTDIR)\win32.obj" \ "$(INTDIR)\getaddrinfo.obj" \ + "$(INTDIR)\pgstrcasecmp.obj" \ "$(INTDIR)\thread.obj" \ "$(INTDIR)\inet_aton.obj" \ "$(INTDIR)\crypt.obj" \ "$(INTDIR)\noblock.obj" \ "$(INTDIR)\md5.obj" \ "$(INTDIR)\ip.obj" \ "$(INTDIR)\fe-auth.obj" \ *************** *** 83,89 **** "$(INTDIR)\pqexpbuffer.obj" \ "$(INTDIR)\pqsignal.obj" \ "$(INTDIR)\wchar.obj" \ ! "$(INTDIR)\encnames.obj" RSC=brcc32.exe --- 117,124 ---- "$(INTDIR)\pqexpbuffer.obj" \ "$(INTDIR)\pqsignal.obj" \ "$(INTDIR)\wchar.obj" \ ! "$(INTDIR)\encnames.obj" \ ! "$(INTDIR)\pthread-win32.obj" RSC=brcc32.exe *************** *** 95,131 **** ALL: config "$(OUTDIR)" "$(OUTDIR)\blibpq.dll" "$(OUTDIR)\blibpq.lib" - CLEAN : - -@erase "$(INTDIR)\getaddrinfo.obj" - -@erase "$(INTDIR)\thread.obj" - -@erase "$(INTDIR)\inet_aton.obj" - -@erase "$(INTDIR)\crypt.obj" - -@erase "$(INTDIR)\md5.obj" - -@erase "$(INTDIR)\ip.obj" - -@erase "$(INTDIR)\fe-auth.obj" - -@erase "$(INTDIR)\fe-protocol2.obj" - -@erase "$(INTDIR)\fe-protocol3.obj" - -@erase "$(INTDIR)\fe-connect.obj" - -@erase "$(INTDIR)\fe-exec.obj" - -@erase "$(INTDIR)\fe-lobj.obj" - -@erase "$(INTDIR)\fe-misc.obj" - -@erase "$(INTDIR)\fe-print.obj" - -@erase "$(INTDIR)\fe-secure.obj" - -@erase "$(INTDIR)\pqexpbuffer.obj" - -@erase "$(INTDIR)\pqsignal.obj" - -@erase "$(OUTDIR)\libpqdll.obj" - -@erase "$(OUTDIR)\win32.obj" - -@erase "$(INTDIR)\wchar.obj" - -@erase "$(INTDIR)\encnames.obj" - -@erase "$(INTDIR)\noblock.obj" - -@erase "$(INTDIR)\pgstrcasecmp.obj" - -@erase "$(OUTDIR)\libpq.res" - -@erase "$(OUTDIR)\blibpq.lib" - -@erase "$(OUTDIR)\blibpqdll.lib" - -@erase "$(OUTDIR)\blibpq.dll" - -@erase "$(OUTDIR)\blibpq.tds" - -@erase "$(INTDIR)\pg_config_paths.h" - config: ..\..\include\pg_config.h pthread.h pg_config_paths.h ..\..\include\pg_config.h: ..\..\include\pg_config.h.win32 --- 130,135 ---- Index: src/interfaces/libpq/win32.mak =================================================================== RCS file: /cvsroot/pgsql/src/interfaces/libpq/win32.mak,v retrieving revision 1.30 diff -c -c -r1.30 win32.mak *** src/interfaces/libpq/win32.mak 26 Jan 2005 19:24:02 -0000 1.30 --- src/interfaces/libpq/win32.mak 21 Feb 2005 21:18:52 -0000 *************** *** 41,47 **** !ENDIF ! ALL : config "$(OUTDIR)\$(OUTFILENAME).lib" "$(OUTDIR)\$(OUTFILENAME).dll" CLEAN : -@erase "$(INTDIR)\getaddrinfo.obj" --- 41,47 ---- !ENDIF ! ALL : config "$(OUTDIR)\$(OUTFILENAME).lib" "$(OUTDIR)\$(OUTFILENAME).dll" CLEAN : -@erase "$(INTDIR)\getaddrinfo.obj" *************** *** 65,80 **** -@erase "$(INTDIR)\pqsignal.obj" -@erase "$(OUTDIR)\libpqdll.obj" -@erase "$(OUTDIR)\win32.obj" -@erase "$(OUTDIR)\$(OUTFILENAME).lib" ! -@erase "$(OUTDIR)\$(OUTFILENAME).dll" -@erase "$(OUTDIR)\libpq.res" -@erase "*.pch" -@erase "$(OUTDIR)\libpq.pch" -@erase "$(OUTDIR)\$(OUTFILENAME)dll.exp" - -@erase "$(OUTDIR)\$(OUTFILENAME)dll.lib" - -@erase "$(INTDIR)\wchar.obj" - -@erase "$(INTDIR)\encnames.obj" - -@erase "$(INTDIR)\pthread-win32.obj" -@erase "$(INTDIR)\pg_config_paths.h" --- 65,80 ---- -@erase "$(INTDIR)\pqsignal.obj" -@erase "$(OUTDIR)\libpqdll.obj" -@erase "$(OUTDIR)\win32.obj" + -@erase "$(INTDIR)\wchar.obj" + -@erase "$(INTDIR)\encnames.obj" + -@erase "$(INTDIR)\pthread-win32.obj" -@erase "$(OUTDIR)\$(OUTFILENAME).lib" ! -@erase "$(OUTDIR)\$(OUTFILENAME)dll.lib" -@erase "$(OUTDIR)\libpq.res" + -@erase "$(OUTDIR)\$(OUTFILENAME).dll" -@erase "*.pch" -@erase "$(OUTDIR)\libpq.pch" -@erase "$(OUTDIR)\$(OUTFILENAME)dll.exp" -@erase "$(INTDIR)\pg_config_paths.h" --ELM1109021047-13902-0_--