fixes to allow for full build

6 files changed, 35 insertions, 46 deletions

diff --git a/repo/devel/cmake/cmake-toolchain.xibuild b/repo/devel/cmake/cmake-toolchain.xibuild
deleted file mode 100644
index 44e8535..0000000
--- a/repo/devel/cmake/cmake-toolchain.xibuild
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-MAKEDEPS="make"
-DEPS="musl"
-
-DESC="$DESC - xilinux toolchain version"
-
-prepare () {
-    export  CMARGS="
-    -DCMAKE_USE_OPENSSL=OFF 
-    -DBUILD_CursesDialog=ON
-    "
-}
-
-
-build () {
-    ./bootstrap --prefix=/usr \
-        --no-system-jsoncpp \
-        --no-system-librhash \
-        --no-system-curl \
-        --no-system-libarchive \
-        --no-system-nghttp2 \
-        --no-system-expat \
-        --no-system-zlib \
-        --no-system-zstd \
-        --no-system-libuv \
-        -- ${CMARGS}
-    make
-}
-
-package () {
-    echo $PKG_DEST
-    make DESTDIR=$PKG_DEST install 
-}
diff --git a/repo/devel/doxygen/doxygen.xibuild b/repo/devel/doxygen/doxygen.xibuild
new file mode 100644
index 0000000..3c852c9
--- /dev/null
+++ b/repo/devel/doxygen/doxygen.xibuild
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+NAME="doxygen"
+DESC="A documentation system for C++, C, Java, IDL and PHP"
+
+MAKEDEPS="cmake "
+DEPS="musl "
+
+PKG_VER=1.9.4
+SOURCE="https://doxygen.nl/files/doxygen-$PKG_VER.src.tar.gz"
+
+build () {
+    cmake -B build \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=/usr/lib \
+		-DBUILD_SHARED_LIBS=True \
+        -DBUILD_STATIC_LIBS=OFF
+	cmake --build build
+}
+
+package () {
+	DESTDIR="$PKG_DEST" cmake --install build
+}
diff --git a/repo/devel/help2man/help2man.xibuild b/repo/devel/help2man/help2man.xibuild
index 6d91935..1386c01 100644
--- a/repo/devel/help2man/help2man.xibuild
+++ b/repo/devel/help2man/help2man.xibuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-MAKEDEPS="make "
+MAKEDEPS="make perl"
 DEPS="sh"
 
 PKG_VER=1.48.5
diff --git a/repo/devel/llvm/llvm.xibuild b/repo/devel/llvm/llvm.xibuild
index e2a4943..9d42a9c 100644
--- a/repo/devel/llvm/llvm.xibuild
+++ b/repo/devel/llvm/llvm.xibuild
@@ -1,9 +1,9 @@
 #!/bin/sh
 
-MAKEDEPS="make ninja cmake libedit libffi libxml2 ncurses python-setuptools python-sphinx"
+MAKEDEPS="make ninja cmake libedit libffi libxml2 ncurses python-sphinx binutils lua python-six"
 DEPS="perl zlib libffi libedit ncurses"
 
-PKG_VER=13.0.0
+PKG_VER=13.0.1
 SOURCE="https://github.com/llvm/llvm-project/releases/download/llvmorg-$PKG_VER/llvm-project-$PKG_VER.src.tar.xz"
 DESC="Low Level Virtual Machine"
 
@@ -13,19 +13,20 @@ clang-002-add-musl-triples.patch
 libcxx-musl.patch
 libcxx-ssp-nonshared.patch
 libcxxabi-dl.patch
-lldb-musl.patch
 llvm-001-musl.patch
 llvm-004-override-opt.patch"
 
 prepare () {
+    enabled_projects="clang;clang-tools-extra;libcxx;libcxxabi;libunwind;openmp;lld"
+
     apply_patches
     cd llvm
-    sed -i 's|__ptrace_request|int|g' \
-				../lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp
+    #sed -i 's|__ptrace_request|int|g' \
+				#../lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp
 
     # disable  lldb docs, since they fail to generate
-    sed -i '/add_subdirectory(docs)/d' \
-			../lldb/CMakeLists.txt
+    #sed -i '/add_subdirectory(docs)/d' \
+			#../lldb/CMakeLists.txt
 
 
     sed -i 's,check_library_exists(gcc_s .*,set(LIBCXXABI_HAS_GCC_S_LIB ON),' \
@@ -47,7 +48,6 @@ build () {
     cmake \
             -DCMAKE_BUILD_TYPE=Release \
             -DENABLE_LINKER_BUILD_ID=YES \
-            -DLLVM_USE_LINKER=lld \
             -DLLDB_USE_SYSTEM_SIX=YES \
             -DLIBCXX_CXX_ABI=libcxxabi \
             -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=YES \
@@ -76,7 +76,7 @@ build () {
             -DLLVM_HOST_TRIPLE="x86_64-linux-musl" \
             -DLLVM_INCLUDE_EXAMPLES=OFF \
             -DLLVM_APPEND_VC_REV=OFF \
-            -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;libcxx;libcxxabi;libunwind;lldb;lld;openmp" \
+            -DLLVM_ENABLE_PROJECTS="$enabled_projects" \
             -Wno-dev -G Ninja ..                      &&
 
     ninja llvm-tblgen &&
diff --git a/repo/devel/rustc/rustc.xibuild b/repo/devel/rustc/rustc.xibuild
index 758dafe..090aa01 100644
--- a/repo/devel/rustc/rustc.xibuild
+++ b/repo/devel/rustc/rustc.xibuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-MAKEDEPS="cmake llvm clang llvm-ar"
+MAKEDEPS="cmake clang llvm-ar"
 DEPS="curl libssh2 openssl"
 
 PKG_VER=1.58.1
diff --git a/repo/devel/sgml-common/sgml-common.xibuild b/repo/devel/sgml-common/sgml-common.xibuild
index 70fe070..0e0ac23 100644
--- a/repo/devel/sgml-common/sgml-common.xibuild
+++ b/repo/devel/sgml-common/sgml-common.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="unzip patch"
-DEPS="libxml2 sgml-common"
+DEPS="libxml2"
 
 PKG_VER=0.6.3
 SOURCE=https://sourceware.org/ftp/docbook-tools/new-trials/SOURCES/sgml-common-$PKG_VER.tgz