Skip to content

Commit 381a9ed

Browse files
bmomjianbmomjian
committed
Remove configure flag --disable-shared, as it is no longer used by any
port. The last use was QNX, per Peter Eisentraut.
1 parent 9bedfbd commit 381a9ed

File tree

6 files changed

+0
-74
lines changed

6 files changed

+0
-74
lines changed

‎configure

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,6 @@ LCOV
748748
GCOV
749749
enable_debug
750750
enable_rpath
751-
enable_shared
752751
default_port
753752
WANTED_LANGUAGES
754753
enable_nls
@@ -810,7 +809,6 @@ with_libs
810809
enable_integer_datetimes
811810
enable_nls
812811
with_pgport
813-
enable_shared
814812
enable_rpath
815813
enable_spinlocks
816814
enable_debug
@@ -1490,7 +1488,6 @@ Optional Features:
14901488
disable 64-bit integer date/time support
14911489
--enable-nls[=LANGUAGES]
14921490
enable Native Language Support
1493-
--disable-shared do not build shared libraries
14941491
--disable-rpath do not embed shared library search path in
14951492
executables
14961493
--disable-spinlocks do not use spinlocks
@@ -2471,36 +2468,6 @@ _ACEOF
24712468

24722469

24732470

2474-
#
2475-
# Option to disable shared libraries
2476-
#
2477-
2478-
2479-
# Check whether --enable-shared was given.
2480-
if test "${enable_shared+set}" = set; then
2481-
enableval=$enable_shared;
2482-
case $enableval in
2483-
yes)
2484-
:
2485-
;;
2486-
no)
2487-
:
2488-
;;
2489-
*)
2490-
{ { $as_echo "$as_me:$LINENO: error: no argument expected for --enable-shared option" >&5
2491-
$as_echo "$as_me: error: no argument expected for --enable-shared option" >&2;}
2492-
{ (exit 1); exit 1; }; }
2493-
;;
2494-
esac
2495-
2496-
else
2497-
enable_shared=yes
2498-
2499-
fi
2500-
2501-
2502-
2503-
25042471
#
25052472
# '-rpath'-like feature can be disabled
25062473
#

‎configure.in

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -163,13 +163,6 @@ AC_DEFINE_UNQUOTED(DEF_PGPORT_STR, "${default_port}",
163163
[Define to the default TCP port number as a string constant.])
164164
AC_SUBST(default_port)
165165

166-
#
167-
# Option to disable shared libraries
168-
#
169-
PGAC_ARG_BOOL(enable, shared, yes,
170-
[do not build shared libraries])
171-
AC_SUBST(enable_shared)
172-
173166
#
174167
# '-rpath'-like feature can be disabled
175168
#

‎src/Makefile.global.in

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ with_libxml = @with_libxml@
165165
with_libxslt = @with_libxslt@
166166
with_system_tzdata = @with_system_tzdata@
167167
with_zlib = @with_zlib@
168-
enable_shared = @enable_shared@
169168
enable_rpath = @enable_rpath@
170169
enable_nls = @enable_nls@
171170
enable_debug = @enable_debug@
@@ -397,13 +396,6 @@ endif
397396
# isn't created with the same link flags as libpq, it can't be used.)
398397
libpq = -L$(libpq_builddir) -lpq
399398

400-
# If doing static linking, shared library dependency info isn't available,
401-
# so add in the libraries that libpq depends on.
402-
ifeq ($(enable_shared), no)
403-
libpq += $(filter -lintl -lssl -lcrypto -lkrb5 -lcrypt, $(LIBS)) \
404-
$(LDAP_LIBS_FE) $(PTHREAD_LIBS)
405-
endif
406-
407399
# This macro is for use by client executables (not libraries) that use libpq.
408400
# We force clients to pull symbols from the non-shared library libpgport
409401
# rather than pulling some libpgport symbols from libpq just because

‎src/Makefile.shlib

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -81,20 +81,16 @@ LINK.static = $(AR) $(AROPT)
8181

8282
ifdef SO_MAJOR_VERSION
8383
# Default library naming convention used by the majority of platforms
84-
ifeq ($(enable_shared), yes)
8584
shlib = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
8685
shlib_major = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
8786
shlib_bare = lib$(NAME)$(DLSUFFIX)
88-
endif
8987
# Testing the soname variable is a reliable way to determine whether a
9088
# linkable library is being built.
9189
soname = $(shlib_major)
9290
else
9391
# Naming convention for dynamically loadable modules
94-
ifeq ($(enable_shared), yes)
9592
shlib = $(NAME)$(DLSUFFIX)
9693
endif
97-
endif
9894
stlib = lib$(NAME).a
9995

10096
ifndef soname
@@ -321,7 +317,6 @@ $(stlib): $(OBJS) | $(SHLIB_PREREQS)
321317
$(RANLIB) $@
322318
endif #haslibarule
323319

324-
ifeq ($(enable_shared), yes)
325320

326321
ifeq (,$(filter cygwin win32,$(PORTNAME)))
327322
ifneq ($(PORTNAME), aix)
@@ -392,8 +387,6 @@ $(stlib): $(shlib) $(DLL_DEFFILE) | $(SHLIB_PREREQS)
392387

393388
endif # PORTNAME == cygwin || PORTNAME == win32
394389

395-
endif # enable_shared
396-
397390

398391
# We need several not-quite-identical variants of .DEF files to build
399392
# DLLs for Windows. These are made from the single source file
@@ -446,7 +439,6 @@ ifeq ($(PORTNAME), darwin)
446439
ranlib $(stlib)
447440
endif
448441

449-
ifeq ($(enable_shared), yes)
450442
install-lib-shared: $(shlib) installdirs-lib
451443
ifdef soname
452444
# we don't install $(shlib) on AIX
@@ -471,14 +463,6 @@ endif # not aix
471463
else # no soname
472464
$(INSTALL_SHLIB) $< '$(DESTDIR)$(pkglibdir)/$(shlib)'
473465
endif
474-
else # not enable_shared
475-
ifndef soname
476-
install-lib-shared:
477-
@echo "*****"; \
478-
echo "* Module $(NAME) was not installed due to lack of shared library support."; \
479-
echo "*****"
480-
endif
481-
endif # enable_shared
482466

483467

484468
installdirs-lib:
@@ -497,11 +481,9 @@ endif
497481
uninstall-lib:
498482
ifdef soname
499483
rm -f '$(DESTDIR)$(libdir)/$(stlib)'
500-
ifeq ($(enable_shared), yes)
501484
rm -f '$(DESTDIR)$(libdir)/$(shlib_bare)' \
502485
'$(DESTDIR)$(libdir)/$(shlib_major)' \
503486
'$(DESTDIR)$(libdir)/$(shlib)'
504-
endif # enable_shared
505487
else # no soname
506488
rm -f '$(DESTDIR)$(pkglibdir)/$(shlib)'
507489
endif # no soname

‎src/backend/snowball/Makefile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ all: all-shared-lib $(SQLSCRIPT)
8181
include $(top_srcdir)/src/Makefile.shlib
8282

8383
$(SQLSCRIPT): Makefile snowball_func.sql.in snowball.sql.in
84-
ifeq ($(enable_shared), yes)
8584
echo '-- Language-specific snowball dictionaries' > $@
8685
cat $(srcdir)/snowball_func.sql.in >> $@
8786
@set -e; \
@@ -104,9 +103,6 @@ ifeq ($(enable_shared), yes)
104103
sed -e "s#_NONASCDICTNAME_#$${nonascdictname}_stem#g" | \
105104
sed -e "s#_STOPWORDS_#$$stop#g" ; \
106105
done >> $@
107-
else
108-
echo "-- No language-specific snowball dictionaries, for lack of shared library support" > $@
109-
endif
110106

111107
install: all installdirs install-lib
112108
$(INSTALL_DATA) $(SQLSCRIPT) '$(DESTDIR)$(datadir)'

‎src/backend/utils/mb/conversion_procs/Makefile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ CONVERSIONS = \
166166
all: $(SQLSCRIPT)
167167

168168
$(SQLSCRIPT): Makefile
169-
ifeq ($(enable_shared), yes)
170169
@set -e; \
171170
set $(CONVERSIONS) ; \
172171
while [ "$$#" -gt 0 ] ; \
@@ -183,9 +182,6 @@ ifeq ($(enable_shared), yes)
183182
echo "CREATE DEFAULT CONVERSION pg_catalog.$$name FOR '$$se' TO '$$de' FROM $$func;"; \
184183
echo "COMMENT ON CONVERSION pg_catalog.$$name IS 'conversion for $$se to $$de';"; \
185184
done > $@
186-
else
187-
echo "-- No conversion support, for lack of shared library support" > $@
188-
endif
189185

190186
$(REGRESSION_SCRIPT): Makefile
191187
@set -e; \

0 commit comments

Comments
 (0)