Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 2850075

Browse files
author
Marina Polyakova
committed
ICU: fix: do not make pg_upgrade with wchar.c and -DFRONTEND
Use wchar.c frontend functions from fe_utils.
1 parent f9a2a72 commit 2850075

File tree

3 files changed

+2
-12
lines changed

3 files changed

+2
-12
lines changed

src/bin/pg_upgrade/.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/pg_upgrade
2-
/wchar.c
32
# Generated by test suite
43
/analyze_new_cluster.sh
54
/delete_old_cluster.sh

src/bin/pg_upgrade/Makefile

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ include $(top_builddir)/src/Makefile.global
99

1010
OBJS = check.o controldata.o dump.o exec.o file.o function.o info.o \
1111
option.o parallel.o pg_upgrade.o relfilenode.o server.o \
12-
tablespace.o util.o version.o wchar.o $(WIN32RES)
12+
tablespace.o util.o version.o $(WIN32RES)
1313

14-
override CPPFLAGS := -DDLSUFFIX=\"$(DLSUFFIX)\" -DFRONTEND -I$(srcdir) -I$(libpq_srcdir) $(CPPFLAGS)
14+
override CPPFLAGS := -DDLSUFFIX=\"$(DLSUFFIX)\" -I$(srcdir) -I$(libpq_srcdir) $(CPPFLAGS)
1515
override LDFLAGS := -L$(top_builddir)/src/fe_utils -lpgfeutils $(libpq_pgport) $(ICU_LIBS) $(LDFLAGS)
1616

1717

@@ -20,13 +20,6 @@ all: pg_upgrade
2020
pg_upgrade: $(OBJS) | submake-libpq submake-libpgport submake-libpgfeutils
2121
$(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
2222

23-
# Pull in wchar.c from src/backend/utils/mb. That exposes us to
24-
# risks of version skew if we link to a shared library. Do it the
25-
# hard way, instead, so that we're statically linked.
26-
27-
wchar.c: % : $(top_srcdir)/src/backend/utils/mb/%
28-
rm -f $@ && $(LN_S) $< .
29-
3023
install: all installdirs
3124
$(INSTALL_PROGRAM) pg_upgrade$(X) '$(DESTDIR)$(bindir)/pg_upgrade$(X)'
3225

@@ -42,7 +35,6 @@ clean distclean maintainer-clean:
4235
loadable_libraries.txt reindex_hash.sql \
4336
pg_upgrade_dump_globals.sql \
4437
pg_upgrade_dump_*.custom pg_upgrade_*.log
45-
rm -f wchar.c
4638

4739
check: test.sh all
4840
MAKE=$(MAKE) bindir=$(bindir) libdir=$(libdir) EXTRA_REGRESS_OPTS="$(EXTRA_REGRESS_OPTS)" $(SHELL) $< --install

src/tools/msvc/Mkvcbuild.pm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ my @contrib_excludes = (
5858
my $frontend_defines = {
5959
'initdb' => 'FRONTEND',
6060
'psql' => 'FRONTEND',
61-
'pg_upgrade' => 'FRONTEND',
6261
'pg_dump' => 'FRONTEND',
6362
'pg_dumpall' => 'FRONTEND',
6463
'pg_restore' => 'FRONTEND',

0 commit comments

Comments
 (0)