Commits

Peter Eisentraut committed 1a5f04d

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.

Comments (0)

Files changed (4)

src/makefiles/Makefile.freebsd

 
 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

src/makefiles/Makefile.linux

 # 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"

src/pl/plperl/GNUmakefile

 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))

src/pl/plpython/Makefile

 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)