Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-09-09 10:06:25 +0200
committerErich Eckner <git@eckner.net>2021-02-25 11:08:31 +0100
commit05280b874394d36f70944776973270f5ac4f2303 (patch)
tree8e5c9b045a8baaa2a07afdef6c259c81670573b6
parentac1c58ecbcf0dee68685b9de6d0c84ce9d69a62e (diff)
make aarch64, too
-rw-r--r--.gitignore2
-rw-r--r--Makefile26
2 files changed, 28 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index a1510a2..91dea48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,8 +23,10 @@ doc/*.7
pacman-*-i486.conf
pacman-*-i686.conf
pacman-*-pentium4.conf
+pacman-*-aarch64.conf
pacman-*-armv6h.conf
pacman-*-armv7h.conf
+makepkg-aarch64.conf
makepkg-armv6h.conf
makepkg-armv7h.conf
makepkg-i486.conf
diff --git a/Makefile b/Makefile
index 7747a3f..b485be7 100644
--- a/Makefile
+++ b/Makefile
@@ -25,16 +25,19 @@ BINPROGS = \
$(IN_PROGS)
GENERATED_CONFIGFILES = \
+ pacman-extra-aarch64.conf \
pacman-extra-armv6h.conf \
pacman-extra-armv7h.conf \
pacman-extra-i486.conf \
pacman-extra-i686.conf \
pacman-extra-pentium4.conf \
+ pacman-testing-aarch64.conf \
pacman-testing-armv6h.conf \
pacman-testing-armv7h.conf \
pacman-testing-i486.conf \
pacman-testing-i686.conf \
pacman-testing-pentium4.conf \
+ pacman-staging-aarch64.conf \
pacman-staging-armv6h.conf \
pacman-staging-armv7h.conf \
pacman-staging-i486.conf \
@@ -43,21 +46,25 @@ GENERATED_CONFIGFILES = \
pacman-staging-with-build-support-i486.conf \
pacman-staging-with-build-support-i686.conf \
pacman-staging-with-build-support-pentium4.conf \
+ pacman-kde-unstable-aarch64.conf \
pacman-kde-unstable-armv6h.conf \
pacman-kde-unstable-armv7h.conf \
pacman-kde-unstable-i486.conf \
pacman-kde-unstable-i686.conf \
pacman-kde-unstable-pentium4.conf \
+ pacman-gnome-unstable-aarch64.conf \
pacman-gnome-unstable-armv6h.conf \
pacman-gnome-unstable-armv7h.conf \
pacman-gnome-unstable-i486.conf \
pacman-gnome-unstable-i686.conf \
pacman-gnome-unstable-pentium4.conf \
+ pacman-archlinuxewe-aarch64.conf \
pacman-archlinuxewe-armv6h.conf \
pacman-archlinuxewe-armv7h.conf \
pacman-archlinuxewe-i486.conf \
pacman-archlinuxewe-i686.conf \
pacman-archlinuxewe-pentium4.conf \
+ makepkg-aarch64.conf \
makepkg-armv6h.conf \
makepkg-armv7h.conf \
makepkg-i486.conf \
@@ -96,18 +103,21 @@ COMMITPKG_LINKS = \
gnome-unstablepkg
ARCHBUILD_LINKS = \
+ extra-aarch64-build \
extra-armv6h-build \
extra-armv7h-build \
extra-i486-build \
extra-i686-build \
extra-pentium4-build \
extra-x86_64-build \
+ testing-aarch64-build \
testing-armv6h-build \
testing-armv7h-build \
testing-i486-build \
testing-i686-build \
testing-pentium4-build \
testing-x86_64-build \
+ staging-aarch64-build \
staging-armv6h-build \
staging-armv7h-build \
staging-i486-build \
@@ -120,18 +130,21 @@ ARCHBUILD_LINKS = \
multilib-build \
multilib-testing-build \
multilib-staging-build \
+ kde-unstable-aarch64-build \
kde-unstable-armv6h-build \
kde-unstable-armv7h-build \
kde-unstable-i486-build \
kde-unstable-i686-build \
kde-unstable-pentium4-build \
kde-unstable-x86_64-build \
+ gnome-unstable-aarch64-build \
gnome-unstable-armv6h-build \
gnome-unstable-armv7h-build \
gnome-unstable-i486-build \
gnome-unstable-i686-build \
gnome-unstable-pentium4-build \
gnome-unstable-x86_64-build \
+ archlinuxewe-aarch64-build \
archlinuxewe-armv6h-build \
archlinuxewe-armv7h-build \
archlinuxewe-i486-build \
@@ -165,6 +178,13 @@ man: $(MANS)
edit = sed -e "s|@pkgdatadir[@]|$(PREFIX)/share/devtools|g"
+makepkg-aarch64.conf: makepkg-x86_64.conf
+ @echo "GEN $@"
+ @sed " s/^CARCH=.*\$$/CARCH=\"aarch64\"/g; \
+ s/^CHOST=.*\$$/CHOST=\"aarch64-unknown-linux-gnu\"/g; \
+ s/^\(C\(XX\)\?FLAGS=\).*\$$/\1\"-march=armv8-a -O2 -pipe -fstack-protector-strong -fno-plt\"/g; \
+ " "$<" > "$@"
+
makepkg-armv6h.conf: makepkg-x86_64.conf
@echo "GEN $@"
@sed " s/^CARCH=.*\$$/CARCH=\"armv6h\"/g; \
@@ -215,6 +235,12 @@ pacman-archlinuxewe-pentium4.conf: pacman-archlinuxewe.conf
/^Architecture = / s/^.*\$$/Architecture = pentium4/; \
" "$<" > "$@"
+pacman-%-aarch64.conf: pacman-%.conf
+ @echo "GEN $@"
+ @sed " \
+ /^Architecture = / s/^.*\$$/Architecture = aarch64/; \
+ " "$<" > "$@"
+
pacman-%-armv6h.conf: pacman-%.conf
@echo "GEN $@"
@sed " \