Remove allow_nonpic_in_shlib

This was used in a time when a shared libperl or libpython was difficult
to come by.  That is obsolete, and the idea behind the flag was never
fully portable anyway and will likely fail on more modern CPU
architectures.

diff --git a/src/makefiles/Makefile.freebsd b/src/makefiles/Makefile.freebsd
index 839864c7f8e3bc7fe54f4768565c9ff568cf58a0..5a98e5a2b0bb0962f3bd38b07c22fa503d5fc9fc 100644 (file)
--- a/src/makefiles/Makefile.freebsd
+++ b/src/makefiles/Makefile.freebsd
@@ -9,10 +9,6 @@ DLSUFFIX = .so
 
 CFLAGS_SL = -fPIC -DPIC
 
-ifeq ($(findstring i386,$(host_cpu)), i386)
-allow_nonpic_in_shlib = yes
-endif
-
 
 # Rule for building a shared library from a single .o file
 %.so: %.o

diff --git a/src/makefiles/Makefile.linux b/src/makefiles/Makefile.linux
index cc5cbff2b36a4f0cf4be7360e5bf14696dd5997e..52bf0b1e2bacacb9a225309fe58b00a9c03e62f6 100644 (file)
--- a/src/makefiles/Makefile.linux
+++ b/src/makefiles/Makefile.linux
@@ -3,7 +3,6 @@ export_dynamic = -Wl,-E
 # Use --enable-new-dtags to generate DT_RUNPATH instead of DT_RPATH.
 # This allows LD_LIBRARY_PATH to still work when needed.
 rpath = -Wl,-rpath,'$(rpathdir)',--enable-new-dtags
-allow_nonpic_in_shlib = yes
 DLSUFFIX = .so
 
 ifeq "$(findstring sparc,$(host_cpu))" "sparc"

diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile
index b469b269749afda18b20a5202eae3aa4e4c26d26..e1f94937f6f800a617984f185bcffd5987dcd0dd 100644 (file)
--- a/src/pl/plperl/GNUmakefile
+++ b/src/pl/plperl/GNUmakefile
@@ -12,9 +12,8 @@ ifeq ($(perl_useshrplib),yes)
 shared_libperl = yes
 endif
 
-# If we don't have a shared library and the platform doesn't allow it
-# to work without, we have to skip it.
-ifneq (,$(findstring yes, $(shared_libperl)$(allow_nonpic_in_shlib)))
+# If we don't have a shared library, we have to skip it.
+ifeq ($(shared_libperl),yes)
 
 ifeq ($(PORTNAME), win32)
 perl_archlibexp := $(subst \,/,$(perl_archlibexp))

diff --git a/src/pl/plpython/Makefile b/src/pl/plpython/Makefile
index 122cdd984d63e4a9620e932a40a47f3881d9877a..afd8dea17efcda9571d63a63df92f96f4bdb42b7 100644 (file)
--- a/src/pl/plpython/Makefile
+++ b/src/pl/plpython/Makefile
@@ -28,9 +28,8 @@ override python_libspec = -framework Python
 override python_additional_libs =
 endif
 
-# If we don't have a shared library and the platform doesn't allow it
-# to work without, we have to skip it.
-ifneq (,$(findstring yes, $(shared_libpython)$(allow_nonpic_in_shlib)))
+# If we don't have a shared library, we have to skip it.
+ifeq ($(shared_libpython),yes)
 
 override CPPFLAGS := -I. -I$(srcdir) $(python_includespec) $(CPPFLAGS)