patch: fix up compiling of libpq on the 8.3 stable branch
Hi,
I tried to compile the head of REL8_3_STABLE (on x86 linux) and ran into:
In `/var/tmp/.build-1914/postgresql-8.3.0_080303/src/interfaces/libpq':
make[3]: *** No rule to make target `libpq.rc.in', needed by `libpq.rc'. Stop.
A quick lookaround revealed that the culprit is the following commit which
removed src/interfaces/libpq/libpq.rc.in but failed to update the Makefile
(and .cvsignore, for that matter).
commit 69db64c737012a8d2d6fbcce3ace7136cb2bc85f
Author: branch-fixup <branch-fixup>
Date: Wed Feb 13 03:40:38 2008 +0000
Removing files not present on branch REL8_3_STABLE:
configure
configure.in
doc/bug.template
src/include/pg_config.h.win32
src/interfaces/libpq/libpq.rc.in
src/port/win32ver.rc
Patch with a possible solution attached.
Best regards,
--
Tomas Szepe <szepe@pinerecords.com>
commit 82233586e942a5b9a75342625c8649419e0548bd
Author: Tomas Szepe <szepe@elzar.cz>
Date: Mon Mar 3 07:20:43 2008 +0100
Complement commit 69db64c "removing files not present on branch
REL8_3_STABLE" to get libpq to compile again.
diff --git a/src/interfaces/libpq/.cvsignore b/src/interfaces/libpq/.cvsignore
index aa2b04e..eda1a6d 100644
--- a/src/interfaces/libpq/.cvsignore
+++ b/src/interfaces/libpq/.cvsignore
@@ -1,4 +1,3 @@
libpqdll.def
libpqddll.def
blibpqdll.def
-libpq.rc
diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile
index 23dba3e..d824356 100644
--- a/src/interfaces/libpq/Makefile
+++ b/src/interfaces/libpq/Makefile
@@ -41,12 +41,9 @@ override shlib = cyg$(NAME)$(DLSUFFIX)
endif
ifeq ($(PORTNAME), win32)
-OBJS += win32.o pgsleep.o libpqrc.o
+OBJS += win32.o pgsleep.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
endif
@@ -66,7 +63,7 @@ SHLIB_LINK += -lshfolder -lwsock32 -lws2_32 -lsecur32 $(filter -leay32 -lssleay3
endif
-all: def-files $(srcdir)/libpq.rc all-lib
+all: def-files all-lib
# Shared library stuff
include $(top_srcdir)/src/Makefile.shlib
@@ -95,7 +92,7 @@ encnames.c wchar.c : % : $(backend_src)/utils/mb/%
# Since we can't assume that Windows boxes will have sed, the .DEF files are
# always built and included in distribution tarballs.
-distprep: def-files $(srcdir)/libpq.rc
+distprep: def-files
.PHONY: def-files
@@ -147,10 +144,6 @@ exports.list: exports.txt
exported_symbols_list = -Wl,--version-script=exports.list
endif
-# depend on Makefile.global to force rebuild on re-run of configure
-$(srcdir)/libpq.rc: libpq.rc.in $(top_builddir)/src/Makefile.global
- sed -e 's/\(VERSION.*\),0 *$$/\1,'`date '+%y%j' | sed 's/^0*//'`'/' < $< > $@
-
fe-connect.o: fe-connect.c $(top_builddir)/src/port/pg_config_paths.h
$(top_builddir)/src/port/pg_config_paths.h:
@@ -174,4 +167,4 @@ clean distclean: clean-lib
rm -f pg_config_paths.h
maintainer-clean: distclean
- rm -f $(srcdir)/libpqdll.def $(srcdir)/libpqddll.def $(srcdir)/blibpqdll.def $(srcdir)/libpq.rc
+ rm -f $(srcdir)/libpqdll.def $(srcdir)/libpqddll.def $(srcdir)/blibpqdll.def
Tomas Szepe <szepe@pinerecords.com> writes:
A quick lookaround revealed that the culprit is the following commit which
removed src/interfaces/libpq/libpq.rc.in but failed to update the Makefile
(and .cvsignore, for that matter).
commit 69db64c737012a8d2d6fbcce3ace7136cb2bc85f
Author: branch-fixup <branch-fixup>
Date: Wed Feb 13 03:40:38 2008 +0000
Removing files not present on branch REL8_3_STABLE:
configure
configure.in
doc/bug.template
src/include/pg_config.h.win32
src/interfaces/libpq/libpq.rc.in
src/port/win32ver.rc
[ blink... ] Methinks you are looking at a rather broken mirror of the
CVS repository. None of those files have been removed from branch
REL8_3_STABLE, as evidenced both by direct checking of the core
repository and by the fact that the buildfarm isn't all red. Removing
configure would surely break every last build.
Just out of curiosity, which SCM-that-wants-to-supplant-CVS was this?
regards, tom lane
commit 69db64c737012a8d2d6fbcce3ace7136cb2bc85f
Author: branch-fixup <branch-fixup>
Date: Wed Feb 13 03:40:38 2008 +0000Removing files not present on branch REL8_3_STABLE:
configure
configure.in
doc/bug.template
src/include/pg_config.h.win32
src/interfaces/libpq/libpq.rc.in
src/port/win32ver.rc[ blink... ] Methinks you are looking at a rather broken mirror of the
CVS repository. None of those files have been removed from branch
REL8_3_STABLE, as evidenced both by direct checking of the core
repository and by the fact that the buildfarm isn't all red. Removing
configure would surely break every last build.Just out of curiosity, which SCM-that-wants-to-supplant-CVS was this?
Oh, sorry about the false alarm, then.
This is from the git gateway as hosted here:
http://repo.or.cz/w/PostgreSQL.git
Owner: aidan@highrise.ca
See the backlog for REL8_3_STABLE here:
http://repo.or.cz/w/PostgreSQL.git?a=shortlog;h=REL8_3_STABLE
As far as I can tell, aside from this problem the branch looks good
(and it compiled, and it seems to work).
Best regards,
--
Tomas Szepe <szepe@pinerecords.com>