fixes tcc package build issues on newer ubuntu

This commit is contained in:
Eyck Jentzsch 2024-04-25 14:36:28 +02:00
parent 74aeb7e2ba
commit 9964d7e9f8
2 changed files with 9 additions and 15 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
*.pyc *.pyc
*/test_package/build/ */test_package/build/
/.venv

View File

@ -4,8 +4,8 @@ import shutil
class TccConan(ConanFile): class TccConan(ConanFile):
name = "tcc" name = "tcc"
revision = "62c30a4a" revision = "1645616843"
version = "0.9.27+%s" % revision if revision else "0.9.27" version = "0.9.27"
license = "GNU Lesser General Public License" license = "GNU Lesser General Public License"
author = "Eyck Jentzsch <eyck@minres.com>" author = "Eyck Jentzsch <eyck@minres.com>"
url = "https://github.com/Minres/conan-recipes/tree/master/TCC" url = "https://github.com/Minres/conan-recipes/tree/master/TCC"
@ -13,25 +13,18 @@ class TccConan(ConanFile):
topics = ("compiler", "c") topics = ("compiler", "c")
settings = "os", "compiler", "build_type", "arch" settings = "os", "compiler", "build_type", "arch"
default_options = {} default_options = {}
source_tar = "http://download.savannah.gnu.org/releases/tinycc/tcc-%s.tar.bz2" % version
git_repo = "git://repo.or.cz/tinycc.git" git_repo = "git://repo.or.cz/tinycc.git"
#generators = "cmake" #generators = "cmake"
sub_folder = "tcc-%s" % version sub_folder = "tcc-%s" % version
exports_sources = "tcc-%s/*" % version exports_sources = "tcc-%s/*" % version
def source(self): def source(self):
if self.revision: self.output.info("Cloning from %s" % self.git_repo)
self.output.info("Cloning from %s" % self.git_repo) git = tools.Git(folder=self.sub_folder)
git = tools.Git(folder=self.sub_folder) if os.path.exists(self.sub_folder):
if os.path.exists(self.sub_folder): shutil.rmtree(self.sub_folder)
shutil.rmtree(self.sub_folder) git.clone(self.git_repo)
git.clone(self.git_repo) git.checkout(self.revision)
git.checkout(self.revision)
else:
self.output.info("Downloading %s" % self.source_tar)
tools.download(self.source_tar, "tcc.tar.bz2")
tools.unzip("tcc.tar.bz2")
os.remove("tcc.tar.bz2")
def configure(self): def configure(self):
del self.settings.compiler.libcxx del self.settings.compiler.libcxx