diff options
| author | Adam Harrison <adamdharrison@gmail.com> | 2023-01-03 22:33:23 -0500 |
|---|---|---|
| committer | Adam Harrison <adamdharrison@gmail.com> | 2023-01-03 22:33:23 -0500 |
| commit | 9e5c214fff327a58d835f8158b66b2d63d236584 (patch) | |
| tree | fefb9902a1d6374bf15ca6cdfa7a62969a161506 | |
| parent | 25d841878c55e0854be5d75596626110440629ab (diff) | |
| download | lite-xl-plugin-manager-9e5c214fff327a58d835f8158b66b2d63d236584.tar.gz lite-xl-plugin-manager-9e5c214fff327a58d835f8158b66b2d63d236584.zip | |
Build with musl?v0.98
| -rw-r--r-- | .github/workflows/build.yml | 3 | ||||
| -rwxr-xr-x | build.sh | 2 | ||||
| -rw-r--r-- | src/lpm.lua | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0944d83..2d0effb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,8 @@ jobs: run: git submodule update --init --depth=1 - name: Build Linux run: | - ./build.sh -DLPM_STATIC -DLPM_VERSION='"'$FULL_VERSION-x86_64-linux'"' && tar -czvf lpm-$FULL_VERSION-x86_64-linux.tar.gz lpm + sudo apt-get install musl-tools musl musl-dev + CC=musl-gcc ./build.sh -DLPM_STATIC -DLPM_VERSION='"'$FULL_VERSION-x86_64-linux'"' && tar -czvf lpm-$FULL_VERSION-x86_64-linux.tar.gz lpm cp lpm lpm.x86_64-linux cp lpm /tmp/lpm - name: Package Debian/Ubuntu @@ -18,7 +18,7 @@ CMAKE_DEFAULT_FLAGS=" $CMAKE_DEFAULT_FLAGS -DCMAKE_BUILD_TYPE=Release -DCMAKE_PR mkdir -p lib/prefix/include lib/prefix/lib if [[ "$@" != *"-lz"* ]]; then [ ! -e "lib/zlib" ] && echo "Make sure you've cloned submodules. (git submodule update --init --depth=1)" && exit -1 - [[ ! -e "lib/zlib/build" && $OSTYPE != 'msys'* ]] && cd lib/zlib && mkdir build && cd build && $CC -D_LARGEFILE64_SOURCE -I.. ../*.c -c && ar rc libz.a *.o && cp libz.a ../../prefix/lib && cp ../*.h ../../prefix/include && cd ../../../ + [[ ! -e "lib/zlib/build" && $OSTYPE != 'msys'* ]] && cd lib/zlib && mkdir build && cd build && $CC -O3 -D_LARGEFILE64_SOURCE -I.. ../*.c -c && ar rc libz.a *.o && cp libz.a ../../prefix/lib && cp ../*.h ../../prefix/include && cd ../../../ LDFLAGS="$LDFLAGS -lz" fi if [[ "$@" != *"-lmbedtls"* && "$@" != *"-lmbedcrypto"* ]]; then diff --git a/src/lpm.lua b/src/lpm.lua index 35b5fc8..e4c47e0 100644 --- a/src/lpm.lua +++ b/src/lpm.lua @@ -986,7 +986,7 @@ end function LiteXL:is_system() return system_bottle and system_bottle.lite_xl == self end function LiteXL:is_local() return not self.repository and self.path end function LiteXL:is_compatible(plugin) return not plugin.mod_version or compare_version(self.mod_version, plugin.mod_version) == 0 end -function LiteXL:is_installed() return system.stat(self.local_path) end +function LiteXL:is_installed() return system.stat(self.local_path) ~= nil end function LiteXL:install() if self:is_installed() then log_warning("lite-xl " .. self.version .. " already installed") return end @@ -1655,7 +1655,7 @@ Flags have the following effects: --help Displays this help text. --ssl-certs Sets the SSL certificate store. Can be a directory, or path to a certificate bundle. - --arch Sets the architecture (default: ]] .. _G.ARCH .. [[). + --arch=architecture Sets the architecture (default: ]] .. _G.ARCH .. [[). --assume-yes Ignores any prompts, and automatically answers yes to all. --no-install-optional On install, anything marked as optional |