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

Commit 2c07d6b

Browse files
committed
Cleanups for FreeBSD linking (PIC) and plpython compiles.
FreeBSD ports, supplied by Jim C. Nasby
1 parent 60672b5 commit 2c07d6b

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/makefiles/Makefile.freebsd

+3-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ DLSUFFIX = .so
1010
ifeq ($(findstring sparc,$(host_cpu)), sparc)
1111
CFLAGS_SL = -fPIC -DPIC
1212
else
13-
CFLAGS_SL = -fpic -DPIC
13+
CFLAGS_SL = -fPIC -DPIC
1414
endif
1515

1616

@@ -28,3 +28,5 @@ else
2828
endif
2929

3030
sqlmansect = 7
31+
32+
allow_nonpic_in_shlib = yes

src/pl/plpython/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $PostgreSQL: pgsql/src/pl/plpython/Makefile,v 1.21 2005/05/24 17:07:41 tgl Exp $
1+
# $PostgreSQL: pgsql/src/pl/plpython/Makefile,v 1.22 2005/08/12 20:57:11 momjian Exp $
22

33
subdir = src/pl/plpython
44
top_builddir = ../../..
@@ -9,7 +9,7 @@ include $(top_builddir)/src/Makefile.global
99
# shared library. Since there is no official way to determine this
1010
# (at least not in pre-2.3 Python), we see if there is a file that is
1111
# named like a shared library.
12-
ifneq (,$(wildcard $(python_libdir)/libpython*$(DLSUFFIX)*))
12+
ifneq (,$(wildcard $(python_libdir)/../../libpython*$(DLSUFFIX)*))
1313
shared_libpython = yes
1414
endif
1515

0 commit comments

Comments
 (0)