From 464c8328830e6a442a7708e85b25334d67dce8fe Mon Sep 17 00:00:00 2001 From: Nick Chan Date: Wed, 15 May 2024 12:21:13 +0800 Subject: [PATCH] Remove unused libraries --- .github/workflows/build.yml | 127 +----------------------------------- Makefile | 6 -- 2 files changed, 2 insertions(+), 131 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 456b68f0..a526bf73 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -76,9 +76,6 @@ jobs: env: MBEDTLS_VERSION: 3.5.2 READLINE_VERSION: 8.2 - SLANG_VERSION: 2.3.3 - NEWT_VERSION: 0.52.23 - POPT_VERSION: 1.19 steps: - name: Checkout @@ -102,16 +99,10 @@ jobs: run: | curl -LOOOOOO \ https://github.com/Mbed-TLS/mbedtls/archive/refs/tags/v${{ env.MBEDTLS_VERSION }}.tar.gz \ - https://mirror-hk.koddos.net/gnu/readline/readline-${{ env.READLINE_VERSION }}.tar.gz \ - https://www.jedsoft.org/releases/slang/slang-${{ env.SLANG_VERSION }}.tar.bz2 \ - https://releases.pagure.org/newt/newt-${{ env.NEWT_VERSION }}.tar.gz \ - https://github.com/rpm-software-management/popt/archive/refs/tags/popt-${{ env.POPT_VERSION }}-release.tar.gz + https://mirror-hk.koddos.net/gnu/readline/readline-${{ env.READLINE_VERSION }}.tar.gz tar -xf v${{ env.MBEDTLS_VERSION }}.tar.gz tar -xf readline-${{ env.READLINE_VERSION }}.tar.gz - tar -xjf slang-${{ env.SLANG_VERSION }}.tar.bz2 - tar -xf newt-${{ env.NEWT_VERSION }}.tar.gz - tar -xf popt-${{ env.POPT_VERSION }}-release.tar.gz git clone --depth=1 https://github.com/libimobiledevice/libplist git clone --depth=1 https://github.com/libimobiledevice/libimobiledevice-glue git clone --depth=1 https://github.com/libimobiledevice/libirecovery @@ -214,51 +205,6 @@ jobs: gmake -j$(sysctl -n hw.ncpu) install DESTDIR=${{ env.DESTDIR }} cd .. - - name: Build S-Lang - run: | - cd slang-${{ env.SLANG_VERSION }} - ./configure \ - ${{ env.CONFIGURE_ARGS }} \ - --without-x \ - --without-pcre \ - --without-onig \ - --without-z \ - --without-png \ - --without-iconv - gmake -j$(sysctl -n hw.ncpu) static - gmake -j$(sysctl -n hw.ncpu) install-static DESTDIR=${{ env.DESTDIR }} - cd .. - - - name: Build popt - run: | - cd popt-popt-${{ env.POPT_VERSION }}-release - autoreconf -fiv - ./configure \ - ${{ env.CONFIGURE_ARGS }} \ - --without-libiconv-prefix \ - --without-libintl-prefix \ - --disable-nls \ - --disable-werror - gmake -j$(sysctl -n hw.ncpu) - gmake -j$(sysctl -n hw.ncpu) install DESTDIR=${{ env.DESTDIR }} - cd .. - - - name: Build newt - run: | - cd newt-${{ env.NEWT_VERSION }} - ./configure \ - ${{ env.CONFIGURE_ARGS }} \ - --with-readline=gnu \ - --without-python \ - --without-tcl \ - --disable-nls - gmake -j$(sysctl -n hw.ncpu) libnewt.a - mkdir -p ${{ env.DESTDIR }}/usr/local/{lib/pkgconfig,include} - install -m644 libnewt.pc ${{ env.DESTDIR }}/usr/local/lib/pkgconfig - install -m644 libnewt.a ${{ env.DESTDIR }}/usr/local/lib - install -m644 newt.h ${{ env.DESTDIR }}/usr/local/include - cd .. - - name: Build libplist run: | cd libplist @@ -534,10 +480,6 @@ jobs: MBEDTLS_VERSION: 3.5.2 LIBUSB_VERSION: 1.0.26 READLINE_VERSION: 8.2 - SLANG_VERSION: 2.3.3 - NEWT_VERSION: 0.52.23 - GPM_VERSION: 1.20.7 - POPT_VERSION: 1.19 steps: - name: Checkout @@ -608,19 +550,11 @@ jobs: curl -LOOOOOOO \ https://github.com/Mbed-TLS/mbedtls/archive/refs/tags/v${{ env.MBEDTLS_VERSION }}.tar.gz \ https://github.com/libusb/libusb/releases/download/v${{ env.LIBUSB_VERSION }}/libusb-${{ env.LIBUSB_VERSION }}.tar.bz2 \ - https://mirror-hk.koddos.net/gnu/readline/readline-${{ env.READLINE_VERSION }}.tar.gz \ - https://www.jedsoft.org/releases/slang/slang-${{ env.SLANG_VERSION }}.tar.bz2 \ - https://releases.pagure.org/newt/newt-${{ env.NEWT_VERSION }}.tar.gz \ - https://github.com/telmich/gpm/archive/refs/tags/${{ env.GPM_VERSION }}.tar.gz \ - https://github.com/rpm-software-management/popt/archive/refs/tags/popt-${{ env.POPT_VERSION }}-release.tar.gz + https://mirror-hk.koddos.net/gnu/readline/readline-${{ env.READLINE_VERSION }}.tar.gz tar -xf v${{ env.MBEDTLS_VERSION }}.tar.gz tar -xjf libusb-${{ env.LIBUSB_VERSION }}.tar.bz2 tar -xf readline-${{ env.READLINE_VERSION }}.tar.gz - tar -xjf slang-${{ env.SLANG_VERSION }}.tar.bz2 - tar -xf newt-${{ env.NEWT_VERSION }}.tar.gz - tar -xf ${{ env.GPM_VERSION }}.tar.gz - tar -xf popt-${{ env.POPT_VERSION }}-release.tar.gz git clone --depth=1 https://github.com/libimobiledevice/libplist git clone --depth=1 https://github.com/libimobiledevice/libimobiledevice-glue git clone --depth=1 https://github.com/libimobiledevice/libirecovery @@ -668,63 +602,6 @@ jobs: make -j$(nproc) install DESTDIR=${{ env.DESTDIR }} cd .. - - name: Build S-Lang - run: | - cd slang-${{ env.SLANG_VERSION }} - ./configure \ - ${{ env.CONFIGURE_ARGS }} \ - --without-x \ - --without-pcre \ - --without-onig \ - --without-z \ - --without-png \ - --without-iconv - gmake -j$(sysctl -n hw.ncpu) static - gmake -j$(sysctl -n hw.ncpu) install-static DESTDIR=${{ env.DESTDIR }} - cd .. - - - name: Build GPM - run: | - cd gpm-${{ env.GPM_VERSION }} - cat ../patches/gpm/*.patch | patch -sN -d . -p1 - ./autogen.sh - ./configure \ - ${{ env.CONFIGURE_ARGS }} - gmake -j$(sysctl -n hw.ncpu) - gmake -j$(sysctl -n hw.ncpu) install DESTDIR=${{ env.DESTDIR }} - cd .. - - - name: Build popt - run: | - cd popt-popt-${{ env.POPT_VERSION }}-release - autoreconf -fiv - ./configure \ - ${{ env.CONFIGURE_ARGS }} \ - --without-libiconv-prefix \ - --without-libintl-prefix \ - --disable-nls \ - --disable-werror - gmake -j$(sysctl -n hw.ncpu) - gmake -j$(sysctl -n hw.ncpu) install DESTDIR=${{ env.DESTDIR }} - cd .. - - - name: Build newt - run: | - cd newt-${{ env.NEWT_VERSION }} - ./configure \ - ${{ env.CONFIGURE_ARGS }} \ - --with-readline=gnu \ - --without-python \ - --without-tcl \ - --disable-nls \ - --with-gpm-support - gmake -j$(sysctl -n hw.ncpu) libnewt.a - mkdir -p ${{ env.DESTDIR }}/usr/local/{lib/pkgconfig,include} - install -m644 libnewt.pc ${{ env.DESTDIR }}/usr/local/lib/pkgconfig - install -m644 libnewt.a ${{ env.DESTDIR }}/usr/local/lib - install -m644 newt.h ${{ env.DESTDIR }}/usr/local/include - cd .. - - name: Build libplist run: | cd libplist diff --git a/Makefile b/Makefile index c2d43b92..cb44463a 100644 --- a/Makefile +++ b/Makefile @@ -26,12 +26,6 @@ LDFLAGS += -Wl,--gc-sections endif LIBS += $(DEP)/lib/libmbedtls.a $(DEP)/lib/libmbedcrypto.a $(DEP)/lib/libmbedx509.a $(DEP)/lib/libreadline.a -ifeq ($(TUI),1) -LIBS += $(DEP)/lib/libnewt.a $(DEP)/lib/libpopt.a $(DEP)/lib/libslang.a -ifeq ($(TARGET_OS),Linux) -LIBS += $(DEP)/lib/libgpm.a -endif -endif ifeq ($(DEV_BUILD),1) CFLAGS += -O0 -g -DDEV_BUILD -fno-omit-frame-pointer ifeq ($(ASAN),1)