From ccd3a8ef8da335c33ce3492d6946a12d50326842 Mon Sep 17 00:00:00 2001 From: PktSurf Date: Tue, 5 Nov 2024 16:41:34 +0530 Subject: [PATCH] Removed gcc from .gitignore Fixed installation paths in base/cbindgen,libffi,mdadm --- .gitignore | 1 - base/cbindgen/smbuild | 2 +- base/libffi/smbuild | 4 +++- base/mdadm/smbuild | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 96d70e9..fd08f31 100644 --- a/.gitignore +++ b/.gitignore @@ -17,7 +17,6 @@ incomplete incomplete.n waf-2.0.9 *.img.xz -gcc libreoffice others networkmanager diff --git a/base/cbindgen/smbuild b/base/cbindgen/smbuild index d20bca9..0a2447f 100644 --- a/base/cbindgen/smbuild +++ b/base/cbindgen/smbuild @@ -19,7 +19,7 @@ prepbuilddir() { build() { RUSTONIG_DYNAMIC_LIBONIG=1 \ cargo build --release --target $arch-unknown-linux-musl $MAKEFLAGS - install -Dm 755 target/$arch-unknown-linux-musl/release/cbindgen $pkg/bin/cbindgen + install -Dm 755 target/$arch-unknown-linux-musl/release/cbindgen $pkg/usr/bin/cbindgen cp LICENSE $pkgdocs/ diff --git a/base/libffi/smbuild b/base/libffi/smbuild index f4c9eb1..fbe7bf5 100644 --- a/base/libffi/smbuild +++ b/base/libffi/smbuild @@ -19,8 +19,10 @@ prepbuilddir() { build() { ./configure \ --prefix=/usr \ - --disable-static + --libdir=/usr/lib \ + --disable-static + sed -i 's@lib64@lib@g' Makefile x86_64*/Makefile x86_64*/$app.pc make make install DESTDIR=$pkg diff --git a/base/mdadm/smbuild b/base/mdadm/smbuild index ace513c..1f4f5d3 100644 --- a/base/mdadm/smbuild +++ b/base/mdadm/smbuild @@ -26,8 +26,8 @@ prepbuilddir() { } build() { - make - make install DESTDIR="$pkg" + make BINDIR=/usr/bin + make install BINDIR=/usr/bin DESTDIR="$pkg" install -Dm 644 mdadm.conf-example $pkg/etc/mdadm.conf.new cp COPYING $pkgdocs/