Skip to contentSkip to conversation

gtest: retrieve package from github

PATCH New Fabrice Fontaine 3 participants 5 messages Aug 31, 2016 – Sep 7, 2016

lore
Share & tools
lore

Fabrice Fontaine

author
#0 lore raw

PATCH v2 1/1 gtest: retrieve package from github

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]>

---
Changes v1 -> v2:
- Fix patch number (6/6 to 1/1)

 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
Signature · 1 line
2.7.4
#1 lore raw

PATCH v2 1/1 gtest: retrieve package from github

Hello,

Quoted 9 lines · Fabrice Fontaine

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]>

---
Changes v1 -> v2:
- Fix patch number (6/6 to 1/1)

Applied to master, thanks. I've tried to do the same for the gmock package (the 1.7.0 release is available from
https://github.com/google/googlemock/releases. However, since it's fetched from Github, it doesn't have the configure script pre-generated, and GMOCK_AUTORECONF = YES doesn't work.

I guess moving to using the CMake based build system would make more sense, but that's a bigger task.

Patches welcome :)

Thomas

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

PATCH v2 1/1 gtest: retrieve package from github

Quoted 25 lines

From: "Thomas Petazzoni" <[email protected]>
To: "Fabrice Fontaine" <[email protected]>
Cc: "Fabrice Fontaine" <[email protected]>, buildroot at buildroot.org
Sent: Tuesday, September 6, 2016 6:18:57 PM
Subject: Re: [Buildroot] [PATCH v2,1/1] gtest: retrieve package from github

Hello,

Quoted 9 lines · Fabrice Fontaine

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]>

---
Changes v1 -> v2:
- Fix patch number (6/6 to 1/1)

Applied to master, thanks. I've tried to do the same for the gmock package (the 1.7.0 release is available from
https://github.com/google/googlemock/releases. However, since it's fetched from Github, it doesn't have the configure script pre-generated, and GMOCK_AUTORECONF = YES doesn't work.

Quoted 4 lines

I guess moving to using the CMake based build system would make more sense, but that's a bigger task.

Patches welcome :)

A patch was sent a long time ago, but was rejected[1]. I will update it and resubmit for review.

1. http://patchwork.ozlabs.org/patch/586130/

Carlos Santos (Casantos)
DATACOM, P&D

#3 lore raw

PATCH v2 1/1 gtest: retrieve package from github

Hello,

Quoted 8 lines · Carlos Santos
Quoted 4 lines

I guess moving to using the CMake based build system would make more sense, but that's a bigger task.

Patches welcome :)

A patch was sent a long time ago, but was rejected[1]. I will update it and resubmit for review.

1. http://patchwork.ozlabs.org/patch/586130/

Well, the patch says:

"""
2) There is no tag corresponding to gmock 1.7.0. We circumvent this by refering to the commit id corresponding to gmock 1.7.0.
"""

But this is not really true, in the
https://github.com/google/googlemock/ repository, you do have the older 1.7.0.

Also, your patch was using the autotools build process for gmock, which caused problems with ax_pthread.m4. Isn't switching to the CMake build process a better idea here, since gtest is anyway already using CMake ?

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
author
#4 lore raw

PATCH v2 1/1 gtest: retrieve package from github

Dear all,

I sent a new patch, your comments are welcome.

Best Regards,

Fabrice

2016-09-07 16:31 GMT+02:00 Thomas Petazzoni <
[email protected]>:

Quoted 29 lines

Hello,

Quoted 6 lines · Carlos Santos
Quoted 4 lines

I guess moving to using the CMake based build system would make more sense, but that's a bigger task.

Patches welcome :)

A patch was sent a long time ago, but was rejected[1]. I will update it

and resubmit for review.

Quoted 2 lines

1. http://patchwork.ozlabs.org/patch/586130/

Well, the patch says:

"""
2) There is no tag corresponding to gmock 1.7.0. We circumvent this by refering to the commit id corresponding to gmock 1.7.0.
"""

But this is not really true, in the
https://github.com/google/googlemock/ repository, you do have the older 1.7.0.

Also, your patch was using the autotools build process for gmock, which caused problems with ax_pthread.m4. Isn't switching to the CMake build process a better idea here, since gtest is anyway already using CMake ?

Quoted 8 lines

Thanks,

Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20160907/e69a9b85/attachment.html>