From 9c7068ead97a072ec1ca64eef8b69d82ed7fb541 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Mon, 9 Sep 2019 10:06:25 +0200 Subject: make aarch64, too --- Makefile | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/Makefile b/Makefile index 4e5160a..50602b1 100644 --- a/Makefile +++ b/Makefile @@ -13,16 +13,19 @@ SETARCH_ALIASES = $(wildcard config/setarch-aliases.d/*) MANS = $(addprefix $(BUILDDIR)/,$(patsubst %.asciidoc,%,$(wildcard doc/man/*.asciidoc))) GENERATED_CONFIGS = \ + 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 \ @@ -31,21 +34,25 @@ GENERATED_CONFIGS = \ 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 \ @@ -67,6 +74,7 @@ COMMITPKG_LINKS = \ gnome-unstablepkg ARCHBUILD_LINKS = \ + extra-aarch64-build \ extra-armv6h-build \ extra-armv7h-build \ extra-i486-build \ @@ -74,6 +82,7 @@ ARCHBUILD_LINKS = \ extra-pentium4-build \ extra-x86_64-build \ extra-x86_64_v3-build \ + testing-aarch64-build \ testing-armv6h-build \ testing-armv7h-build \ testing-i486-build \ @@ -81,6 +90,7 @@ ARCHBUILD_LINKS = \ testing-pentium4-build \ testing-x86_64-build \ testing-x86_64_v3-build \ + staging-aarch64-build \ staging-armv6h-build \ staging-armv7h-build \ staging-i486-build \ @@ -94,18 +104,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 \ @@ -147,6 +160,14 @@ endif edit = sed -e "s|@pkgdatadir[@]|$(PREFIX)/share/devtools|g" GEN_MSG = @echo "GEN $(patsubst $(BUILDDIR)/%,%,$@)" +$(BUILDDIR)/config/makepkg-aarch64.conf: config/makepkg/x86_64.conf + @echo "GEN $(notdir $@)" + @mkdir -p $(dir $@) + @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; \ + " "$<" > "$@" + $(BUILDDIR)/config/makepkg-armv6h.conf: config/makepkg/x86_64.conf @echo "GEN $(notdir $@)" @mkdir -p $(dir $@) @@ -213,6 +234,13 @@ $(BUILDDIR)/config/pacman-archlinuxewe-pentium4.conf: config/pacman/archlinuxewe /^Architecture = / s/^.*\$$/Architecture = pentium4/; \ " "$<" > "$@" +$(BUILDDIR)/config/pacman-%-aarch64.conf: config/pacman/%.conf + @echo "GEN $(notdir $@)" + @mkdir -p $(dir $@) + @sed " \ + /^Architecture = / s/^.*\$$/Architecture = aarch64/; \ + " "$<" > "$@" + $(BUILDDIR)/config/pacman-%-armv6h.conf: config/pacman/%.conf @echo "GEN $(notdir $@)" @mkdir -p $(dir $@) -- cgit v1.2.3-54-g00ecf