Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 1a5f04d

Browse files
committed
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.
1 parent 8d2e9a9 commit 1a5f04d

File tree

4 files changed

+4
-11
lines changed

4 files changed

+4
-11
lines changed

src/makefiles/Makefile.freebsd

-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ DLSUFFIX = .so
99

1010
CFLAGS_SL = -fPIC -DPIC
1111

12-
ifeq ($(findstring i386,$(host_cpu)), i386)
13-
allow_nonpic_in_shlib = yes
14-
endif
15-
1612

1713
# Rule for building a shared library from a single .o file
1814
%.so: %.o

src/makefiles/Makefile.linux

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ export_dynamic = -Wl,-E
33
# Use --enable-new-dtags to generate DT_RUNPATH instead of DT_RPATH.
44
# This allows LD_LIBRARY_PATH to still work when needed.
55
rpath = -Wl,-rpath,'$(rpathdir)',--enable-new-dtags
6-
allow_nonpic_in_shlib = yes
76
DLSUFFIX = .so
87

98
ifeq "$(findstring sparc,$(host_cpu))" "sparc"

src/pl/plperl/GNUmakefile

+2-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ ifeq ($(perl_useshrplib),yes)
1212
shared_libperl = yes
1313
endif
1414

15-
# If we don't have a shared library and the platform doesn't allow it
16-
# to work without, we have to skip it.
17-
ifneq (,$(findstring yes, $(shared_libperl)$(allow_nonpic_in_shlib)))
15+
# If we don't have a shared library, we have to skip it.
16+
ifeq ($(shared_libperl),yes)
1817

1918
ifeq ($(PORTNAME), win32)
2019
perl_archlibexp := $(subst \,/,$(perl_archlibexp))

src/pl/plpython/Makefile

+2-3
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,8 @@ override python_libspec = -framework Python
2828
override python_additional_libs =
2929
endif
3030

31-
# If we don't have a shared library and the platform doesn't allow it
32-
# to work without, we have to skip it.
33-
ifneq (,$(findstring yes, $(shared_libpython)$(allow_nonpic_in_shlib)))
31+
# If we don't have a shared library, we have to skip it.
32+
ifeq ($(shared_libpython),yes)
3433

3534
override CPPFLAGS := -I. -I$(srcdir) $(python_includespec) $(CPPFLAGS)
3635

0 commit comments

Comments
 (0)