diff --git a/distribution.xml b/distribution.xml index 116d2f1b95..119955eb6d 100644 --- a/distribution.xml +++ b/distribution.xml @@ -8,6 +8,11 @@ Core PisiLinux + module-nvidia465 + xorg-video-nvidia465 + xorg-video-nvidia465-32bit + nvidia465-dkms + nvidia465 jre7-openjdk-headless jre7-openjdk jdk7-openjdk diff --git a/programming/build/llvm/actions.py b/programming/build/llvm/actions.py index d11b977fe4..9216fc5aed 100644 --- a/programming/build/llvm/actions.py +++ b/programming/build/llvm/actions.py @@ -23,27 +23,27 @@ NoStrip = ["/usr/lib/clang/%s/lib/linux" % get.srcVERSION()] WorkDir = "llvm-project-%s.src/llvm" % get.srcVERSION() def setup(): - pisitools.ldflags.add("-fuse-ld=lld") - pisitools.cflags.remove("-D_FORTIFY_SOURCE=2") - pisitools.cxxflags.remove("-D_FORTIFY_SOURCE=2") - shelltools.export("CC", "clang") - shelltools.export("CXX", "clang++") + #pisitools.ldflags.add("-fuse-ld=lld") + #pisitools.cflags.remove("-D_FORTIFY_SOURCE=2") + #pisitools.cxxflags.remove("-D_FORTIFY_SOURCE=2") + #shelltools.export("CC", "clang") + #shelltools.export("CXX", "clang++") #if get.buildTYPE() == "emul32": - #shelltools.export("CC", "gcc -m32") - #shelltools.export("CXX", "g++ -m32") + shelltools.export("CC", "gcc -m32") + shelltools.export("CXX", "g++ -m32") #shelltools.export("CC", "clang -m32") #shelltools.export("CXX", "clang++ -m32") - #shelltools.export("PKG_CONFIG_PATH","/usr/lib32/pkgconfig") + shelltools.export("PKG_CONFIG_PATH","/usr/lib32/pkgconfig") #clang patch #shelltools.cd("tools") #shelltools.system("patch -p1 < enable-SSP-and-PIE-by-default.patch") #shelltools.cd("..") #else: - #shelltools.export("CC", "gcc") - #shelltools.export("CXX", "g++") + shelltools.export("CC", "gcc") + shelltools.export("CXX", "g++") #shelltools.export("CC", "clang") #shelltools.export("CXX", "clang++") diff --git a/programming/build/llvm/pspec.xml b/programming/build/llvm/pspec.xml index bfaff149ad..e519c718b0 100755 --- a/programming/build/llvm/pspec.xml +++ b/programming/build/llvm/pspec.xml @@ -25,12 +25,12 @@ cmake python3-devel - - llvm + binutils + gcc +