Commita6b88d6

committed

Fix link failures due to snprintf/strerror changes.

snprintf.c requires isnan(), which requires -lm on some platforms.libpq never bothered with -lm before, but now it needs it.strerror.c tries to translate a string or two, which requires -lintl.We'd managed never to need that anywhere in ecpg/pgtypeslib/ before,but now we do.Per buildfarm and a report from Peter Eisentraut.Discussion:https://postgr.es/m/20180926190934.ea4xvzhkayuw7gkx@alap3.anarazel.deDiscussion:https://postgr.es/m/f67b5008-9f01-057f-2bff-558cb53af851@2ndquadrant.com

1 parent0320dda commita6b88d6Copy full SHA for a6b88d6

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ override CFLAGS += $(PTHREAD_CFLAGS)`
`25`	`25`	`# Need to recompile any libpgport object files`
`26`	`26`	`LIBS :=$(filter-out -lpgport,$(LIBS))`
`27`	`27`
`28`		`-SHLIB_LINK +=$(filter -lm,$(LIBS))`
	`28`	`+SHLIB_LINK +=$(filter -lintl -lm,$(LIBS))`
`29`	`29`
`30`	`30`	`SHLIB_EXPORTS = exports.txt`
`31`	`31`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -78,9 +78,9 @@ endif`
`78`	`78`	`# shared library link. (The order in which you list them here doesn't`
`79`	`79`	`# matter.)`
`80`	`80`	`ifneq ($(PORTNAME), win32)`
`81`		`-SHLIB_LINK +=$(filter -lcrypt -ldes -lcom_err -lcrypto -lk5crypto -lkrb5 -lgssapi_krb5 -lgss -lgssapi -lssl -lsocket -lnsl -lresolv -lintl,$(LIBS))$(LDAP_LIBS_FE)$(PTHREAD_LIBS)`
	`81`	`+SHLIB_LINK +=$(filter -lcrypt -ldes -lcom_err -lcrypto -lk5crypto -lkrb5 -lgssapi_krb5 -lgss -lgssapi -lssl -lsocket -lnsl -lresolv -lintl -lm,$(LIBS))$(LDAP_LIBS_FE)$(PTHREAD_LIBS)`
`82`	`82`	`else`
`83`		`-SHLIB_LINK +=$(filter -lcrypt -ldes -lcom_err -lcrypto -lk5crypto -lkrb5 -lgssapi32 -lssl -lsocket -lnsl -lresolv -lintl$(PTHREAD_LIBS),$(LIBS))$(LDAP_LIBS_FE)`
	`83`	`+SHLIB_LINK +=$(filter -lcrypt -ldes -lcom_err -lcrypto -lk5crypto -lkrb5 -lgssapi32 -lssl -lsocket -lnsl -lresolv -lintl-lm$(PTHREAD_LIBS),$(LIBS))$(LDAP_LIBS_FE)`
`84`	`84`	`endif`
`85`	`85`	`ifeq ($(PORTNAME), win32)`
`86`	`86`	`SHLIB_LINK += -lshell32 -lws2_32 -lsecur32$(filter -leay32 -lssleay32 -lcomerr32 -lkrb5_32,$(LIBS))`

Comments

(0)