Commit67df978

committed

Windows also needs an override of the shared libpython detection

1 parente30a864 commit67df978Copy full SHA for 67df978

File tree

+14

-9

lines changed

+14

-9

lines changed

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -7549,15 +7549,18 @@ fi`
`7549`	`7549`	`# we see if there is a file that is named like a shared library.`
`7550`	`7550`
`7551`	`7551`	`iftest"$python_enable_shared"!= 1;then`
`7552`		`-# OS X does supply a .dylib even though Py_ENABLE_SHARED does not`
`7553`		`-# get set. The file detection logic below doesn't succeed on`
`7554`		`-# older OS X versions, so make it explicit.`
`7555`	`7552`	`iftest"$PORTNAME" = darwin;then`
	`7553`	`+# OS X does supply a .dylib even though Py_ENABLE_SHARED does`
	`7554`	`+# not get set. The file detection logic below doesn't succeed`
	`7555`	`+# on older OS X versions, so make it explicit.`
	`7556`	`+ python_enable_shared=1`
	`7557`	`+eliftest"$PORTNAME" = win32;then`
	`7558`	`+# Windows also needs an explicit override.`
`7556`	`7559`	`python_enable_shared=1`
`7557`	`7560`	`else`
`7558`	`7561`	`# We don't know the platform shared library extension here yet,`
`7559`	`7562`	`# so we try some candidates.`
`7560`		`-fordlsuffixin .so .dll .sl;do`
	`7563`	`+fordlsuffixin .so .sl;do`
`7561`	`7564`	`if ls"$python_libdir"/libpython${dlsuffix}>/dev/null2>&1;then`
`7562`	`7565`	`python_enable_shared=1`
`7563`	`7566`	`break`

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -909,15 +909,18 @@ if test "$with_python" = yes; then`
`909`	`909`	`# we see if there is a file that is named like a shared library.`
`910`	`910`
`911`	`911`	`if test "$python_enable_shared" != 1; then`
`912`		`- # OS X does supply a .dylib even though Py_ENABLE_SHARED does not`
`913`		`- # get set. The file detection logic below doesn't succeed on`
`914`		`- # older OS X versions, so make it explicit.`
`915`	`912`	`if test "$PORTNAME" = darwin; then`
	`913`	`+ # OS X does supply a .dylib even though Py_ENABLE_SHARED does`
	`914`	`+ # not get set. The file detection logic below doesn't succeed`
	`915`	`+ # on older OS X versions, so make it explicit.`
	`916`	`+ python_enable_shared=1`
	`917`	`+ elif test "$PORTNAME" = win32; then`
	`918`	`+ # Windows also needs an explicit override.`
`916`	`919`	`python_enable_shared=1`
`917`	`920`	`else`
`918`	`921`	`# We don't know the platform shared library extension here yet,`
`919`	`922`	`# so we try some candidates.`
`920`		`- for dlsuffix in .so .dll .sl; do`
	`923`	`+ for dlsuffix in .so .sl; do`
`921`	`924`	`if ls "$python_libdir"/libpython${dlsuffix} >/dev/null 2>&1; then`
`922`	`925`	`python_enable_shared=1`
`923`	`926`	`break`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ include $(top_builddir)/src/Makefile.global`
`8`	`8`	`# Windows needs to convert backslashed paths to normal slashes,`
`9`	`9`	`# and we have to remove -lpython from the link since we are building our own`
`10`	`10`	`ifeq ($(PORTNAME), win32)`
`11`		`-shared_libpython = yes`
`12`	`11`	`python_includespec :=$(subst \,/,$(python_includespec))`
`13`	`12`	`overridepython_libspec =`
`14`	`13`	`endif`

Comments

(0)