1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-20 00:21:35 +00:00

- Fix pkg-plist when building with WITHOUT_THREADS

PR:		ports/159842
Submitted by:	Ruslan Mahmatkhanov <cvs-src@yandex.ru>
This commit is contained in:
Li-Wen Hsu 2011-08-19 13:09:30 +00:00
parent b6ac688edd
commit 80b804c403
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=280013
8 changed files with 14 additions and 6 deletions

View File

@ -82,6 +82,7 @@ PLIST_SUB+= IF_DEFAULT="@comment "
CFLAGS+= -D__wchar_t=wchar_t
.if !defined(WITHOUT_THREADS)
PLIST_SUB+= THREADS=""
.if defined(WITH_PTH)
CONFIGURE_ARGS+= --with-pth
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-configure-pth
@ -101,6 +102,7 @@ CFLAGS+= -DTHREAD_STACK_SIZE=0x20000
CFLAGS+= -DTHREAD_STACK_SIZE=0x100000
.endif # defined(WITHOUT_HUGE_STACK_SIZE)
.else # defined(WITHOUT_THREADS)
PLIST_SUB+= THREADS="@comment "
CONFIGURE_ARGS+= --without-threads
.if defined(LDFLAGS)
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"

View File

@ -804,7 +804,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/lib-dynload/_locale.so
%%PYTHON_LIBDIR%%/lib-dynload/_lsprof.so
%%PYTHON_LIBDIR%%/lib-dynload/_multibytecodec.so
%%PYTHON_LIBDIR%%/lib-dynload/_multiprocessing.so
%%THREADS%%%%PYTHON_LIBDIR%%/lib-dynload/_multiprocessing.so
%%PYTHON_LIBDIR%%/lib-dynload/_random.so
%%PYTHON_LIBDIR%%/lib-dynload/_sha256.so
%%PYTHON_LIBDIR%%/lib-dynload/_sha512.so

View File

@ -83,6 +83,7 @@ PLIST_SUB+= IF_DEFAULT="@comment "
CFLAGS+= -D__wchar_t=wchar_t
.if !defined(WITHOUT_THREADS)
PLIST_SUB+= THREADS=""
.if defined(WITH_PTH)
BROKEN= does not build with PTH enabled
CONFIGURE_ARGS+= --with-pth
@ -103,6 +104,7 @@ CFLAGS+= -DTHREAD_STACK_SIZE=0x20000
CFLAGS+= -DTHREAD_STACK_SIZE=0x100000
.endif # defined(WITHOUT_HUGE_STACK_SIZE)
.else # defined(WITHOUT_THREADS)
PLIST_SUB+= THREADS="@comment "
CONFIGURE_ARGS+= --without-threads
.if defined(LDFLAGS)
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"

View File

@ -860,7 +860,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
%%PYTHON_LIBDIR%%/lib-dynload/_locale.so
%%PYTHON_LIBDIR%%/lib-dynload/_lsprof.so
%%PYTHON_LIBDIR%%/lib-dynload/_multibytecodec.so
%%PYTHON_LIBDIR%%/lib-dynload/_multiprocessing.so
%%THREADS%%%%PYTHON_LIBDIR%%/lib-dynload/_multiprocessing.so
%%PYTHON_LIBDIR%%/lib-dynload/_random.so
%%PYTHON_LIBDIR%%/lib-dynload/_sha256.so
%%PYTHON_LIBDIR%%/lib-dynload/_sha512.so

View File

@ -67,6 +67,7 @@ PLIST_SUB+= IF_DEFAULT="@comment "
CFLAGS+= -D__wchar_t=wchar_t
.if !defined(WITHOUT_THREADS)
PLIST_SUB+= THREADS=""
CONFIGURE_ARGS+= --with-threads
CFLAGS+= ${PTHREAD_CFLAGS}
.if defined(WITHOUT_HUGE_STACK_SIZE)
@ -75,7 +76,8 @@ CFLAGS+= -DTHREAD_STACK_SIZE=0x20000
CFLAGS+= -DTHREAD_STACK_SIZE=0x100000
.endif # defined(WITHOUT_HUGE_STACK_SIZE)
CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
.else
.else # defined(WITHOUT_THREADS)
PLIST_SUB+= THREADS="@comment "
CONFIGURE_ARGS+= --without-threads
.if defined(LDFLAGS)
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"

View File

@ -711,7 +711,7 @@ libdata/pkgconfig/python-3.1.pc
%%PYTHON_LIBDIR%%/lib-dynload/_json.so
%%PYTHON_LIBDIR%%/lib-dynload/_lsprof.so
%%PYTHON_LIBDIR%%/lib-dynload/_multibytecodec.so
%%PYTHON_LIBDIR%%/lib-dynload/_multiprocessing.so
%%THREADS%%%%PYTHON_LIBDIR%%/lib-dynload/_multiprocessing.so
%%PYTHON_LIBDIR%%/lib-dynload/_pickle.so
%%PYTHON_LIBDIR%%/lib-dynload/_random.so
%%PYTHON_LIBDIR%%/lib-dynload/_sha256.so

View File

@ -68,6 +68,7 @@ PLIST_SUB+= IF_DEFAULT="@comment "
CFLAGS+= -D__wchar_t=wchar_t
.if !defined(WITHOUT_THREADS)
PLIST_SUB+= THREADS=""
CONFIGURE_ARGS+= --with-threads
CFLAGS+= ${PTHREAD_CFLAGS}
.if defined(WITHOUT_HUGE_STACK_SIZE)
@ -76,7 +77,8 @@ CFLAGS+= -DTHREAD_STACK_SIZE=0x20000
CFLAGS+= -DTHREAD_STACK_SIZE=0x100000
.endif # defined(WITHOUT_HUGE_STACK_SIZE)
CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
.else
.else # defined(WITHOUT_THREADS)
PLIST_SUB+= THREADS="@comment "
CONFIGURE_ARGS+= --without-threads
.if defined(LDFLAGS)
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"

View File

@ -1894,7 +1894,7 @@ libdata/pkgconfig/python-3.2.pc
%%PYTHON_LIBDIR%%/lib-dynload/_json.so
%%PYTHON_LIBDIR%%/lib-dynload/_lsprof.so
%%PYTHON_LIBDIR%%/lib-dynload/_multibytecodec.so
%%PYTHON_LIBDIR%%/lib-dynload/_multiprocessing.so
%%THREADS%%%%PYTHON_LIBDIR%%/lib-dynload/_multiprocessing.so
%%PYTHON_LIBDIR%%/lib-dynload/_pickle.so
%%PYTHON_LIBDIR%%/lib-dynload/_posixsubprocess.so
%%PYTHON_LIBDIR%%/lib-dynload/_random.so