From fd7adb2f3a9d9d239c90742366aec369966a3a03 Mon Sep 17 00:00:00 2001 From: davidovski Date: Sat, 7 May 2022 13:50:11 +0100 Subject: added libunwind and libcxx, to finish --- auto/create.sh | 8 ++-- repo/devel/llvm-libunwind/libcxx-musl.patch | 28 ------------- .../llvm-libunwind/libunwind-link-libssp.patch | 20 --------- repo/devel/llvm-libunwind/llvm-libunwind.xibuild | 48 ---------------------- 4 files changed, 5 insertions(+), 99 deletions(-) delete mode 100644 repo/devel/llvm-libunwind/libcxx-musl.patch delete mode 100644 repo/devel/llvm-libunwind/libunwind-link-libssp.patch delete mode 100644 repo/devel/llvm-libunwind/llvm-libunwind.xibuild diff --git a/auto/create.sh b/auto/create.sh index eb73caa..35306fc 100755 --- a/auto/create.sh +++ b/auto/create.sh @@ -20,9 +20,11 @@ echo Type: $type read -p "Ok? " go template=./templates/$type.xibuild -buildfile=repo/$repo/$name.xibuild +package=repo/$repo/$name +buildfile=$package/$name.xibuild [ -f $buildfile ] && read -p "Buildfile already exists, overwrite? " go +mkdir -p $package url=$(echo $url | sed "s/$version/\$PKG_VER/g" | sed "s/pkgver/PKG_VER/g") makedeps="" @@ -58,10 +60,10 @@ EOF [ "${#additional}" = 0 ] || { filenames="" - mkdir extra/$name + mkdir $name for l in $additional; do filename=$(basename $l) - curl -SsL $l > extra/$name/$filename + curl -SsL $l > $package/$filename filenames="$filename $filenames" sleep 2 done diff --git a/repo/devel/llvm-libunwind/libcxx-musl.patch b/repo/devel/llvm-libunwind/libcxx-musl.patch deleted file mode 100644 index 358d4a3..0000000 --- a/repo/devel/llvm-libunwind/libcxx-musl.patch +++ /dev/null @@ -1,28 +0,0 @@ -Patch-Source: https://github.com/void-linux/void-packages/blob/74f16232621ca8dfb6d244beff1df35a6df1647f/srcpkgs/llvm12/patches/libcxx-musl.patch - ---- a/libcxx/include/locale -+++ b/libcxx/include/locale -@@ -742,7 +742,11 @@ __num_get_signed_integral(const char* __a, const char* __a_end, - typename remove_reference::type __save_errno = errno; - errno = 0; - char *__p2; -+#if defined(__linux__) && !defined(__GLIBC__) -+ long long __ll = strtoll(__a, &__p2, __base); -+#else - long long __ll = strtoll_l(__a, &__p2, __base, _LIBCPP_GET_C_LOCALE); -+#endif - typename remove_reference::type __current_errno = errno; - if (__current_errno == 0) - errno = __save_errno; -@@ -782,7 +786,11 @@ __num_get_unsigned_integral(const char* __a, const char* __a_end, - typename remove_reference::type __save_errno = errno; - errno = 0; - char *__p2; -+#if defined(__linux__) && !defined(__GLIBC__) -+ unsigned long long __ll = strtoull(__a, &__p2, __base); -+#else - unsigned long long __ll = strtoull_l(__a, &__p2, __base, _LIBCPP_GET_C_LOCALE); -+#endif - typename remove_reference::type __current_errno = errno; - if (__current_errno == 0) - errno = __save_errno; diff --git a/repo/devel/llvm-libunwind/libunwind-link-libssp.patch b/repo/devel/llvm-libunwind/libunwind-link-libssp.patch deleted file mode 100644 index ae819fe..0000000 --- a/repo/devel/llvm-libunwind/libunwind-link-libssp.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/libunwind/src/CMakeLists.txt -+++ b/libunwind/src/CMakeLists.txt -@@ -129,7 +129,7 @@ - else() - target_compile_options(unwind_shared PRIVATE -fno-rtti) - endif() -- target_link_libraries(unwind_shared PRIVATE ${LIBUNWIND_LIBRARIES}) -+ target_link_libraries(unwind_shared PRIVATE ${LIBUNWIND_LIBRARIES} -lssp_nonshared) - set_target_properties(unwind_shared - PROPERTIES - CXX_EXTENSIONS OFF -@@ -157,7 +157,7 @@ - else() - target_compile_options(unwind_static PRIVATE -fno-rtti) - endif() -- target_link_libraries(unwind_static PRIVATE ${LIBUNWIND_LIBRARIES}) -+ target_link_libraries(unwind_static PRIVATE ${LIBUNWIND_LIBRARIES} -lssp_nonshared) - set_target_properties(unwind_static - PROPERTIES - CXX_EXTENSIONS OFF diff --git a/repo/devel/llvm-libunwind/llvm-libunwind.xibuild b/repo/devel/llvm-libunwind/llvm-libunwind.xibuild deleted file mode 100644 index 9c61c31..0000000 --- a/repo/devel/llvm-libunwind/llvm-libunwind.xibuild +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh - -NAME="llvm-libunwind" -DESC="LLVM version of libunwind library" - -MAKEDEPS="cmake " -DEPS="musl " - -PKG_VER=13.0.0 -SOURCE="https://github.com/llvm/llvm-project/releases/download/llvmorg-$PKG_VER/libunwind-$PKG_VER.src.tar.xz" - -ADDITIONAL=" - https://github.com/llvm/llvm-project/releases/download/llvmorg-$PKG_VER/llvm-$PKG_VER.src.tar.xz - https://github.com/llvm/llvm-project/releases/download/llvmorg-$PKG_VER/libcxx-$PKG_VER.src.tar.xz - libunwind-link-libssp.patch - libcxx-musl.patch -" - -prepare () { - tar xvf libunwind-$PKG_VER.src.tar.xz - tar xvf llvm-$PKG_VER.src.tar.xz - tar xvf libcxx-$PKG_VER.src.tar.xz - mv libunwind-$PKG_VER.src libunwind - mv llvm-$PKG_VER.src llvm - mv libcxx-$PKG_VER.src libcxx - - apply_patches -} - -build () { - cmake -B build -G Ninja -S libunwind \ - -DCMAKE_BUILD_TYPE=MinSizeRel \ - -DCMAKE_C_FLAGS_MINSIZEREL_INIT="$CFLAGS" \ - -DCMAKE_CXX_FLAGS_MINSIZEREL_INIT="$CXXFLAGS" \ - -DCMAKE_EXE_LINKER_FLAGS_MINSIZEREL_INIT="$LDFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIBUNWIND_HAS_NODEFAULTLIBS_FLAG=OFF \ - -DLIBUNWIND_STANDALONE_BUILD=ON - cmake --build build -} - -package () { - DESTDIR="$PKG_DEST" cmake --install build - mkdir -p "$PKG_DEST"/usr/include/mach-o - cp libunwind/include/*.h "$PKG_DEST"/usr/include/ - cp libunwind/include/mach-o/*.h "$PKG_DEST"/usr/include/mach-o/ - -} -- cgit v1.2.1