Merge pull request #1257 from craigcomstock/INF-3402-2/3.18

INF-3402: Added aix71 label back now that build host is prepared (3.18)
cfengine · Aug 23, 2023 · cc74d5c · cc74d5c
2 parents 7bce027 + 65b29a5
commit cc74d5c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/build-scripts/exotics.txt b/build-scripts/exotics.txt
@@ -6,6 +6,7 @@ PACKAGES_x86_64_linux_suse_15
 
 PACKAGES_ia64_hpux_11.23
 PACKAGES_ppc64_aix_53
+PACKAGES_ppc64_aix_71
 PACKAGES_sparc64_solaris_10
 PACKAGES_sparc64_solaris_11
 PACKAGES_x86_64_solaris_10
diff --git a/build-scripts/functions b/build-scripts/functions
@@ -93,7 +93,9 @@ export_variables ()
     case $UNAME_S in
         AIX)
             # We need to use GCC6 on new AIX 7 VMs (AIX 5 doesn't have the folder).
-            PATH="/opt/freeware/gcc6/bin/:$PATH" ;;
+            PATH="/opt/freeware/gcc6/bin/:$PATH"
+            # We need to use /opt/freeware/bin first, for e.g. wget and newer perl 5.34 on aix 7.1
+            PATH="/opt/freeware/bin:$PATH" ;;
         SunOS)
             # Currently we rely strongly on OpenCSW packages.
             PATH="/opt/csw/bin:/usr/xpg4/bin:$PATH"  ;;

diff --git a/build-scripts/labels.txt b/build-scripts/labels.txt
@@ -41,5 +41,6 @@ PACKAGES_x86_64_mingw
 PACKAGES_ia64_hpux_11.23
 PACKAGES_ppc64_aix_53
 PACKAGES_sparc64_solaris_10
+PACKAGES_ppc64_aix_71
 PACKAGES_sparc64_solaris_11
 PACKAGES_x86_64_solaris_10