postgres.git / summary / log / commit / refs

commit    2c07d6bfa504fdfbbc2330a30548beb9280a66ac
Author:   Bruce Momjian <bruce@momjian.us>
Date:     Fri Aug 12 20:57:11 2005 +0000
First released in: 8.1.0

    Cleanups for FreeBSD linking (PIC) and plpython compiles.
    
    FreeBSD ports, supplied by Jim C. Nasby


 src/makefiles/Makefile.freebsd | 4 +++-
 src/pl/plpython/Makefile       | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/makefiles/Makefile.freebsd b/src/makefiles/Makefile.freebsd
index e5a489e2a8b..f47ecc12325 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 c8eead2601d..1ce9a4e51c0 100644
--- a/src/pl/plpython/Makefile
+++ b/src/pl/plpython/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/src/pl/plpython/Makefile,v 1.21 2005/05/24 17:07:41 tgl Exp $
+# $PostgreSQL: pgsql/src/pl/plpython/Makefile,v 1.22 2005/08/12 20:57:11 momjian Exp $
 
 subdir = src/pl/plpython
 top_builddir = ../../..
@@ -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
 


[parent: 60672b59b8c3]