From patchwork Mon Oct 12 19:41:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1381122 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=g0UvozLI; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C98Fl389fz9sS8 for ; Tue, 13 Oct 2020 06:42:03 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C55DC86B66; Mon, 12 Oct 2020 19:41:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hydL2Le65ldC; Mon, 12 Oct 2020 19:41:55 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 49CFA86B42; Mon, 12 Oct 2020 19:41:55 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id B51911BF5DF for ; Mon, 12 Oct 2020 19:41:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id B1EC885C32 for ; Mon, 12 Oct 2020 19:41:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id u0_yEHpX5W2v for ; Mon, 12 Oct 2020 19:41:52 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 623EB85DD1 for ; Mon, 12 Oct 2020 19:41:52 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id 13so18226647wmf.0 for ; Mon, 12 Oct 2020 12:41:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=fJyvJ485G4/jPyLom6X6nUe9xCiKhHE6I28+VexWdfs=; b=g0UvozLII0QEagmPQZnuvGJBfTyRKSsAvBNcVn4ni9EqvxTBmPq+cmbopI+czXTP90 8634yl8SOIK6JexIhuClwsYfV/d9l+LIte0sKXdEPRGhO5F2FGiQrLsloyOo1XQsyRMZ WuHAg4qOCF6x2QafCENbljEQyZfh8fxE0MLMxZDW2DXu9zp9Z9Pc+y+R47x8HPq8/8x0 gG2DvQGq/8iYSvnxDdU+1CD7OfoieZZ17IBA1SQKDChNlIWRnqTBPsIUtixjsnc5Z7Y+ ZTiGv797ERHD9Cz7bm1iI1izKIEKHGh4cmPuhM4lzQ318Z/Bt+/o3Vbrugu3yPJfronj E83g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=fJyvJ485G4/jPyLom6X6nUe9xCiKhHE6I28+VexWdfs=; b=BgXY5Zc3H56MYFzoUPdr7mksquxYnSAwRhFAIEUW+MClK+GYfw6IVGGyycXiWwVd1Z 3K19Ael4k0W5lfUWi1jebwkdevVVLdyxd2gyrcApLpCJXG9A7bSrIDYJmb+pk02LxrF+ JVbnfr27TR3zKXzvLOPxYyLCYdmvZ04IUHtko3iZ6gNbOz5CUgoVh/LT1akonVqJc9kW ciWXu/5Ym4HGY5YhAdmCLny1ErHP+Js5Kfyt4SRb6fDSskshPr7HCHyaeEdvP4nao8fz PmbuwLfkwVo770Cz56KmTBnLpsNICXtOzp2flI1EXZtpjbau5ZzSLinNbM7pDyuEu7Lm j0+w== X-Gm-Message-State: AOAM530icRHpHk7EdtNLpqUUa48rCmoxmdQawu7tQFzb7QKhDMzLdR+v qxaAOvGuBy/XxXF7u33i0QHIUC5lWtniWg== X-Google-Smtp-Source: ABdhPJwRhuWxt4JrOOiElhY55TUetdC0i/WxZhBtSdQNmVG/kPWTFcroLTBpFd7TlNSZTjQe2lrLug== X-Received: by 2002:a1c:4006:: with SMTP id n6mr11814836wma.46.1602531710463; Mon, 12 Oct 2020 12:41:50 -0700 (PDT) Received: from kali.home (2a01cb0881b76d00c2afd0dfa851d2b9.ipv6.abo.wanadoo.fr. [2a01:cb08:81b7:6d00:c2af:d0df:a851:d2b9]) by smtp.gmail.com with ESMTPSA id n2sm24121094wma.29.2020.10.12.12.41.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Oct 2020 12:41:49 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Mon, 12 Oct 2020 21:41:43 +0200 Message-Id: <20201012194144.2949015-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/2] package/unixodbc: drop non upstreamable patch X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bernd Kuhls , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Drop patch that is not upstreamable and replace it by using --{dis,en}able-threads option Signed-off-by: Fabrice Fontaine --- package/unixodbc/0001-fix-nopthread.patch | 39 ----------------------- package/unixodbc/unixodbc.mk | 6 ++++ 2 files changed, 6 insertions(+), 39 deletions(-) delete mode 100644 package/unixodbc/0001-fix-nopthread.patch diff --git a/package/unixodbc/0001-fix-nopthread.patch b/package/unixodbc/0001-fix-nopthread.patch deleted file mode 100644 index 45933e54d6..0000000000 --- a/package/unixodbc/0001-fix-nopthread.patch +++ /dev/null @@ -1,39 +0,0 @@ -Fix pthread detection - -configure.in always calls AC_CHECK_COMP_OPT(pthread) which succeeds with the -toolchain used although it does not contain thread support: - -checking for mutex_lock in -lthread ... no -checking for pthread_mutex_lock in -lpthread... no -checking for pthread_mutex_lock in -lc... no -checking if compiler accepts -pthread... yes -checking for pthread_mutex_lock in -lc... no -checking for pthread_mutex_lock in -lpthread... no - -This positive configure check leads to - - CFLAGS="$CFLAGS -pthread" - -in ./configure, line 15757 which causes a compilation bug -/home/br/br4/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/4.8.3/../../../../arm-buildroot-linux-uclibcgnueab - -using this defconfig -http://autobuild.buildroot.net/results/e86/e86e97ff7887f1bdc6bf913498392ff50f56ea88/defconfig - -This patch disables the freebsd-only code path. Patching configure directly -prevents the need for autoreconf. - -Signed-off-by: Bernd Kuhls - -diff -uNr unixODBC-2.3.2.org/configure unixODBC-2.3.2/configure ---- unixODBC-2.3.2.org/configure 2013-10-08 10:56:03.000000000 +0200 -+++ unixODBC-2.3.2/configure 2015-03-13 21:19:59.210429211 +0100 -@@ -15746,7 +15746,7 @@ - - fi - -- if test "x$gotthread" = "xno"; then -+ if test "x$gotthread" = "xnot_needed_for_buildroot"; then - if test "x$ac_cv_c_compiler_gnu" = "xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -pthread" >&5 - $as_echo_n "checking if compiler accepts -pthread... " >&6; } diff --git a/package/unixodbc/unixodbc.mk b/package/unixodbc/unixodbc.mk index 2c936fe9d5..efcd5e3d4e 100644 --- a/package/unixodbc/unixodbc.mk +++ b/package/unixodbc/unixodbc.mk @@ -34,4 +34,10 @@ else UNIXODBC_CONF_OPTS += --disable-readline endif +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +UNIXODBC_CONF_OPTS += --enable-threads +else +UNIXODBC_CONF_OPTS += --disable-threads +endif + $(eval $(autotools-package))