diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2017-10-11 11:27:57 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2017-10-11 11:28:04 -0400 |
| commit | 46912d9b1504cfaede1b22811039028a75f76ab8 (patch) | |
| tree | 517e6ea3f3ef8257f802b89ee19e17eb6362fd8b /src/interfaces/ecpg/compatlib | |
| parent | e9e0f78bdeaee6e1e24544fd564cf0907f6a2134 (diff) | |
| download | postgresql-46912d9b1504cfaede1b22811039028a75f76ab8.tar.gz postgresql-46912d9b1504cfaede1b22811039028a75f76ab8.zip | |
Add port/strnlen support to libpq and ecpg Makefiles.
In the wake of fffd651e8, any makefile that pulls in snprintf.c
from src/port/ needs to be prepared to pull in strnlen.c as well.
Per buildfarm.
Diffstat (limited to 'src/interfaces/ecpg/compatlib')
| -rw-r--r-- | src/interfaces/ecpg/compatlib/.gitignore | 1 | ||||
| -rw-r--r-- | src/interfaces/ecpg/compatlib/Makefile | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/interfaces/ecpg/compatlib/.gitignore b/src/interfaces/ecpg/compatlib/.gitignore index 6eb8a0dc069..ad5ba1354ca 100644 --- a/src/interfaces/ecpg/compatlib/.gitignore +++ b/src/interfaces/ecpg/compatlib/.gitignore @@ -2,3 +2,4 @@ /blibecpg_compatdll.def /exports.list /snprintf.c +/strnlen.c diff --git a/src/interfaces/ecpg/compatlib/Makefile b/src/interfaces/ecpg/compatlib/Makefile index 04ddcfeab2c..9ea5cf4ac4f 100644 --- a/src/interfaces/ecpg/compatlib/Makefile +++ b/src/interfaces/ecpg/compatlib/Makefile @@ -31,7 +31,7 @@ SHLIB_EXPORTS = exports.txt # Need to recompile any libpgport object files LIBS := $(filter-out -lpgport, $(LIBS)) -OBJS= informix.o $(filter snprintf.o, $(LIBOBJS)) $(WIN32RES) +OBJS= informix.o $(filter snprintf.o strnlen.o, $(LIBOBJS)) $(WIN32RES) PKG_CONFIG_REQUIRES_PRIVATE = libecpg libpgtypes @@ -48,7 +48,7 @@ submake-pgtypeslib: # Shared library stuff include $(top_srcdir)/src/Makefile.shlib -snprintf.c: % : $(top_srcdir)/src/port/% +snprintf.c strnlen.c: % : $(top_srcdir)/src/port/% rm -f $@ && $(LN_S) $< . install: all installdirs install-lib @@ -58,6 +58,6 @@ installdirs: installdirs-lib uninstall: uninstall-lib clean distclean: clean-lib - rm -f $(OBJS) snprintf.c + rm -f $(OBJS) snprintf.c strnlen.c maintainer-clean: distclean maintainer-clean-lib |