nyyu/aur
1
0
Fork 1
Code Issues 1 Pull Requests Releases Wiki Activity

pacman: update
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
nyyu 2022-02-12 21:06:23 +01:00
parent f5fcdc2e1a
commit d998baf175
3 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pacman/PKGBUILD
View File

@ -2,7 +2,7 @@
# Maintainer:
pkgname=pacman
pkgver=6.0.0
pkgver=6.0.1.r0.g0a6fecd0
pkgrel=1
pkgdesc="A library-based package manager with dependency support"
arch=('x86_64')
@ -21,11 +21,13 @@ options=('strip' 'debug')
validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD' # Allan McRae <allan@archlinux.org>
'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory (pacman) <andrew@archlinux.org>
source=(git+https://gitlab.archlinux.org/pacman/pacman.git#branch=release/6.0.x
add-flto-to-LDFLAGS-for-clang.patch
pacman.conf
makepkg.conf)
sha256sums=('SKIP'
'82ff91b85f4c6ceba19f9330437e2a22aabc966c2b9e2a20a53857f98a42c223'
'4aea8b8dc81188e9f195d0ac887e3a7c85d1be6545fd675f6c160623023d85b5'
'172ad7a3539a2f534ef4de5f1608e78a83b5acd181795b4f59fe4eb609488a94')
'6c0fca917df610e98e19641d8ac3a9b865fb9e639f811e6f65bbb201c37d3181')
pkgver() {
@ -34,6 +36,11 @@ pkgver() {
git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
}
prepare() {
cd pacman
patch -Np1 -i ../add-flto-to-LDFLAGS-for-clang.patch
}
build() {
cd pacman

24
pacman/add-flto-to-LDFLAGS-for-clang.patch Normal file
View File

@ -0,0 +1,24 @@
From 26ee6ff6adbcd8560ec3a65cf219d2ab98edb804 Mon Sep 17 00:00:00 2001
From: Allan McRae <allan@archlinux.org>
Date: Fri, 24 Dec 2021 17:59:32 +1000
Subject: [PATCH] LTO: Add -flto to LDFLAGS for clang
GCC automatically detects when it is linking LTO objects, but clang does
not. Add -flto to LDFLAGS to make this work for clang too.
Signed-off-by: Allan McRae <allan@archlinux.org>
---
scripts/libmakepkg/buildenv/lto.sh.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/scripts/libmakepkg/buildenv/lto.sh.in b/scripts/libmakepkg/buildenv/lto.sh.in
index 1f1ca53f..c3bd0fa4 100644
--- a/scripts/libmakepkg/buildenv/lto.sh.in
+++ b/scripts/libmakepkg/buildenv/lto.sh.in
@@ -33,5 +33,6 @@ buildenv_lto() {
if check_option "lto" "y"; then
CFLAGS+=" -flto"
CXXFLAGS+=" -flto"
+ LDFLAGS+=" -flto"
fi
}

14
pacman/makepkg.conf
View File

@ -9,10 +9,10 @@
#
#-- The download utilities that makepkg should use to acquire sources
# Format: 'protocol::agent'
DLAGENTS=('file::/usr/bin/curl -gqC - -o %o %u'
'ftp::/usr/bin/curl -gqfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
'http::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
'https::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
DLAGENTS=('file::/usr/bin/curl -qgC - -o %o %u'
'ftp::/usr/bin/curl -qgfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
'http::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
'https::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
'rsync::/usr/bin/rsync --no-motd -z %u %o'
'scp::/usr/bin/scp -C %u %o')
@ -47,8 +47,8 @@ LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
#-- Make Flags: change this for DistCC/SMP systems
MAKEFLAGS="-j8"
#-- Debugging flags
DEBUG_CFLAGS="-g -fvar-tracking-assignments"
DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
DEBUG_CFLAGS="-g"
DEBUG_CXXFLAGS="$DEBUG_CFLAGS"
#DEBUG_RUSTFLAGS="-C debuginfo=2"
#########################################################################
@ -78,7 +78,7 @@ BUILDENV=(!distcc color !ccache check !sign)
# These are default values for the options=() settings
#########################################################################
#
# Makepkg defaults: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug !lto)
# Makepkg defaults: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug lto)
# A negated option will do the opposite of the comments below.
#
#-- strip: Strip symbols from binaries/libraries