diff options
author | 2011-08-07 22:46:56 +0200 | |
---|---|---|
committer | 2011-08-07 22:46:56 +0200 | |
commit | 07041c6d17f33b9f006ff4d820c5390e4664c185 (patch) | |
tree | 35e96f9a1e2d17e790285f3de1ca98c7c9a494c0 | |
parent | Added automatic detection of the default incpaths! (diff) | |
download | ebuildgen-07041c6d17f33b9f006ff4d820c5390e4664c185.tar.gz ebuildgen-07041c6d17f33b9f006ff4d820c5390e4664c185.tar.bz2 ebuildgen-07041c6d17f33b9f006ff4d820c5390e4664c185.zip |
Fixed some more small stuff
-rwxr-xr-x | cli.py | 10 | ||||
-rw-r--r-- | ebuildgen.py | 4 | ||||
-rw-r--r-- | linkdeps.py | 2 |
3 files changed, 13 insertions, 3 deletions
@@ -59,6 +59,9 @@ gpackages = set() for dep in inclst[0]: gpackages.add(linkdeps.deptopackage(dep,[])[0]) #print(gpackages) +if "__cplusplus" in inclst[2]: + for dep in inclst[2]["__cplusplus"][0]: + gpackages.add(linkdeps.deptopackage(dep,[])[0]) usedeps = {} for use in useargs: @@ -67,10 +70,15 @@ for use in useargs: newpack = linkdeps.deptopackage(dep,[])[0] if not newpack in gpackages: packages.add(newpack) + if "__cplusplus" in useargs[use][2]: + for dep in useargs[use][2]["__cplusplus"][0]: + newpack = linkdeps.deptopackage(dep,[])[0] + if not newpack in gpackages: + packages.add(newpack) usedeps[use] = packages #print(usedeps) -#print(iuse) +#print(iuse) ebuildgen.genebuild(iuse,gpackages,usedeps,dltype,args.dir,targets,binaries) if args.ginc == args.linc == args.ifdef == args.quiet == False: diff --git a/ebuildgen.py b/ebuildgen.py index fee6233..d25fa7c 100644 --- a/ebuildgen.py +++ b/ebuildgen.py @@ -123,7 +123,9 @@ def outputebuild(iuse,deps,usedeps,dltype,adress,installmethod): ] for use in iuse: text += ['\t\t$(use_' + use.split("_")[0] + ' ' + use.split("_")[1] + ') \\'] - text += ['}'] + + #add \n here because the ebuild will fail if there is no extra newline between '\' and '}' + text += ['\n}'] text += [ '', diff --git a/linkdeps.py b/linkdeps.py index d498a88..f9902c8 100644 --- a/linkdeps.py +++ b/linkdeps.py @@ -38,7 +38,7 @@ def qfiletopackage(dep,addpaths): n += 2 if len(package) > 1: - print("more than one matching package where found!") + print("more than one matching package were found!") if not package: package = pfltopackage(dep,incpaths) |