From a2e4ac20b2157a4a7a20aba70ee355a0eae9d621 Mon Sep 17 00:00:00 2001 From: Chris Mc Date: Thu, 21 Jan 2021 17:35:52 -0500 Subject: [PATCH 1/6] Update conandata.yml --- recipes/gperf/all/conandata.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes/gperf/all/conandata.yml b/recipes/gperf/all/conandata.yml index 67db34810f28b..689dd66d4c91f 100644 --- a/recipes/gperf/all/conandata.yml +++ b/recipes/gperf/all/conandata.yml @@ -2,3 +2,6 @@ sources: "3.1": url: "https://ftp.gnu.org/pub/gnu/gperf/gperf-3.1.tar.gz" sha256: "588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2" + "cci.20201208": + url: "https://git.savannah.gnu.org/gitweb/?p=gperf.git;a=snapshot;h=556e87b5c52b0c03a1e7418f45225a9b664f83c5;sf=tgz" + sha256: "588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2" From 7db75d2516af72b084db142b6375d505eadd57df Mon Sep 17 00:00:00 2001 From: Chris Mc Date: Thu, 21 Jan 2021 17:36:52 -0500 Subject: [PATCH 2/6] Update config.yml --- recipes/gperf/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/gperf/config.yml b/recipes/gperf/config.yml index 10cce9d257525..349909a25a0dc 100644 --- a/recipes/gperf/config.yml +++ b/recipes/gperf/config.yml @@ -1,3 +1,5 @@ versions: "3.1": folder: "all" + "cci.20201208": + folder: "all" From 6a0f14b43278297f1d2ad773dcede4b6b472d9fd Mon Sep 17 00:00:00 2001 From: Chris Mc Date: Sat, 23 Jan 2021 09:53:06 -0500 Subject: [PATCH 3/6] Update conanfile.py --- recipes/gperf/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/gperf/all/conanfile.py b/recipes/gperf/all/conanfile.py index ab4caf1782858..e3c6acc0185f0 100644 --- a/recipes/gperf/all/conanfile.py +++ b/recipes/gperf/all/conanfile.py @@ -26,8 +26,8 @@ def build_requirements(self): self.build_requires("msys2/20190524") def source(self): - tools.get(**self.conan_data["sources"][self.version]) extracted_dir = self.name + "-" + self.version + tools.get(**self.conan_data["sources"][self.version], filename=extracted_dir) os.rename(extracted_dir, self._source_subfolder) def _configure_autotools(self): From 887dbe9c3f9b8a2569a0865e35d83e5885c671e6 Mon Sep 17 00:00:00 2001 From: Chris Mc Date: Sat, 23 Jan 2021 10:04:18 -0500 Subject: [PATCH 4/6] Update conanfile.py --- recipes/gperf/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/gperf/all/conanfile.py b/recipes/gperf/all/conanfile.py index e3c6acc0185f0..6e26a0a82f860 100644 --- a/recipes/gperf/all/conanfile.py +++ b/recipes/gperf/all/conanfile.py @@ -27,7 +27,7 @@ def build_requirements(self): def source(self): extracted_dir = self.name + "-" + self.version - tools.get(**self.conan_data["sources"][self.version], filename=extracted_dir) + tools.get(**self.conan_data["sources"][self.version], filename=extracted_dir + ".tar.gz") os.rename(extracted_dir, self._source_subfolder) def _configure_autotools(self): From 11a81283408c0fef628dd4737a8a20c5544463a1 Mon Sep 17 00:00:00 2001 From: Chris Mc Date: Sat, 23 Jan 2021 10:30:47 -0500 Subject: [PATCH 5/6] Derp fail.... :exploding_head: --- recipes/gperf/all/conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/gperf/all/conandata.yml b/recipes/gperf/all/conandata.yml index 689dd66d4c91f..693d0d71bc110 100644 --- a/recipes/gperf/all/conandata.yml +++ b/recipes/gperf/all/conandata.yml @@ -4,4 +4,4 @@ sources: sha256: "588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2" "cci.20201208": url: "https://git.savannah.gnu.org/gitweb/?p=gperf.git;a=snapshot;h=556e87b5c52b0c03a1e7418f45225a9b664f83c5;sf=tgz" - sha256: "588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2" + sha256: "18a72af667940f1295249bf8bb8d2752d451b059b010b4027a9db66791bc638c" From e21e773d6dd79f7418665f4d7cffa699d91a421d Mon Sep 17 00:00:00 2001 From: Chris Mc Date: Sat, 23 Jan 2021 11:56:32 -0500 Subject: [PATCH 6/6] Update conanfile.py --- recipes/gperf/all/conanfile.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/gperf/all/conanfile.py b/recipes/gperf/all/conanfile.py index 6e26a0a82f860..ade240cc29572 100644 --- a/recipes/gperf/all/conanfile.py +++ b/recipes/gperf/all/conanfile.py @@ -1,4 +1,5 @@ from conans import ConanFile, tools, AutoToolsBuildEnvironment +import glob import os class GperfConan(ConanFile): @@ -26,9 +27,8 @@ def build_requirements(self): self.build_requires("msys2/20190524") def source(self): - extracted_dir = self.name + "-" + self.version - tools.get(**self.conan_data["sources"][self.version], filename=extracted_dir + ".tar.gz") - os.rename(extracted_dir, self._source_subfolder) + tools.get(**self.conan_data["sources"][self.version], filename=self.name + "-" + self.version + ".tar.gz") + os.rename(glob.glob("gperf-*")[0], self._source_subfolder) def _configure_autotools(self): if not self._autotools: