git » pacman.git » commit 96a8792

diff --git a/0001-makepkg-check-for-usr-lib64.patch b/0001-makepkg-check-for-usr-lib64.patch
new file mode 100644
index 0000000..e417a0b
--- /dev/null
+++ b/0001-makepkg-check-for-usr-lib64.patch
@@ -0,0 +1,71 @@
+From 15f2706b5e6e2841446f156d2ab9c23644428509 Mon Sep 17 00:00:00 2001
+From: "Urja (ARMLFS builder)" <urja+armlfs@urja.dev>
+Date: Sun, 7 Jul 2024 00:10:59 +0300
+Subject: [PATCH] makepkg: check for usr/lib64
+
+---
+ scripts/libmakepkg/lint_package/meson.build   |  1 +
+ .../libmakepkg/lint_package/usrlib64.sh.in    | 39 +++++++++++++++++++
+ 2 files changed, 40 insertions(+)
+ create mode 100644 scripts/libmakepkg/lint_package/usrlib64.sh.in
+
+diff --git a/scripts/libmakepkg/lint_package/meson.build b/scripts/libmakepkg/lint_package/meson.build
+index 8eb1aaf..0938a96 100644
+--- a/scripts/libmakepkg/lint_package/meson.build
++++ b/scripts/libmakepkg/lint_package/meson.build
+@@ -3,6 +3,7 @@ libmakepkg_module = 'lint_package'
+ sources = [
+   'build_references.sh.in',
+   'dotfiles.sh.in',
++  'usrlib64.sh.in',
+   'file_names.sh.in',
+   'missing_backup.sh.in',
+ ]
+diff --git a/scripts/libmakepkg/lint_package/usrlib64.sh.in b/scripts/libmakepkg/lint_package/usrlib64.sh.in
+new file mode 100644
+index 0000000..f0f97ac
+--- /dev/null
++++ b/scripts/libmakepkg/lint_package/usrlib64.sh.in
+@@ -0,0 +1,39 @@
++#!/bin/bash
++#
++#   usrlib64.sh - check for usr/lib64 directory
++#
++#   Copyright (c) 2016-2024 Pacman Development Team <pacman-dev@lists.archlinux.org>
++#
++#   This program is free software; you can redistribute it and/or modify
++#   it under the terms of the GNU General Public License as published by
++#   the Free Software Foundation; either version 2 of the License, or
++#   (at your option) any later version.
++#
++#   This program is distributed in the hope that it will be useful,
++#   but WITHOUT ANY WARRANTY; without even the implied warranty of
++#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++#   GNU General Public License for more details.
++#
++#   You should have received a copy of the GNU General Public License
++#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
++#
++
++[[ -n "$LIBMAKEPKG_LINT_PACKAGE_USRLIB64_SH" ]] && return
++LIBMAKEPKG_LINT_PACKAGE_USRLIB64_SH=1
++
++MAKEPKG_LIBRARY=${MAKEPKG_LIBRARY:-'@libmakepkgdir@'}
++
++source "$MAKEPKG_LIBRARY/util/message.sh"
++
++lint_package_functions+=('check_usrlib64')
++
++check_usrlib64() {
++	local ret=0
++
++	if [ -d "$pkgdir"/usr/lib64 ]; then
++		error "Package tried to create directory /usr/lib64"
++		ret=1
++	fi
++
++	return $ret
++}
+-- 
+2.44.0
+
diff --git a/PKGBUILD b/PKGBUILD
index eaa28fb..76bbb46 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,11 @@
 pkgname=pacman
 pkgver=6.1.0
-pkgrel=5
-arch=('armv7h')
+pkgrel=8
+arch=('armv7h' 'aarch64')
 license=('unknown')
 source=("$pkgname-release-6.1.x.tar.gz"
 	"0001-Initial-asignify-support.patch"
+	"0001-makepkg-check-for-usr-lib64.patch"
 	"makepkg.conf"
 	"pacman.conf")
 depends=(bash glibc libarchive curl gettext gawk coreutils grep openssl asignify)
@@ -16,6 +17,7 @@ etc/makepkg.conf)
 prepare() {
 	cd "$pkgname-release-6.1.x"
 	patch -Np1 -i ../0001-Initial-asignify-support.patch
+	patch -Np1 -i ../0001-makepkg-check-for-usr-lib64.patch
 }
 
 build() {
@@ -35,9 +37,38 @@ build() {
 package() {
 	cd "$pkgname-release-6.1.x/build"
 	DESTDIR="$pkgdir" ninja install
-	cp "$srcdir"/{makepkg,pacman}.conf "$pkgdir"/etc
+
+	# install Arch specific stuff
+	install -dm755 "$pkgdir/etc"
+	install -m644 "$srcdir/pacman.conf" "$pkgdir/etc"
+
+	case $CARCH in
+	  armv7h)
+	    mycarch="armv7h"
+	    mychost="armv7l-unknown-linux-gnueabihf"
+	    myflags="-march=armv7ve -mfloat-abi=hard -mfpu=neon-vfp4 -mtune=cortex-a17 "
+	    myrflag="-C target-cpu=cortex-a17"
+	    ;;
+	  aarch64)
+	    mycarch="aarch64"
+	    mychost="aarch64-unknown-linux-gnu"
+	    myflags="-march=armv8-a "
+	    myrflag=""
+	    ;;
+	esac
+
+	install -m644 "$srcdir/makepkg.conf" "$pkgdir/etc"
+	sed -i "$pkgdir/etc/makepkg.conf" \
+	  -e "s|@CARCH[@]|$mycarch|g" \
+	  -e "s|@CHOST[@]|$mychost|g" \
+	  -e "s|@CARCHFLAGS[@]|$myflags|g" \
+	  -e "s|@RUSTFLAGS[@]|$myrflag|g"
+
+	sed -i $pkgdir/etc/pacman.conf -e "s|@CARCH[@]|$mycarch|g"
+
 }
 sha256sums=('b15679b7b751992d8d8f2acfa94f0c381d71d8289e5ac9f89cb6ddb88306c788'
             '6303db37b0b91953228e8a11d1bf4984b2514cbe9713588da8bd646375ae0e15'
-            '09afbfea3e7f0aa971edbda63633551fc0a332056cae1756f3f60b90dc065ac3'
-            'ea7d565cb3bf054af947ba51df2c1567030572755fc8caa66d7f869a97bb27e5')
+            '703e94b641a824d3e44f94d5ffc314ed1a6bfe97f3e11be9cf990a86a7bdcb73'
+            'a00bdc563a2190d5965d1c44e907944372b63fa17a81212ce7dd7bcfaf6d63ef'
+            '7226a5b2cdf7d3b2f697620c5a5637566e791e003ee605106c2c9ab8ceb13384')
diff --git a/makepkg.conf b/makepkg.conf
index 64b404a..cb84bc4 100644
--- a/makepkg.conf
+++ b/makepkg.conf
@@ -33,15 +33,17 @@ VCSCLIENTS=('bzr::breezy'
 # ARCHITECTURE, COMPILE FLAGS
 #########################################################################
 #
-CARCH="armv7h"
-CHOST="armv7l-unknown-linux-gnueabihf"
+CARCH="@CARCH@"
+CHOST="@CHOST@"
 
 #-- Compiler and Linker Flags
 #CPPFLAGS=""
-CFLAGS="-march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -mtune=cortex-a17 -O2 -pipe"
-CXXFLAGS="-march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -mtune=cortex-a17 -O2 -pipe"
+CFLAGS="@CARCHFLAGS@-O2 -pipe"
+# Disable notes of ABI changes - we have no binaries built with old versions of gcc to worry about
+CXXFLAGS="@CARCHFLAGS@-O2 -pipe -Wno-psabi"
 LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
-#RUSTFLAGS="-C opt-level=2"
+RUSTFLAGS="-C opt-level=2 @RUSTFLAGS@"
+
 #-- Make Flags: change this for DistCC/SMP systems
 MAKEFLAGS="-j2"
 #-- Debugging flags
diff --git a/pacman.conf b/pacman.conf
index c243ed4..bac80f9 100644
--- a/pacman.conf
+++ b/pacman.conf
@@ -19,7 +19,7 @@ HoldPkg     = pacman glibc
 #XferCommand = /usr/bin/curl -L -C - -f -o %o %u
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
-Architecture = armv7h
+Architecture = @CARCH@
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
 #IgnorePkg   =
@@ -79,4 +79,4 @@ DBPath   = /var/lib/pacman/
 CacheDir = /var/cache/pacman/pkg/
 LogFile  = /var/log/pacman.log
 SigLevel = Never
-# Repository: do not add one now: repo-add needs openssl.
+