From 7d1049ea8008c07b467a344ab1650823c11e90db Mon Sep 17 00:00:00 2001 From: rillig Date: Sun, 31 May 2020 15:18:30 +0000 Subject: [PATCH] databases/java-qdbm: remove unknown configure option --- databases/java-qdbm/Makefile | 7 ++++--- databases/qdbm/buildlink3.mk | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/databases/java-qdbm/Makefile b/databases/java-qdbm/Makefile index 1dd53beb1deb..ee564d62ae24 100644 --- a/databases/java-qdbm/Makefile +++ b/databases/java-qdbm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2019/07/11 09:25:24 nia Exp $ +# $NetBSD: Makefile,v 1.8 2020/05/31 15:18:30 rillig Exp $ # .include "../../databases/qdbm/Makefile.common" @@ -15,8 +15,9 @@ MY_SUBDIR= java BUILD_DIRS= ${MY_SUBDIR:Q} CONFIGURE_DIRS= ${MY_SUBDIR:Q} -GNU_CONFIGURE= yes -TEST_TARGET= check +GNU_CONFIGURE= yes +GNU_CONFIGURE_PTHREAD= no +TEST_TARGET= check .include "../../databases/qdbm/buildlink3.mk" .include "../../mk/java-vm.mk" diff --git a/databases/qdbm/buildlink3.mk b/databases/qdbm/buildlink3.mk index cfaa69dc273f..132c6277da45 100644 --- a/databases/qdbm/buildlink3.mk +++ b/databases/qdbm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2019/11/02 15:38:10 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2020/05/31 15:18:30 rillig Exp $ BUILDLINK_TREE+= qdbm @@ -12,7 +12,9 @@ BUILDLINK_PKGSRCDIR.qdbm?= ../../databases/qdbm .include "../../mk/pthread.buildlink3.mk" .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "none" +.if defined(GNU_CONFIGURE_PTHREAD) CONFIGURE_ARGS+= --enable-pthread +.endif BUILDLINK_CFLAGS.qdbm+= ${PTHREAD_CFLAGS} BUILDLINK_LDFLAGS.qdbm+= ${PTHREAD_LDFLAGS} .endif