Commit 1a5f04dd authored by Peter Eisentraut's avatar Peter Eisentraut

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.
parent 8d2e9a9d
...@@ -9,10 +9,6 @@ DLSUFFIX = .so ...@@ -9,10 +9,6 @@ DLSUFFIX = .so
CFLAGS_SL = -fPIC -DPIC 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 # Rule for building a shared library from a single .o file
%.so: %.o %.so: %.o
......
...@@ -3,7 +3,6 @@ export_dynamic = -Wl,-E ...@@ -3,7 +3,6 @@ export_dynamic = -Wl,-E
# Use --enable-new-dtags to generate DT_RUNPATH instead of DT_RPATH. # Use --enable-new-dtags to generate DT_RUNPATH instead of DT_RPATH.
# This allows LD_LIBRARY_PATH to still work when needed. # This allows LD_LIBRARY_PATH to still work when needed.
rpath = -Wl,-rpath,'$(rpathdir)',--enable-new-dtags rpath = -Wl,-rpath,'$(rpathdir)',--enable-new-dtags
allow_nonpic_in_shlib = yes
DLSUFFIX = .so DLSUFFIX = .so
ifeq "$(findstring sparc,$(host_cpu))" "sparc" ifeq "$(findstring sparc,$(host_cpu))" "sparc"
......
...@@ -12,9 +12,8 @@ ifeq ($(perl_useshrplib),yes) ...@@ -12,9 +12,8 @@ ifeq ($(perl_useshrplib),yes)
shared_libperl = yes shared_libperl = yes
endif endif
# If we don't have a shared library and the platform doesn't allow it # If we don't have a shared library, we have to skip it.
# to work without, we have to skip it. ifeq ($(shared_libperl),yes)
ifneq (,$(findstring yes, $(shared_libperl)$(allow_nonpic_in_shlib)))
ifeq ($(PORTNAME), win32) ifeq ($(PORTNAME), win32)
perl_archlibexp := $(subst \,/,$(perl_archlibexp)) perl_archlibexp := $(subst \,/,$(perl_archlibexp))
......
...@@ -28,9 +28,8 @@ override python_libspec = -framework Python ...@@ -28,9 +28,8 @@ override python_libspec = -framework Python
override python_additional_libs = override python_additional_libs =
endif endif
# If we don't have a shared library and the platform doesn't allow it # If we don't have a shared library, we have to skip it.
# to work without, we have to skip it. ifeq ($(shared_libpython),yes)
ifneq (,$(findstring yes, $(shared_libpython)$(allow_nonpic_in_shlib)))
override CPPFLAGS := -I. -I$(srcdir) $(python_includespec) $(CPPFLAGS) override CPPFLAGS := -I. -I$(srcdir) $(python_includespec) $(CPPFLAGS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment