Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
Postgres FD Implementation
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Abuhujair Javed
Postgres FD Implementation
Commits
67df9782
Commit
67df9782
authored
May 02, 2015
by
Peter Eisentraut
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Windows also needs an override of the shared libpython detection
parent
e30a8649
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
9 deletions
+14
-9
configure
configure
+7
-4
configure.in
configure.in
+7
-4
src/pl/plpython/Makefile
src/pl/plpython/Makefile
+0
-1
No files found.
configure
View file @
67df9782
...
...
@@ -7549,15 +7549,18 @@ fi
# we see if there is a file that is named like a shared library.
if
test
"
$python_enable_shared
"
!=
1
;
then
# OS X does supply a .dylib even though Py_ENABLE_SHARED does not
# get set. The file detection logic below doesn't succeed on
# older OS X versions, so make it explicit.
if
test
"
$PORTNAME
"
=
darwin
;
then
# OS X does supply a .dylib even though Py_ENABLE_SHARED does
# not get set. The file detection logic below doesn't succeed
# on older OS X versions, so make it explicit.
python_enable_shared
=
1
elif
test
"
$PORTNAME
"
=
win32
;
then
# Windows also needs an explicit override.
python_enable_shared
=
1
else
# We don't know the platform shared library extension here yet,
# so we try some candidates.
for
dlsuffix
in
.so .
dll .
sl
;
do
for
dlsuffix
in
.so .sl
;
do
if
ls
"
$python_libdir
"
/libpython
*${
dlsuffix
}*
>
/dev/null 2>&1
;
then
python_enable_shared
=
1
break
...
...
configure.in
View file @
67df9782
...
...
@@ -909,15 +909,18 @@ if test "$with_python" = yes; then
# we see if there is a file that is named like a shared library.
if test "$python_enable_shared" != 1; then
# OS X does supply a .dylib even though Py_ENABLE_SHARED does not
# get set. The file detection logic below doesn't succeed on
# older OS X versions, so make it explicit.
if test "$PORTNAME" = darwin; then
# OS X does supply a .dylib even though Py_ENABLE_SHARED does
# not get set. The file detection logic below doesn't succeed
# on older OS X versions, so make it explicit.
python_enable_shared=1
elif test "$PORTNAME" = win32; then
# Windows also needs an explicit override.
python_enable_shared=1
else
# We don't know the platform shared library extension here yet,
# so we try some candidates.
for dlsuffix in .so .
dll .
sl; do
for dlsuffix in .so .sl; do
if ls "$python_libdir"/libpython*${dlsuffix}* >/dev/null 2>&1; then
python_enable_shared=1
break
...
...
src/pl/plpython/Makefile
View file @
67df9782
...
...
@@ -8,7 +8,6 @@ include $(top_builddir)/src/Makefile.global
# Windows needs to convert backslashed paths to normal slashes,
# and we have to remove -lpython from the link since we are building our own
ifeq
($(PORTNAME), win32)
shared_libpython
=
yes
python_includespec
:=
$(
subst
\,
/,
$(python_includespec)
)
override
python_libspec
=
endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment