|
@@ -123,6 +123,8 @@ use constant DEB_ALL => DEB_BUILD | DEB_HOST | DEB_TARGET |
|
|
|
|
|
|
my %arch_vars = (
|
|
|
DEB_BUILD_ARCH => DEB_BUILD,
|
|
|
+ DEB_BUILD_ARCH_ABI => DEB_BUILD | DEB_ARCH_INFO,
|
|
|
+ DEB_BUILD_ARCH_LIBC => DEB_BUILD | DEB_ARCH_INFO,
|
|
|
DEB_BUILD_ARCH_OS => DEB_BUILD | DEB_ARCH_INFO,
|
|
|
DEB_BUILD_ARCH_CPU => DEB_BUILD | DEB_ARCH_INFO,
|
|
|
DEB_BUILD_ARCH_BITS => DEB_BUILD | DEB_ARCH_ATTR,
|
|
@@ -132,6 +134,8 @@ my %arch_vars = (
|
|
|
DEB_BUILD_GNU_SYSTEM => DEB_BUILD | DEB_GNU_INFO,
|
|
|
DEB_BUILD_GNU_TYPE => DEB_BUILD | DEB_GNU_INFO,
|
|
|
DEB_HOST_ARCH => DEB_HOST,
|
|
|
+ DEB_HOST_ARCH_ABI => DEB_HOST | DEB_ARCH_INFO,
|
|
|
+ DEB_HOST_ARCH_LIBC => DEB_HOST | DEB_ARCH_INFO,
|
|
|
DEB_HOST_ARCH_OS => DEB_HOST | DEB_ARCH_INFO,
|
|
|
DEB_HOST_ARCH_CPU => DEB_HOST | DEB_ARCH_INFO,
|
|
|
DEB_HOST_ARCH_BITS => DEB_HOST | DEB_ARCH_ATTR,
|
|
@@ -141,6 +145,8 @@ my %arch_vars = (
|
|
|
DEB_HOST_GNU_SYSTEM => DEB_HOST | DEB_GNU_INFO,
|
|
|
DEB_HOST_GNU_TYPE => DEB_HOST | DEB_GNU_INFO,
|
|
|
DEB_TARGET_ARCH => DEB_TARGET,
|
|
|
+ DEB_TARGET_ARCH_ABI => DEB_TARGET | DEB_ARCH_INFO,
|
|
|
+ DEB_TARGET_ARCH_LIBC => DEB_TARGET | DEB_ARCH_INFO,
|
|
|
DEB_TARGET_ARCH_OS => DEB_TARGET | DEB_ARCH_INFO,
|
|
|
DEB_TARGET_ARCH_CPU => DEB_TARGET | DEB_ARCH_INFO,
|
|
|
DEB_TARGET_ARCH_BITS => DEB_TARGET | DEB_ARCH_ATTR,
|
|
@@ -232,8 +238,6 @@ while (@ARGV) {
|
|
|
}
|
|
|
|
|
|
my %v;
|
|
|
-my $abi;
|
|
|
-my $libc;
|
|
|
|
|
|
#
|
|
|
# Set build variables
|
|
@@ -241,7 +245,8 @@ my $libc;
|
|
|
|
|
|
$v{DEB_BUILD_ARCH} = get_raw_build_arch()
|
|
|
if (action_needs(DEB_BUILD));
|
|
|
-($abi, $libc, $v{DEB_BUILD_ARCH_OS}, $v{DEB_BUILD_ARCH_CPU}) = debarch_to_debtuple($v{DEB_BUILD_ARCH})
|
|
|
+($v{DEB_BUILD_ARCH_ABI}, $v{DEB_BUILD_ARCH_LIBC},
|
|
|
+ $v{DEB_BUILD_ARCH_OS}, $v{DEB_BUILD_ARCH_CPU}) = debarch_to_debtuple($v{DEB_BUILD_ARCH})
|
|
|
if (action_needs(DEB_BUILD | DEB_ARCH_INFO));
|
|
|
($v{DEB_BUILD_ARCH_BITS}, $v{DEB_BUILD_ARCH_ENDIAN}) = debarch_to_cpuattrs($v{DEB_BUILD_ARCH})
|
|
|
if (action_needs(DEB_BUILD | DEB_ARCH_ATTR));
|
|
@@ -266,7 +271,8 @@ if (action_needs(DEB_BUILD | DEB_GNU_INFO)) {
|
|
|
|
|
|
$v{DEB_HOST_ARCH} = $req_host_arch || get_raw_host_arch()
|
|
|
if (action_needs(DEB_HOST));
|
|
|
-($abi, $libc, $v{DEB_HOST_ARCH_OS}, $v{DEB_HOST_ARCH_CPU}) = debarch_to_debtuple($v{DEB_HOST_ARCH})
|
|
|
+($v{DEB_HOST_ARCH_ABI}, $v{DEB_HOST_ARCH_LIBC},
|
|
|
+ $v{DEB_HOST_ARCH_OS}, $v{DEB_HOST_ARCH_CPU}) = debarch_to_debtuple($v{DEB_HOST_ARCH})
|
|
|
if (action_needs(DEB_HOST | DEB_ARCH_INFO));
|
|
|
($v{DEB_HOST_ARCH_BITS}, $v{DEB_HOST_ARCH_ENDIAN}) = debarch_to_cpuattrs($v{DEB_HOST_ARCH})
|
|
|
if (action_needs(DEB_HOST | DEB_ARCH_ATTR));
|
|
@@ -302,7 +308,8 @@ if (action_needs(DEB_HOST | DEB_GNU_INFO)) {
|
|
|
|
|
|
$v{DEB_TARGET_ARCH} = $req_target_arch || $req_host_arch || get_raw_host_arch()
|
|
|
if (action_needs(DEB_TARGET));
|
|
|
-($abi, $libc, $v{DEB_TARGET_ARCH_OS}, $v{DEB_TARGET_ARCH_CPU}) = debarch_to_debtuple($v{DEB_TARGET_ARCH})
|
|
|
+($v{DEB_TARGET_ARCH_ABI}, $v{DEB_TARGET_ARCH_LIBC},
|
|
|
+ $v{DEB_TARGET_ARCH_OS}, $v{DEB_TARGET_ARCH_CPU}) = debarch_to_debtuple($v{DEB_TARGET_ARCH})
|
|
|
if (action_needs(DEB_TARGET | DEB_ARCH_INFO));
|
|
|
($v{DEB_TARGET_ARCH_BITS}, $v{DEB_TARGET_ARCH_ENDIAN}) = debarch_to_cpuattrs($v{DEB_TARGET_ARCH})
|
|
|
if (action_needs(DEB_TARGET | DEB_ARCH_ATTR));
|