From 6c8839c55fa376c1c8e210f2bae8ee048b4fea68 Mon Sep 17 00:00:00 2001 From: xhaa123 Date: Fri, 25 Oct 2024 01:38:13 +0800 Subject: [PATCH] pacman 7.0.0-2 --- PKGBUILD | 9 +++------ future-build.conf | 35 ++++++++++++++++------------------- 2 files changed, 19 insertions(+), 25 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index bf3f122..6b9a1a9 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,7 +6,7 @@ # Maintainer: Future Linux Team pkgname=pacman pkgver=7.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="A library-based package manager with dependency support" arch=('x86_64') url="https://www.archlinux.org/pacman/" @@ -30,7 +30,7 @@ source=(https://gitlab.archlinux.org/pacman/pacman/-/releases/v${pkgver}/downloa mirrorlist) sha256sums=(61cbd445d1381b4b184bc7c4e2791f07a79f0f2807b7c600399d0d08e8cd28cf b3bce9d662e189e8e49013b818f255d08494a57e13fc264625f852f087d3def2 - 66b25ef493b63ec58e3803d79eb37f63150e120b008ce1666531919b1cd4166a + 58ad3c7e09e86a6f493a00235a34d09adc9bdedcab2f4731463074ed7bbe992b 128c4737dedd58e0b0ffec306feaf1752260591b1222bdcb32c22bcaf8a8a44a f6faafd6691a2b11e98996ff09500803ade4d0e943e7bff08c59e4e42b171da5 851385788fcef9eba37c7b9403d0010ccc94800b3279bc60ab5fcabc6ee8d321 @@ -47,10 +47,7 @@ prepare() { build() { cd ${pkgname}-${pkgver} - future-meson build \ - --prefix=/usr \ - -Dbuildtype=release \ - -Dlibdir=/usr/lib64 \ + ${FUTURE_MESON} \ -Dpkg-ext=".pkg.tar.zst" \ -Dsrc-ext=".src.tar.zst" \ -Dcrypto=openssl \ diff --git a/future-build.conf b/future-build.conf index a0d3864..32ac0ea 100644 --- a/future-build.conf +++ b/future-build.conf @@ -1,32 +1,29 @@ -source PKGBUILD ######################################################################### # BUILD CONFIGURE -BUILD_CONFIGURE="../configure --build=${CHOST} \ +BUILD_CONFIGURE=" +../configure --build=${CHOST} \ --host=${CHOST} \ --prefix=/usr \ - --sysconfdir=/etc \ - --bindir=/usr/bin \ - --sbindir=/usr/sbin \ - --libdir=/usr/lib64 \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man \ - --localstatedir=/var \ - --docdir=/usr/share/doc/${pkgname}-${pkgver}" + --libdir=/usr/lib64" -CONFIGURE="./configure --build=${CHOST} \ +CONFIGURE=" +./configure --build=${CHOST} \ --host=${CHOST} \ --prefix=/usr \ - --sysconfdir=/etc \ - --bindir=/usr/bin \ - --sbindir=/usr/sbin \ - --libdir=/usr/lib64 \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man \ - --localstatedir=/var \ - --docdir=/usr/share/doc/${pkgname}-${pkgver}" + --libdir=/usr/lib64" + +######################################################################### +# Meson Build Options +######################################################################### +FUTURE_MESON=" +future-meson build \ + --prefix=/usr \ + -Dbuildtype=release \ + -Dlibdir=/usr/lib64" ######################################################################### # PICK +######################################################################### _pick() { local p=${1} f d; shift for f; do