mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix another portability issue from commit 758ce9b77.

Browse Source 
strerror.c now requires strlcpy() in some cases, and a couple of the
ecpg libraries did not have that at hand.  Pull it in from src/port/
following the usual recipe.  Per buildfarm.
This commit is contained in:
Tom Lane 2018-09-26 19:03:33 -04:00
parent ba16aade33
commit ce4887bd02
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/interfaces/ecpg/compatlib/.gitignore vendored
View File

@ -3,4 +3,5 @@
/exports.list
/snprintf.c
/strerror.c
/strlcpy.c
/strnlen.c

6
src/interfaces/ecpg/compatlib/Makefile
View File

@ -32,7 +32,7 @@ SHLIB_EXPORTS = exports.txt
LIBS := $(filter-out -lpgport, $(LIBS))
OBJS= informix.o snprintf.o strerror.o \
$(filter strnlen.o, $(LIBOBJS)) $(WIN32RES)
$(filter strlcpy.o strnlen.o, $(LIBOBJS)) $(WIN32RES)
PKG_CONFIG_REQUIRES_PRIVATE = libecpg libpgtypes
@ -49,7 +49,7 @@ submake-pgtypeslib:
# Shared library stuff
include $(top_srcdir)/src/Makefile.shlib
snprintf.c strerror.c strnlen.c: % : $(top_srcdir)/src/port/%
snprintf.c strerror.c strlcpy.c strnlen.c: % : $(top_srcdir)/src/port/%
rm -f $@ && $(LN_S) $< .
install: all installdirs install-lib
@ -59,6 +59,6 @@ installdirs: installdirs-lib
uninstall: uninstall-lib
clean distclean: clean-lib
rm -f $(OBJS) snprintf.c strerror.c strnlen.c
rm -f $(OBJS) snprintf.c strerror.c strlcpy.c strnlen.c
maintainer-clean: distclean maintainer-clean-lib

1
src/interfaces/ecpg/pgtypeslib/.gitignore vendored
View File

@ -5,5 +5,6 @@
/rint.c
/snprintf.c
/strerror.c
/strlcpy.c
/string.c
/strnlen.c

6
src/interfaces/ecpg/pgtypeslib/Makefile
View File

@ -31,7 +31,7 @@ SHLIB_EXPORTS = exports.txt
OBJS= numeric.o datetime.o common.o dt_common.o timestamp.o interval.o \
pgstrcasecmp.o snprintf.o strerror.o \
$(filter rint.o strnlen.o, $(LIBOBJS)) \
$(filter rint.o strlcpy.o strnlen.o, $(LIBOBJS)) \
string.o \
$(WIN32RES)
@ -45,7 +45,7 @@ include $(top_srcdir)/src/Makefile.shlib
# necessarily use the same object files as the backend uses. Instead,
# symlink the source files in here and build our own object file.
pgstrcasecmp.c rint.c snprintf.c strerror.c strnlen.c: % : $(top_srcdir)/src/port/%
pgstrcasecmp.c rint.c snprintf.c strerror.c strlcpy.c strnlen.c: % : $(top_srcdir)/src/port/%
rm -f $@ && $(LN_S) $< .
string.c: % : $(top_srcdir)/src/common/%
@ -58,6 +58,6 @@ installdirs: installdirs-lib
uninstall: uninstall-lib
clean distclean: clean-lib
rm -f $(OBJS) pgstrcasecmp.c rint.c snprintf.c strerror.c strnlen.c string.c
rm -f $(OBJS) pgstrcasecmp.c rint.c snprintf.c strerror.c strlcpy.c strnlen.c string.c
maintainer-clean: distclean maintainer-clean-lib