From patchwork Wed Apr 22 20:29:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 463797 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 2B7AE1402DE for ; Thu, 23 Apr 2015 06:29:50 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 3E84A332AF; Wed, 22 Apr 2015 20:29:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ScBeerHtTpz8; Wed, 22 Apr 2015 20:29:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 986A433036; Wed, 22 Apr 2015 20:29:45 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 388821C260A for ; Wed, 22 Apr 2015 20:29:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 322D98C11D for ; Wed, 22 Apr 2015 20:29:44 +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 ZQJvXJYTn6mF for ; Wed, 22 Apr 2015 20:29:43 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.datacom.ind.br (mx.datacom.ind.br [177.66.5.10]) by whitealder.osuosl.org (Postfix) with ESMTPS id 66E8D8C099 for ; Wed, 22 Apr 2015 20:29:43 +0000 (UTC) Received: from mail.datacom.ind.br (localhost [127.0.0.1]) by mail.datacom.ind.br (Postfix) with ESMTPS id 81CA514A2638; Wed, 22 Apr 2015 17:29:33 -0300 (BRT) Received: from localhost (localhost [127.0.0.1]) by mail.datacom.ind.br (Postfix) with ESMTP id 7368214AE1D0; Wed, 22 Apr 2015 17:29:33 -0300 (BRT) Received: from mail.datacom.ind.br ([127.0.0.1]) by localhost (mail.datacom.ind.br [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id OMDTYYuhZClf; Wed, 22 Apr 2015 17:29:33 -0300 (BRT) Received: from buildroot.ped.datacom.ind.br (unknown [10.0.126.80]) by mail.datacom.ind.br (Postfix) with ESMTP id 6226C14A9015; Wed, 22 Apr 2015 17:29:33 -0300 (BRT) From: Carlos Santos To: buildroot@buildroot.org Date: Wed, 22 Apr 2015 17:29:28 -0300 Message-Id: <1429734568-20489-1-git-send-email-casantos@datacom.ind.br> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: References: Subject: [Buildroot] [PATCH v2 1/1] gtest: update recipe to use autotools X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The previous recipe build gtest using cmake, which prevented compiling gmock (to be submitted in a following patch). Gmock requires the gtest-config script, which is installed only if gtest is built with autotools. Change-Id: I71e52d2ccc19160ca936d80b41c127e79f1a7d6a Signed-off-by: Carlos Santos --- package/gtest/gtest.mk | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk index 7129c93..1176030 100644 --- a/package/gtest/gtest.mk +++ b/package/gtest/gtest.mk @@ -11,25 +11,20 @@ GTEST_INSTALL_STAGING = YES GTEST_INSTALL_TARGET = NO GTEST_LICENSE = BSD-3c GTEST_LICENSE_FILES = LICENSE - -# While it is possible to build gtest as shared library, using this gtest shared -# library requires to set some special configure option in the project using -# gtest. -# So, force to build gtest as a static library. -# -# For further details, refer to the explaination given in the README file from -# the gtest sources. -GTEST_CONF_OPTS = -DBUILD_SHARED_LIBS=OFF +GTEST_CONF_OPTS = --enable-static --disable-shared define GTEST_EXTRACT_CMDS $(UNZIP) $(DL_DIR)/$(GTEST_SOURCE) -d $(BUILD_DIR) endef define GTEST_INSTALL_STAGING_CMDS - $(INSTALL) -D -m 0755 $(@D)/libgtest.a $(STAGING_DIR)/usr/lib/libgtest.a - $(INSTALL) -D -m 0755 $(@D)/libgtest_main.a $(STAGING_DIR)/usr/lib/libgtest_main.a + $(INSTALL) -D -m 0644 $(@D)/lib/.libs/libgtest.a $(STAGING_DIR)/usr/lib/libgtest.a + $(INSTALL) -D -m 0644 $(@D)/lib/.libs/libgtest_main.a $(STAGING_DIR)/usr/lib/libgtest_main.a + $(INSTALL) -D -m 0644 $(@D)/scripts/gtest-config $(STAGING_DIR)/usr/lib/scripts/gtest-config $(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/include/gtest/ - cp -rp $(@D)/include/gtest/* $(STAGING_DIR)/usr/include/gtest/ + $(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/include/gtest/internal/ + $(INSTALL) -D -m 0644 $(@D)/include/gtest/*.h* $(STAGING_DIR)/usr/include/gtest/ + $(INSTALL) -D -m 0644 $(@D)/include/gtest/internal/*.h* $(STAGING_DIR)/usr/include/gtest/internal/ endef -$(eval $(cmake-package)) +$(eval $(autotools-package))