summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorAlan Eldridge <alane@FreeBSD.org>2002-11-21 15:32:09 +0000
committerAlan Eldridge <alane@FreeBSD.org>2002-11-21 15:32:09 +0000
commit3c9be6b0f39bf8109962ad7bb47c88b5124fbb88 (patch)
treef532e5dc21ec34ed8cc13308091f54292346fc5d /lang
parentAdd dependency on p5-Test-Harness. (diff)
Simplified threads configuration.
Notes
Notes: svn path=/head/; revision=70671
Diffstat (limited to 'lang')
-rw-r--r--lang/python-devel/Makefile8
-rw-r--r--lang/python/Makefile8
-rw-r--r--lang/python22/Makefile8
-rw-r--r--lang/python23/Makefile8
-rw-r--r--lang/python24/Makefile8
-rw-r--r--lang/python25/Makefile8
-rw-r--r--lang/python26/Makefile8
-rw-r--r--lang/python27/Makefile8
-rw-r--r--lang/python30/Makefile8
-rw-r--r--lang/python31/Makefile8
-rw-r--r--lang/python32/Makefile8
11 files changed, 55 insertions, 33 deletions
diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile
index dc11f17e397c..a7dcc62affa3 100644
--- a/lang/python-devel/Makefile
+++ b/lang/python-devel/Makefile
@@ -32,14 +32,16 @@ PYTHON_NO_DEPENDS= yes
# If you don't want to use Python's thread module, you need to set
# WITHOUT_THREADS.
#
-LIBC_R!= /sbin/ldconfig -r | grep c_r || true
-.if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
+.if !defined(WITHOUT_THREADS)
CONFIGURE_ARGS+= --with-threads
CFLAGS+= ${PTHREAD_CFLAGS}
CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
.else
CONFIGURE_ARGS+= --without-threads
-.endif
+.if defined(LDFLAGS)
+CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
+.endif # defined(LDFLAGS)
+.endif # !defined(WITHOUT_THREADS)
DEMODIR= ${PREFIX}/share/examples/${PYTHON_VERSION}
diff --git a/lang/python/Makefile b/lang/python/Makefile
index dc11f17e397c..a7dcc62affa3 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -32,14 +32,16 @@ PYTHON_NO_DEPENDS= yes
# If you don't want to use Python's thread module, you need to set
# WITHOUT_THREADS.
#
-LIBC_R!= /sbin/ldconfig -r | grep c_r || true
-.if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
+.if !defined(WITHOUT_THREADS)
CONFIGURE_ARGS+= --with-threads
CFLAGS+= ${PTHREAD_CFLAGS}
CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
.else
CONFIGURE_ARGS+= --without-threads
-.endif
+.if defined(LDFLAGS)
+CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
+.endif # defined(LDFLAGS)
+.endif # !defined(WITHOUT_THREADS)
DEMODIR= ${PREFIX}/share/examples/${PYTHON_VERSION}
diff --git a/lang/python22/Makefile b/lang/python22/Makefile
index dc11f17e397c..a7dcc62affa3 100644
--- a/lang/python22/Makefile
+++ b/lang/python22/Makefile
@@ -32,14 +32,16 @@ PYTHON_NO_DEPENDS= yes
# If you don't want to use Python's thread module, you need to set
# WITHOUT_THREADS.
#
-LIBC_R!= /sbin/ldconfig -r | grep c_r || true
-.if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
+.if !defined(WITHOUT_THREADS)
CONFIGURE_ARGS+= --with-threads
CFLAGS+= ${PTHREAD_CFLAGS}
CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
.else
CONFIGURE_ARGS+= --without-threads
-.endif
+.if defined(LDFLAGS)
+CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
+.endif # defined(LDFLAGS)
+.endif # !defined(WITHOUT_THREADS)
DEMODIR= ${PREFIX}/share/examples/${PYTHON_VERSION}
diff --git a/lang/python23/Makefile b/lang/python23/Makefile
index dc11f17e397c..a7dcc62affa3 100644
--- a/lang/python23/Makefile
+++ b/lang/python23/Makefile
@@ -32,14 +32,16 @@ PYTHON_NO_DEPENDS= yes
# If you don't want to use Python's thread module, you need to set
# WITHOUT_THREADS.
#
-LIBC_R!= /sbin/ldconfig -r | grep c_r || true
-.if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
+.if !defined(WITHOUT_THREADS)
CONFIGURE_ARGS+= --with-threads
CFLAGS+= ${PTHREAD_CFLAGS}
CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
.else
CONFIGURE_ARGS+= --without-threads
-.endif
+.if defined(LDFLAGS)
+CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
+.endif # defined(LDFLAGS)
+.endif # !defined(WITHOUT_THREADS)
DEMODIR= ${PREFIX}/share/examples/${PYTHON_VERSION}
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index dc11f17e397c..a7dcc62affa3 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -32,14 +32,16 @@ PYTHON_NO_DEPENDS= yes
# If you don't want to use Python's thread module, you need to set
# WITHOUT_THREADS.
#
-LIBC_R!= /sbin/ldconfig -r | grep c_r || true
-.if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
+.if !defined(WITHOUT_THREADS)
CONFIGURE_ARGS+= --with-threads
CFLAGS+= ${PTHREAD_CFLAGS}
CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
.else
CONFIGURE_ARGS+= --without-threads
-.endif
+.if defined(LDFLAGS)
+CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
+.endif # defined(LDFLAGS)
+.endif # !defined(WITHOUT_THREADS)
DEMODIR= ${PREFIX}/share/examples/${PYTHON_VERSION}
diff --git a/lang/python25/Makefile b/lang/python25/Makefile
index dc11f17e397c..a7dcc62affa3 100644
--- a/lang/python25/Makefile
+++ b/lang/python25/Makefile
@@ -32,14 +32,16 @@ PYTHON_NO_DEPENDS= yes
# If you don't want to use Python's thread module, you need to set
# WITHOUT_THREADS.
#
-LIBC_R!= /sbin/ldconfig -r | grep c_r || true
-.if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
+.if !defined(WITHOUT_THREADS)
CONFIGURE_ARGS+= --with-threads
CFLAGS+= ${PTHREAD_CFLAGS}
CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
.else
CONFIGURE_ARGS+= --without-threads
-.endif
+.if defined(LDFLAGS)
+CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
+.endif # defined(LDFLAGS)
+.endif # !defined(WITHOUT_THREADS)
DEMODIR= ${PREFIX}/share/examples/${PYTHON_VERSION}
diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index dc11f17e397c..a7dcc62affa3 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -32,14 +32,16 @@ PYTHON_NO_DEPENDS= yes
# If you don't want to use Python's thread module, you need to set
# WITHOUT_THREADS.
#
-LIBC_R!= /sbin/ldconfig -r | grep c_r || true
-.if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
+.if !defined(WITHOUT_THREADS)
CONFIGURE_ARGS+= --with-threads
CFLAGS+= ${PTHREAD_CFLAGS}
CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
.else
CONFIGURE_ARGS+= --without-threads
-.endif
+.if defined(LDFLAGS)
+CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
+.endif # defined(LDFLAGS)
+.endif # !defined(WITHOUT_THREADS)
DEMODIR= ${PREFIX}/share/examples/${PYTHON_VERSION}
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index dc11f17e397c..a7dcc62affa3 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -32,14 +32,16 @@ PYTHON_NO_DEPENDS= yes
# If you don't want to use Python's thread module, you need to set
# WITHOUT_THREADS.
#
-LIBC_R!= /sbin/ldconfig -r | grep c_r || true
-.if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
+.if !defined(WITHOUT_THREADS)
CONFIGURE_ARGS+= --with-threads
CFLAGS+= ${PTHREAD_CFLAGS}
CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
.else
CONFIGURE_ARGS+= --without-threads
-.endif
+.if defined(LDFLAGS)
+CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
+.endif # defined(LDFLAGS)
+.endif # !defined(WITHOUT_THREADS)
DEMODIR= ${PREFIX}/share/examples/${PYTHON_VERSION}
diff --git a/lang/python30/Makefile b/lang/python30/Makefile
index dc11f17e397c..a7dcc62affa3 100644
--- a/lang/python30/Makefile
+++ b/lang/python30/Makefile
@@ -32,14 +32,16 @@ PYTHON_NO_DEPENDS= yes
# If you don't want to use Python's thread module, you need to set
# WITHOUT_THREADS.
#
-LIBC_R!= /sbin/ldconfig -r | grep c_r || true
-.if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
+.if !defined(WITHOUT_THREADS)
CONFIGURE_ARGS+= --with-threads
CFLAGS+= ${PTHREAD_CFLAGS}
CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
.else
CONFIGURE_ARGS+= --without-threads
-.endif
+.if defined(LDFLAGS)
+CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
+.endif # defined(LDFLAGS)
+.endif # !defined(WITHOUT_THREADS)
DEMODIR= ${PREFIX}/share/examples/${PYTHON_VERSION}
diff --git a/lang/python31/Makefile b/lang/python31/Makefile
index dc11f17e397c..a7dcc62affa3 100644
--- a/lang/python31/Makefile
+++ b/lang/python31/Makefile
@@ -32,14 +32,16 @@ PYTHON_NO_DEPENDS= yes
# If you don't want to use Python's thread module, you need to set
# WITHOUT_THREADS.
#
-LIBC_R!= /sbin/ldconfig -r | grep c_r || true
-.if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
+.if !defined(WITHOUT_THREADS)
CONFIGURE_ARGS+= --with-threads
CFLAGS+= ${PTHREAD_CFLAGS}
CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
.else
CONFIGURE_ARGS+= --without-threads
-.endif
+.if defined(LDFLAGS)
+CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
+.endif # defined(LDFLAGS)
+.endif # !defined(WITHOUT_THREADS)
DEMODIR= ${PREFIX}/share/examples/${PYTHON_VERSION}
diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index dc11f17e397c..a7dcc62affa3 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -32,14 +32,16 @@ PYTHON_NO_DEPENDS= yes
# If you don't want to use Python's thread module, you need to set
# WITHOUT_THREADS.
#
-LIBC_R!= /sbin/ldconfig -r | grep c_r || true
-.if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
+.if !defined(WITHOUT_THREADS)
CONFIGURE_ARGS+= --with-threads
CFLAGS+= ${PTHREAD_CFLAGS}
CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
.else
CONFIGURE_ARGS+= --without-threads
-.endif
+.if defined(LDFLAGS)
+CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
+.endif # defined(LDFLAGS)
+.endif # !defined(WITHOUT_THREADS)
DEMODIR= ${PREFIX}/share/examples/${PYTHON_VERSION}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 05:29:23 +0000