mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-07-15 13:11:10 +02:00
5e22171310
Apple's latest rearrangements of the system-supplied headers have broken building of PL/Perl and PL/Tcl. The only practical way to fix PL/Tcl is to start using the "-isysroot" compiler flag to point to SDK-supplied headers, as Apple expects. We must also start distinguishing where to find Perl's headers from where to find its shared library; but that seems like good cleanup anyway. Extensions that formerly did something like -I$(perl_archlibexp)/CORE should now do -I$(perl_includedir)/CORE instead. perl_archlibexp is still the place to look for libperl.so, though. If for some reason you don't like the default -isysroot setting, you can override that by setting PG_SYSROOT in configure's arguments. I don't currently think people would need to do so, unless maybe for cross-version build purposes. In addition, teach configure where to find tclConfig.sh. Our traditional method of searching $auto_path hasn't worked for the last couple of macOS releases, and it now seems clear that Apple's not going to change that. The workaround of manually specifying --with-tclconfig was annoying already, but Mojave's made it a lot more so because the sysroot path now has to be included as well. Let's just wire the knowledge into configure instead. To avoid breaking builds against non-default Tcl installations (e.g. MacPorts) wherein the $auto_path method probably still works, arrange to try the additional case only after all else has failed. Back-patch to all supported versions, since at least the buildfarm cares about that. The changes are set up to not do anything on macOS releases that are old enough to not have functional sysroot trees.
43 lines
1.3 KiB
Makefile
43 lines
1.3 KiB
Makefile
# contrib/jsonb_plperl/Makefile
|
|
|
|
MODULE_big = jsonb_plperl
|
|
OBJS = jsonb_plperl.o $(WIN32RES)
|
|
PGFILEDESC = "jsonb_plperl - jsonb transform for plperl"
|
|
|
|
PG_CPPFLAGS = -I$(top_srcdir)/src/pl/plperl
|
|
|
|
EXTENSION = jsonb_plperlu jsonb_plperl
|
|
DATA = jsonb_plperlu--1.0.sql jsonb_plperl--1.0.sql
|
|
|
|
REGRESS = jsonb_plperl jsonb_plperlu
|
|
|
|
SHLIB_LINK += $(filter -lm, $(LIBS))
|
|
|
|
ifdef USE_PGXS
|
|
PG_CONFIG = pg_config
|
|
PGXS := $(shell $(PG_CONFIG) --pgxs)
|
|
include $(PGXS)
|
|
else
|
|
subdir = contrib/jsonb_plperl
|
|
top_builddir = ../..
|
|
include $(top_builddir)/src/Makefile.global
|
|
include $(top_srcdir)/contrib/contrib-global.mk
|
|
endif
|
|
|
|
# We must link libperl explicitly
|
|
ifeq ($(PORTNAME), win32)
|
|
# these settings are the same as for plperl
|
|
override CPPFLAGS += -DPLPERL_HAVE_UID_GID -Wno-comment
|
|
# ... see silliness in plperl Makefile ...
|
|
SHLIB_LINK_INTERNAL += $(sort $(wildcard ../../src/pl/plperl/libperl*.a))
|
|
else
|
|
rpathdir = $(perl_archlibexp)/CORE
|
|
SHLIB_LINK += $(perl_embed_ldflags)
|
|
endif
|
|
|
|
# As with plperl we need to make sure that the CORE directory is included
|
|
# last, probably because it sometimes contains some header files with names
|
|
# that clash with some of ours, or with some that we include, notably on
|
|
# Windows.
|
|
override CPPFLAGS := $(CPPFLAGS) $(perl_embed_ccflags) -I$(perl_includedir)/CORE
|