diff options
| -rw-r--r-- | Makefile | 28 | ||||
| -rw-r--r-- | config/setarch-aliases.d/armv7h | 1 |
2 files changed, 29 insertions, 0 deletions
@@ -14,14 +14,17 @@ MANS = $(addprefix $(BUILDDIR)/,$(patsubst %.asciidoc,%,$(wildcard doc/man/*.asc GENERATED_CONFIGS = \ pacman-extra-armv6h.conf \ + pacman-extra-armv7h.conf \ pacman-extra-i486.conf \ pacman-extra-i686.conf \ pacman-extra-pentium4.conf \ pacman-testing-armv6h.conf \ + pacman-testing-armv7h.conf \ pacman-testing-i486.conf \ pacman-testing-i686.conf \ pacman-testing-pentium4.conf \ pacman-staging-armv6h.conf \ + pacman-staging-armv7h.conf \ pacman-staging-i486.conf \ pacman-staging-i686.conf \ pacman-staging-pentium4.conf \ @@ -29,18 +32,22 @@ GENERATED_CONFIGS = \ pacman-staging-with-build-support-i686.conf \ pacman-staging-with-build-support-pentium4.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-armv6h.conf \ + pacman-gnome-unstable-armv7h.conf \ pacman-gnome-unstable-i486.conf \ pacman-gnome-unstable-i686.conf \ pacman-gnome-unstable-pentium4.conf \ pacman-archlinuxewe-armv6h.conf \ + pacman-archlinuxewe-armv7h.conf \ pacman-archlinuxewe-i486.conf \ pacman-archlinuxewe-i686.conf \ pacman-archlinuxewe-pentium4.conf \ makepkg-armv6h.conf \ + makepkg-armv7h.conf \ makepkg-i486.conf \ makepkg-i686.conf \ makepkg-pentium4.conf @@ -61,18 +68,21 @@ COMMITPKG_LINKS = \ ARCHBUILD_LINKS = \ extra-armv6h-build \ + extra-armv7h-build \ extra-i486-build \ extra-i686-build \ extra-pentium4-build \ extra-x86_64-build \ extra-x86_64_v3-build \ testing-armv6h-build \ + testing-armv7h-build \ testing-i486-build \ testing-i686-build \ testing-pentium4-build \ testing-x86_64-build \ testing-x86_64_v3-build \ staging-armv6h-build \ + staging-armv7h-build \ staging-i486-build \ staging-i686-build \ staging-pentium4-build \ @@ -85,16 +95,19 @@ ARCHBUILD_LINKS = \ multilib-testing-build \ multilib-staging-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-armv6h-build \ + gnome-unstable-armv7h-build \ gnome-unstable-i486-build \ gnome-unstable-i686-build \ gnome-unstable-pentium4-build \ gnome-unstable-x86_64-build \ archlinuxewe-armv6h-build \ + archlinuxewe-armv7h-build \ archlinuxewe-i486-build \ archlinuxewe-i686-build \ archlinuxewe-pentium4-build \ @@ -142,6 +155,14 @@ $(BUILDDIR)/config/makepkg-armv6h.conf: config/makepkg/x86_64.conf s/^\(C\(XX\)\?FLAGS=\).*\$$/\1\"-march=armv6 -mfloat-abi=hard -mfpu=vfp -O2 -pipe -fstack-protector-strong -fno-plt\"/g; \ " "$<" > "$@" +$(BUILDDIR)/config/makepkg-armv7h.conf: config/makepkg/x86_64.conf + @echo "GEN $(notdir $@)" + @mkdir -p $(dir $@) + @sed " s/^CARCH=.*\$$/CARCH=\"armv7h\"/g; \ + s/^CHOST=.*\$$/CHOST=\"armv7l-unknown-linux-gnueabihf\"/g; \ + s/^\(C\(XX\)\?FLAGS=\).*\$$/\1\"-march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -O2 -pipe -fstack-protector-strong -fno-plt\"/g; \ + " "$<" > "$@" + $(BUILDDIR)/config/makepkg-i486.conf: config/makepkg/x86_64.conf @echo "GEN $(notdir $@)" @mkdir -p $(dir $@) @@ -199,6 +220,13 @@ $(BUILDDIR)/config/pacman-%-armv6h.conf: config/pacman/%.conf /^Architecture = / s/^.*\$$/Architecture = armv6h/; \ " "$<" > "$@" +$(BUILDDIR)/config/pacman-%-armv7h.conf: config/pacman/%.conf + @echo "GEN $(notdir $@)" + @mkdir -p $(dir $@) + @sed " \ + /^Architecture = / s/^.*\$$/Architecture = armv7h/; \ + " "$<" > "$@" + $(BUILDDIR)/config/pacman-%-i486.conf: config/pacman/%.conf @echo "GEN $(notdir $@)" @mkdir -p $(dir $@) diff --git a/config/setarch-aliases.d/armv7h b/config/setarch-aliases.d/armv7h new file mode 100644 index 0000000..965a7a7 --- /dev/null +++ b/config/setarch-aliases.d/armv7h @@ -0,0 +1 @@ +armv7l |