From patchwork Mon Oct 31 14:59:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov X-Patchwork-Id: 9405653 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 508FD601C0 for ; Mon, 31 Oct 2016 15:10:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5049529305 for ; Mon, 31 Oct 2016 15:10:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4504729308; Mon, 31 Oct 2016 15:10:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4A03329305 for ; Mon, 31 Oct 2016 15:10:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B13046E06B; Mon, 31 Oct 2016 15:10:08 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 28BB56E06B for ; Mon, 31 Oct 2016 15:10:07 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id m83so18811213wmc.0 for ; Mon, 31 Oct 2016 08:10:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zbSn98HeuKEvQk3V5yuDzdAJ8vS/UXKmp5bJZo3wQRw=; b=tPP5P2a+tKrs0ZmA5ub8B8e1JFlDli4vkreN1eokqmSIstWoDnYbNFKDOtDOrsNV8n R0PXZvV2EbnmZie6hECgNJ0+/L9gJH5vlmsPpkSoT3PqOU6x5eCIzpAV+yctN1PORbjv LsgxlJUODXoRMIForv1Kw2Ntb1IoOc1gvjy7E9+5HDq/V34gi24KN/0aVzIN06R1nwJ5 +jFk0dLDmmaeOWG6iugLnQ8ItmM7A83xkDe2tO3hFrcQ+6LMa41WzRCNqmD90pycvhPV IxJS/Tjjl7QPatnprt8B4jhAsPi28udQrFx7Y2Nu53Pcn5EB4+x34QqCKn39erRCyNEe iC7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zbSn98HeuKEvQk3V5yuDzdAJ8vS/UXKmp5bJZo3wQRw=; b=L04pn5a/xGaeAWBc9iHoOLzrqlMwFB3kr1nqjsm/VmH/oZUa7CwuMg6phtYmkOWn2M Cq1shYILTwOugC9wwXpyGQZKITv0i6KT8ZsFQOojMw6JgkTxWcqaaSdagluyEwgav3rL FznTK5AMZzsF4EGCPnLf4nA/+mf+sJ8LPS3rlBb/BsdhR/+LlwGqAfB6Lnz3MT48xDsk 6Yml95TYAqAnS/m5RHvaEwGcSHJ/siGGH5NHXTtQ57L3ehMzdvUA5/6C+3rKrgMNkxth BRObFT8u9HhSghUczcF0kg2kLqBfEa4MxX/zlKJ5HmQk/5LED5tgB2vKmxTYYi2JUEJc 8UYg== X-Gm-Message-State: ABUngvdCNupBNQ4a/UoSIcsTOn/tcqGsd7TDUbOmzsfSn03pHL+JXLMIbRcuGfAaA68rCw== X-Received: by 10.194.60.106 with SMTP id g10mr26189471wjr.151.1477926605428; Mon, 31 Oct 2016 08:10:05 -0700 (PDT) Received: from arch-x1c3.cbg.collabora.co.uk ([2a00:1098:5:0:9665:9cff:feee:aa4d]) by smtp.gmail.com with ESMTPSA id o62sm25321397wmg.9.2016.10.31.08.10.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 31 Oct 2016 08:10:04 -0700 (PDT) From: Emil Velikov To: dri-devel@lists.freedesktop.org Subject: [PATCH libdrm 2/2] automake: drop PTHREAD_CFLAGS/LIBS references Date: Mon, 31 Oct 2016 14:59:51 +0000 Message-Id: <20161031145951.4009-2-emil.l.velikov@gmail.com> X-Mailer: git-send-email 2.10.0 In-Reply-To: <20161031145951.4009-1-emil.l.velikov@gmail.com> References: <20161031145951.4009-1-emil.l.velikov@gmail.com> Cc: emil.l.velikov@gmail.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Emil Velikov As per last commit, we only use the package to check if the runtime is pthread (stub) aware or not. We don't want to use the contents of the variables, if any. Signed-off-by: Emil Velikov --- We can ignore this patch if we consider doing the PTHREADSTUBS_{CFLAGS,LIBS} override as mentioned in 1/2 amdgpu/Makefile.am | 3 +-- configure.ac | 2 -- exynos/Makefile.am | 3 +-- freedreno/Makefile.am | 2 -- intel/Makefile.am | 2 -- nouveau/Makefile.am | 3 +-- omap/Makefile.am | 3 +-- radeon/Makefile.am | 3 +-- tegra/Makefile.am | 3 +-- vc4/Makefile.am | 1 - 10 files changed, 6 insertions(+), 19 deletions(-) diff --git a/amdgpu/Makefile.am b/amdgpu/Makefile.am index cf7bc1b..cf13dba 100644 --- a/amdgpu/Makefile.am +++ b/amdgpu/Makefile.am @@ -27,13 +27,12 @@ include Makefile.sources AM_CFLAGS = \ $(WARN_CFLAGS) \ -I$(top_srcdir) \ - $(PTHREADSTUBS_CFLAGS) \ -I$(top_srcdir)/include/drm libdrm_amdgpu_la_LTLIBRARIES = libdrm_amdgpu.la libdrm_amdgpu_ladir = $(libdir) libdrm_amdgpu_la_LDFLAGS = -version-number 1:0:0 -no-undefined -libdrm_amdgpu_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ +libdrm_amdgpu_la_LIBADD = ../libdrm.la libdrm_amdgpu_la_SOURCES = $(LIBDRM_AMDGPU_FILES) diff --git a/configure.ac b/configure.ac index 097e944..9836102 100644 --- a/configure.ac +++ b/configure.ac @@ -65,8 +65,6 @@ PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs) if test "x$PTHREADSTUBS_LIBS" != x; then AC_MSG_ERROR([pthread-stubs provides a library. This can cause issues - see freedesktop bug #98048.]) fi -AC_SUBST(PTHREADSTUBS_CFLAGS) -AC_SUBST(PTHREADSTUBS_LIBS) pkgconfigdir=${libdir}/pkgconfig AC_SUBST(pkgconfigdir) diff --git a/exynos/Makefile.am b/exynos/Makefile.am index f99f898..2305a33 100644 --- a/exynos/Makefile.am +++ b/exynos/Makefile.am @@ -1,13 +1,12 @@ AM_CFLAGS = \ $(WARN_CFLAGS) \ -I$(top_srcdir) \ - $(PTHREADSTUBS_CFLAGS) \ -I$(top_srcdir)/include/drm libdrm_exynos_la_LTLIBRARIES = libdrm_exynos.la libdrm_exynos_ladir = $(libdir) libdrm_exynos_la_LDFLAGS = -version-number 1:0:0 -no-undefined -libdrm_exynos_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ +libdrm_exynos_la_LIBADD = ../libdrm.la libdrm_exynos_la_SOURCES = \ exynos_drm.c \ diff --git a/freedreno/Makefile.am b/freedreno/Makefile.am index 0771d14..7f07033 100644 --- a/freedreno/Makefile.am +++ b/freedreno/Makefile.am @@ -4,7 +4,6 @@ include Makefile.sources AM_CFLAGS = \ $(WARN_CFLAGS) \ -I$(top_srcdir) \ - $(PTHREADSTUBS_CFLAGS) \ -I$(top_srcdir)/include/drm libdrm_freedreno_la_LTLIBRARIES = libdrm_freedreno.la @@ -12,7 +11,6 @@ libdrm_freedreno_ladir = $(libdir) libdrm_freedreno_la_LDFLAGS = -version-number 1:0:0 -no-undefined libdrm_freedreno_la_LIBADD = \ ../libdrm.la \ - @PTHREADSTUBS_LIBS@ \ @CLOCK_LIB@ libdrm_freedreno_la_SOURCES = $(LIBDRM_FREEDRENO_FILES) diff --git a/intel/Makefile.am b/intel/Makefile.am index c52e8c0..8f22e32 100644 --- a/intel/Makefile.am +++ b/intel/Makefile.am @@ -27,7 +27,6 @@ include Makefile.sources AM_CFLAGS = \ $(WARN_CFLAGS) \ -I$(top_srcdir) \ - $(PTHREADSTUBS_CFLAGS) \ $(PCIACCESS_CFLAGS) \ $(VALGRIND_CFLAGS) \ -I$(top_srcdir)/include/drm @@ -36,7 +35,6 @@ libdrm_intel_la_LTLIBRARIES = libdrm_intel.la libdrm_intel_ladir = $(libdir) libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined libdrm_intel_la_LIBADD = ../libdrm.la \ - @PTHREADSTUBS_LIBS@ \ @PCIACCESS_LIBS@ \ @CLOCK_LIB@ diff --git a/nouveau/Makefile.am b/nouveau/Makefile.am index 344a844..5ad2ecb 100644 --- a/nouveau/Makefile.am +++ b/nouveau/Makefile.am @@ -3,14 +3,13 @@ include Makefile.sources AM_CFLAGS = \ $(WARN_CFLAGS) \ -I$(top_srcdir) \ - $(PTHREADSTUBS_CFLAGS) \ -I$(top_srcdir)/include/drm \ -DDEBUG libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la libdrm_nouveau_ladir = $(libdir) libdrm_nouveau_la_LDFLAGS = -version-number 2:0:0 -no-undefined -libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ +libdrm_nouveau_la_LIBADD = ../libdrm.la libdrm_nouveau_la_SOURCES = $(LIBDRM_NOUVEAU_FILES) diff --git a/omap/Makefile.am b/omap/Makefile.am index 599bb9d..4f157de 100644 --- a/omap/Makefile.am +++ b/omap/Makefile.am @@ -1,13 +1,12 @@ AM_CFLAGS = \ $(WARN_CFLAGS) \ -I$(top_srcdir) \ - $(PTHREADSTUBS_CFLAGS) \ -I$(top_srcdir)/include/drm libdrm_omap_la_LTLIBRARIES = libdrm_omap.la libdrm_omap_ladir = $(libdir) libdrm_omap_la_LDFLAGS = -version-number 1:0:0 -no-undefined -libdrm_omap_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ +libdrm_omap_la_LIBADD = ../libdrm.la libdrm_omap_la_SOURCES = omap_drm.c diff --git a/radeon/Makefile.am b/radeon/Makefile.am index e241531..562ef08 100644 --- a/radeon/Makefile.am +++ b/radeon/Makefile.am @@ -27,13 +27,12 @@ include Makefile.sources AM_CFLAGS = \ $(WARN_CFLAGS) \ -I$(top_srcdir) \ - $(PTHREADSTUBS_CFLAGS) \ -I$(top_srcdir)/include/drm libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la libdrm_radeon_ladir = $(libdir) libdrm_radeon_la_LDFLAGS = -version-number 1:0:1 -no-undefined -libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ +libdrm_radeon_la_LIBADD = ../libdrm.la libdrm_radeon_la_SOURCES = $(LIBDRM_RADEON_FILES) diff --git a/tegra/Makefile.am b/tegra/Makefile.am index fb40be5..9cbb40e 100644 --- a/tegra/Makefile.am +++ b/tegra/Makefile.am @@ -3,13 +3,12 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/include/drm AM_CFLAGS = \ - @PTHREADSTUBS_CFLAGS@ \ $(WARN_CFLAGS) libdrm_tegra_ladir = $(libdir) libdrm_tegra_la_LTLIBRARIES = libdrm_tegra.la libdrm_tegra_la_LDFLAGS = -version-number 0:0:0 -no-undefined -libdrm_tegra_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ +libdrm_tegra_la_LIBADD = ../libdrm.la libdrm_tegra_la_SOURCES = \ private.h \ diff --git a/vc4/Makefile.am b/vc4/Makefile.am index 7e486b4..c2d3e57 100644 --- a/vc4/Makefile.am +++ b/vc4/Makefile.am @@ -24,7 +24,6 @@ include Makefile.sources AM_CFLAGS = \ $(WARN_CFLAGS) \ -I$(top_srcdir) \ - $(PTHREADSTUBS_CFLAGS) \ $(VALGRIND_CFLAGS) \ -I$(top_srcdir)/include/drm