macros: Set arch in pakfire

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/macros/package-default.macro b/macros/package-default.macro
index 485a05649a6f0086af1731d49f3bf19c0f0d3805..c708094f1893ae0e34474cb36d2367ae2ccf8912 100644 (file)
--- a/macros/package-default.macro
+++ b/macros/package-default.macro
@@ -2,9 +2,6 @@
 # Epoch information should always be set, starting with zero.
 epoch      = 0
 
-# The default architecture is the architecture of the distribution.
-arch       = %{DISTRO_ARCH}
-
 # Place to add URLs for sources download.
 source_dl  =
 

diff --git a/src/libpakfire/dist.c b/src/libpakfire/dist.c
index 8becc8db387de489e66180ecc8a9a1b956484d75..8905cd873fa0839411cfa974465a920ff27dff08 100644 (file)
--- a/src/libpakfire/dist.c
+++ b/src/libpakfire/dist.c
@@ -71,6 +71,14 @@ static int pakfire_makefile_set_defaults(struct pakfire* pakfire,
        // Set vendor
        pakfire_parser_set(parser, NULL, "vendor", "%{DISTRO_VENDOR}", 0);
 
+       // Set arch
+       const char* arch = pakfire_get_arch(pakfire);
+       if (arch) {
+               r = pakfire_parser_set(parser, NULL, "arch", arch, 0);
+               if (r)
+                       return r;
+       }
+
        // Set DISTRO_NAME
        const char* name = pakfire_get_distro_name(pakfire);
        if (name)