Skip to contentSkip to conversation

gtest: retrieve package from github

Buildroot New Thomas Petazzoni 2 participants 3 messages Sep 6, 2016 – Sep 11, 2016

lore
Share & tools
lore

Thomas Petazzoni

author
#0 lore raw

commit: https://git.buildroot.net/buildroot/commit/?id=0cd962b3bcb842985369cb276e6cba0f8b15289c
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

https://googletest.googlecode.com/files is no more available, so update gtest.mk and gtest.hash to retrieve googletest source code as a tar.gz (and not a zip) from github as https://googletest.googlecode.com is now a redirection to https://github.com/google/googletest.

Signed-off-by Fabrice Fontaine <[email protected]>
Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/gtest/gtest.hash | 4 ++--
 package/gtest/gtest.mk   | 9 ++-------
 2 files changed, 4 insertions(+), 9 deletions(-)
package/gtest/gtest.hash +2 -2
index 8ff79cb..79e31e4 100644
@@ -1,2 +1,2 @@
-# From http://code.google.com/p/googletest/downloads/detail?name=gtest-1.7.0.zip&can=2&q=
-sha1	f85f6d2481e2c6c4a18539e391aa4ea8ab0394af	gtest-1.7.0.zip
+# Locally computed:
+sha256	f73a6546fdf9fce9ff93a5015e0333a8af3062a152a9ad6bcb772c96687016cc	gtest-release-1.7.0.tar.gz
package/gtest/gtest.mk +2 -7
index 11aa7e9..eb30905 100644
@@ -5,9 +5,8 @@
 ################################################################################
 
 # Make sure this remains the same version as the gmock one
-GTEST_VERSION = 1.7.0
-GTEST_SOURCE = gtest-$(GTEST_VERSION).zip
-GTEST_SITE = http://googletest.googlecode.com/files
+GTEST_VERSION = release-1.7.0
+GTEST_SITE = $(call github,google,googletest,$(GTEST_VERSION))
 GTEST_INSTALL_STAGING = YES
 GTEST_INSTALL_TARGET = NO
 GTEST_LICENSE = BSD-3c

@@ -22,10 +21,6 @@ GTEST_LICENSE_FILES = LICENSE
 # the gtest sources.
 GTEST_CONF_OPTS = -DBUILD_SHARED_LIBS=OFF
 
-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
#1 lore raw

PATCH 1/1 gtest: fix URL in package description

http://code.google.com/p/googletest redirects to
https://github.com/google/googletest, now.

Signed-off-by Carlos Santos <[email protected]>
---
 package/gtest/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/gtest/Config.in +1 -1
index c07f13b..355b736 100644
@@ -19,7 +19,7 @@ config BR2_PACKAGE_GTEST
 	  This package allows running testsuites on the target which
 	  might be advantageous in certain cases.
 
-	  http://code.google.com/p/googletest/
+	  https://github.com/google/googletest
 
 comment "gtest needs a toolchain w/ C++, wchar, threads"
 	depends on BR2_USE_MMU
Signature · 1 line
2.7.4
author Applied
#2 lore raw

PATCH 1/1 gtest: fix URL in package description

Hello,

Quoted 7 lines · Carlos Santos

http://code.google.com/p/googletest redirects to
https://github.com/google/googletest, now.

Signed-off-by Carlos Santos <[email protected]>
---
 package/gtest/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com