fixed python compilation for js78

3 files changed, 44 insertions, 25 deletions

diff --git a/repo/devel/clang.xibuild b/repo/devel/clang.xibuild
index fa4430f..c729c9a 100644
--- a/repo/devel/clang.xibuild
+++ b/repo/devel/clang.xibuild
@@ -14,6 +14,11 @@ ADDITIONAL="
 
 prepare () {
     apply_patches
+
+    # link in /usr/inlcude/llvm to include
+    ln -s /usr/include/llvm include/llvm
+    # (there should be a better way to do this, since tblgen does look in /include rather than /usr/include)
+
 }
 
 build () {
@@ -30,7 +35,7 @@ build () {
 		-DCMAKE_EXE_LINKER_FLAGS_RELEASE_INIT="$LDFLAGS -Wl,-z,stack-size=2097152" \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_VERBOSE_MAKEFILE=OFF \
-		-DCLANG_VENDOR=Alpine \
+		-DCLANG_VENDOR=XiLinux \
 		-DLLVM_EXTERNAL_LIT=/usr/bin/lit \
 		-DCLANG_BUILD_EXAMPLES=OFF \
 		-DCLANG_INCLUDE_DOCS=ON \
@@ -44,11 +49,10 @@ build () {
 		-DLLVM_ENABLE_EH=ON \
 		-DLLVM_ENABLE_RTTI=ON
 
-	ninja clang-tblgen
+	ninja clang-tblgen 
 	ninja
 }
 
 package () {
-    DESTDIR=$PKG_DEST ninja -C build install
-	install -m 644 build/lib/libclang.a $PKG_DEST/usr/lib
+    DESTDIR=$PKG_DEST ninja install
 }
diff --git a/repo/devel/llvm.xibuild b/repo/devel/llvm.xibuild
index aa18732..82496a4 100644
--- a/repo/devel/llvm.xibuild
+++ b/repo/devel/llvm.xibuild
@@ -16,18 +16,27 @@ build () {
     cd build
     CC=gcc CXX=g++                                  \
     cmake                                           \
-          -DCMAKE_INSTALL_PREFIX=/usr               \
-          -DLLVM_ENABLE_FFI=ON                      \
-          -DCMAKE_BUILD_TYPE=Release                \
-          -DLLVM_BUILD_LLVM_DYLIB=ON                \
-          -DLLVM_LINK_LLVM_DYLIB=ON                 \
-          -DLLVM_ENABLE_RTTI=ON                     \
-          -DLLVM_TARGETS_TO_BUILD="host;AMDGPU;BPF" \
-          -DLLVM_BUILD_TESTS=ON                     \
-          -DLLVM_INSTALL_UTILS=ON                   \
-          -DLLVM_ENABLE_SPHINX=ON                   \
-          -DLLVM_ENABLE_TERMINFO=ON                 \
-          -DLLVM_BINUTILS_INCDIR=/usr/include       \
+    		-DCMAKE_BUILD_TYPE=Release \
+            -DCMAKE_INSTALL_PREFIX=/usr \
+            -DLLVM_BINUTILS_INCDIR=/usr/include \
+            -DLLVM_BUILD_DOCS=OFF \
+            -DLLVM_BUILD_EXAMPLES=OFF \
+            -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON \
+            -DLLVM_BUILD_LLVM_DYLIB=ON \
+            -DLLVM_BUILD_TESTS=ON \
+            -DLLVM_DEFAULT_TARGET_TRIPLE="x86_64-linux-musl" \
+            -DLLVM_ENABLE_ASSERTIONS=OFF \
+            -DLLVM_ENABLE_FFI=ON \
+            -DLLVM_ENABLE_LIBCXX=OFF \
+            -DLLVM_ENABLE_PIC=ON \
+            -DLLVM_ENABLE_RTTI=ON \
+            -DLLVM_ENABLE_SPHINX=OFF \
+            -DLLVM_ENABLE_TERMINFO=ON \
+            -DLLVM_ENABLE_ZLIB=ON \
+            -DLLVM_HOST_TRIPLE="x86_64-linux-musl" \
+            -DLLVM_INCLUDE_EXAMPLES=OFF \
+            -DLLVM_LINK_LLVM_DYLIB=ON \
+            -DLLVM_APPEND_VC_REV=OFF \
           -Wno-dev -G Ninja ..                      &&
     ninja llvm-tblgen &&
     ninja &&
@@ -42,4 +51,10 @@ package () {
     cd build
 	python3 ../utils/lit/setup.py install --prefix=/usr --root=$PKG_DEST
 
+    mkdir $PKG_DEST/usr/bin
+    for path in bin/*; do
+        name=${path##*/}
+        ln -s ../lib/llvm/bin/$name $PKG_DEST/usr/bin/$name
+    done
+
 }
diff --git a/repo/devel/rustc.xibuild b/repo/devel/rustc.xibuild
index 1e4df28..9667aa3 100644
--- a/repo/devel/rustc.xibuild
+++ b/repo/devel/rustc.xibuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-MAKEDEPS="cmake llvm"
+MAKEDEPS="cmake llvm clang"
 DEPS="curl gcc libssh2 openssl"
 
 PKG_VER=1.58.1
@@ -54,16 +54,16 @@ build () {
 		--set="target.$target.llvm-config=/usr/bin/llvm-config" \
 		--set="target.$target.musl-root=/usr" \
 		--set="target.$target.crt-static=false" \
-		--set="target.$target.cc=gcc" \
-		--set="target.$target.cxx=c++" \
-		--set="target.$target.ar=ar" \
-		--set="target.$target.linker=gcc" \
+		--set="target.$target.cc=clang" \
+		--set="target.$target.cxx=clang++" \
+		--set="target.$target.ar=llvm-ar" \
+		--set="target.$target.linker=clang" \
 		--set="target.$build.musl-root=/usr" \
 		--set="target.$build.crt-static=false" \
-		--set="target.$build.cc=gcc" \
-		--set="target.$build.cxx=c++" \
-		--set="target.$build.ar=ar" \
-		--set="target.$build.linker=gcc"
+		--set="target.$build.cc=clang" \
+		--set="target.$build.cxx=clang++" \
+		--set="target.$build.ar=llvm-ar" \
+		--set="target.$build.linker=clang"
 
         python ./x.py dist --jobs $JOBS