Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb6b2149

Browse files
committed
Fix python_includespec on Windows at configure time
By converting to using forward slashes at configure time we avoidhaving to repeat the logic anywhere that this is needed, such asin transforms modules for plpython.
1 parent1a629c1 commitb6b2149

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

‎config/python.m4

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ if a == b:
4444
print(a)
4545
else:
4646
print(a + ' ' + b)"`
47+
if test "$PORTNAME" = win32 ; then
48+
python_includespec=`echo $python_includespec | sed 's,[\],/,g'`
49+
fi
4750
AC_MSG_RESULT([$python_includespec])
4851
4952
AC_SUBST(python_majorversion)[]dnl

‎configure

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7487,6 +7487,9 @@ if a == b:
74877487
print(a)
74887488
else:
74897489
print(a + ' ' + b)"`
7490+
iftest"$PORTNAME" = win32;then
7491+
python_includespec=`echo$python_includespec| sed's,\,/,g'`
7492+
fi
74907493
{$as_echo"$as_me:${as_lineno-$LINENO}: result:$python_includespec">&5
74917494
$as_echo"$python_includespec">&6; }
74927495

‎src/pl/plpython/Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@ top_builddir = ../../..
55
include$(top_builddir)/src/Makefile.global
66

77

8-
# Windowsneedstoconvert backslashed paths to normal slashes,
9-
#and we have to remove -lpython from the link since we arebuilding our own
8+
#OnWindowswe havetoremove -lpython from the link since we are
9+
# building our own
1010
ifeq ($(PORTNAME), win32)
11-
python_includespec :=$(subst \,/,$(python_includespec))
1211
overridepython_libspec =
1312
endif
1413

15-
1614
overrideCPPFLAGS := -I. -I$(srcdir)$(python_includespec)$(CPPFLAGS)
1715

1816
rpathdir =$(python_libdir)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp