summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian2005-08-12 20:57:11 +0000
committerBruce Momjian2005-08-12 20:57:11 +0000
commit7d3d50b82555939dd89324ce298988817c1ca121 (patch)
tree49c902a4bf2f365a76fd18a8f3bc2d1772b70918
parent8fd88038f5e6dcd63569443d308972d64eebf639 (diff)
Cleanups for FreeBSD linking (PIC) and plpython compiles.
FreeBSD ports, supplied by Jim C. Nasby
-rw-r--r--src/makefiles/Makefile.freebsd4
-rw-r--r--src/pl/plpython/Makefile2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/makefiles/Makefile.freebsd b/src/makefiles/Makefile.freebsd
index e5a489e2a8..f47ecc1232 100644
--- a/src/makefiles/Makefile.freebsd
+++ b/src/makefiles/Makefile.freebsd
@@ -10,7 +10,7 @@ DLSUFFIX = .so
ifeq ($(findstring sparc,$(host_cpu)), sparc)
CFLAGS_SL = -fPIC -DPIC
else
-CFLAGS_SL = -fpic -DPIC
+CFLAGS_SL = -fPIC -DPIC
endif
@@ -28,3 +28,5 @@ else
endif
sqlmansect = 7
+
+allow_nonpic_in_shlib = yes
diff --git a/src/pl/plpython/Makefile b/src/pl/plpython/Makefile
index a2f283476b..bb50edf536 100644
--- a/src/pl/plpython/Makefile
+++ b/src/pl/plpython/Makefile
@@ -9,7 +9,7 @@ include $(top_builddir)/src/Makefile.global
# shared library. Since there is no official way to determine this
# (at least not in pre-2.3 Python), we see if there is a file that is
# named like a shared library.
-ifneq (,$(wildcard $(python_libdir)/libpython*$(DLSUFFIX)*))
+ifneq (,$(wildcard $(python_libdir)/../../libpython*$(DLSUFFIX)*))
shared_libpython = yes
endif