Updated build for efivar for CMLFS

This commit is contained in:
dslm4515
2023-10-28 20:42:28 -05:00
parent 5491fa0d93
commit f2ce4fed38
3 changed files with 9 additions and 8 deletions

View File

@ -11,14 +11,15 @@
# Recommended: NONE # Recommended: NONE
# Optional: NONE # Optional: NONE
patch -Np1 -i ../patches/efivar-void/0001-Support-custom-cflags-for-CC_FOR_BUILD-and-CCLD_FOR_.patch && \ # Apply patches from Chimera Linux
patch -Np1 -i ../patches/efivar-void/0002-Replace-call-to-strncpy-by-memcpy-to-fix-some-GCC8-w.patch && \ patch -Np1 -i ../patches/efivar-chimera/0001-Support-custom-cflags-for-CC_FOR_BUILD-and-CCLD_FOR_.patch
patch -Np1 -i ../patches/efivar-chimera/0002-Replace-call-to-strncpy-by-memcpy-to-fix-some-GCC8-w.patch
export CFLAGS="-D_GNU_SOURCE -Wno-error=address-of-packed-member" && \ export CFLAGS="-D_GNU_SOURCE -Wno-error=address-of-packed-member" && \
read -p "Compile?" && make PREFIX=/usr -j2 && \ read -p "Compile?" && make ERRORS= LIBDIR=/usr/lib && \
sudo -S make PREFIX=/usr DESTDIR=$BUILD install && \ sudo -S make PREFIX=/usr DESTDIR=$BUILD LIBDIR=/usr/lib install && \
case $(uname -m) in case $(uname -m) in
x86_64 | aarch64 sudo -S mv ${BUILD}/usr/lib64 ${BUILD}/usr/lib ;; x86_64 | aarch64 sudo -S mv ${BUILD}/usr/lib64 ${BUILD}/usr/lib ;;
esac && \ esac && \
@ -49,7 +50,7 @@ efivar:
efivar: efivar:
EOF EOF
sudo -S mv -v /tmp/slack-desc install/ && sudo -S mv -v /tmp/slack-desc install/ &&
sudo -S makepkg -l y -c n $PKGS/efivar-37-$(uname -m)-mlfs.txz && sudo -S makepkg -l y -c n $PKGS/efivar-37-$PSUFFIX &&
cd /BMAN cd /BMAN
cat > /tmp/slack-desc << "EOF" cat > /tmp/slack-desc << "EOF"
@ -62,6 +63,6 @@ efivar-doc: Homepage: https://github.com/rhboot/efivar
efivar-doc: efivar-doc:
EOF EOF
sudo -S mv -v /tmp/slack-desc install/ && sudo -S mv -v /tmp/slack-desc install/ &&
sudo -S makepkg -l y -c n $PKGS/efivar-doc-37-noarch-mlfs.txz sudo -S makepkg -l y -c n $PKGS/efivar-doc-37-$NOSPUFFIX
sudo -S rm -rf /BMAN/* sudo -S rm -rf /BMAN/*
sudo -S rm -rf ${BUILD}/* sudo -S rm -rf ${BUILD}/*

View File

@ -16,7 +16,7 @@ index 57cee6e..814b0ef 100644
$(if $(findstring ccc-analyzer,$(CC)),$(clang_cflags),) \ $(if $(findstring ccc-analyzer,$(CC)),$(clang_cflags),) \
$(if $(findstring gcc,$(CC)),$(gcc_cflags),) \ $(if $(findstring gcc,$(CC)),$(gcc_cflags),) \
$(call pkg-config-cflags) $(call pkg-config-cflags)
+cflags_for_build = $(CFLAGS_FOR_BUILD) -I${TOPDIR}/src/include/ \ +cflags_for_build = $(BUILD_CFLAGS) -I${TOPDIR}/src/include/ \
+ $(if $(findstring clang,$(CC_FOR_BUILD)),$(clang_cflags),) \ + $(if $(findstring clang,$(CC_FOR_BUILD)),$(clang_cflags),) \
+ $(if $(findstring ccc-analyzer,$(CC_FOR_BUILD)),$(clang_cflags),) \ + $(if $(findstring ccc-analyzer,$(CC_FOR_BUILD)),$(clang_cflags),) \
+ $(if $(findstring gcc,$(CC_FOR_BUILD)),$(gcc_cflags),) \ + $(if $(findstring gcc,$(CC_FOR_BUILD)),$(gcc_cflags),) \
@ -28,7 +28,7 @@ index 57cee6e..814b0ef 100644
$(if $(findstring ccc-analyzer,$(CCLD)),$(clang_ccldflags),) \ $(if $(findstring ccc-analyzer,$(CCLD)),$(clang_ccldflags),) \
$(if $(findstring gcc,$(CCLD)),$(gcc_ccldflags),) \ $(if $(findstring gcc,$(CCLD)),$(gcc_ccldflags),) \
$(call pkg-config-ldflags) $(call pkg-config-ldflags)
+ccldflags_for_build = $(cflags_for_build) -L. $(CCLDFLAGS) $(LDFLAGS) \ +ccldflags_for_build = $(cflags_for_build) -L. $(BUILD_CCLDFLAGS) $(BUILD_LDFLAGS) \
+ -Wl,-z,muldefs \ + -Wl,-z,muldefs \
+ $(if $(findstring clang,$(CCLD_FOR_BUILD)),$(clang_ccldflags),) \ + $(if $(findstring clang,$(CCLD_FOR_BUILD)),$(clang_ccldflags),) \
+ $(if $(findstring ccc-analyzer,$(CCLD_FOR_BUILD)),$(clang_ccldflags),) \ + $(if $(findstring ccc-analyzer,$(CCLD_FOR_BUILD)),$(clang_ccldflags),) \