1 files changed, 45 insertions, 3 deletions

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 82aee3de..b40c38dd 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1475,6 +1475,24 @@ source_safe() {
 	shopt -s extglob
 }
 
+merge_arch_attrs() {
+	local attr supported_attrs=(
+		provides conflicts depends replaces optdepends
+		makedepends checkdepends)
+
+	for attr in "${supported_attrs[@]}"; do
+		eval "$attr+=(\"\${${attr}_$CARCH[@]}\")"
+	done
+
+	# ensure that calling this function is idempotent.
+	unset -v "${supported_attrs[@]/%/_$CARCH}"
+}
+
+source_buildfile() {
+	source_safe "$@"
+	merge_arch_attrs
+}
+
 run_function_safe() {
 	local restoretrap
 
@@ -1893,6 +1911,8 @@ write_pkginfo() {
 	local size="$(@DUPATH@ @DUFLAGS@)"
 	size="$(( ${size%%[^0-9]*} * 1024 ))"
 
+	merge_arch_attrs
+
 	msg2 "$(gettext "Generating %s file...")" ".PKGINFO"
 	printf "# Generated by makepkg %s\n" "$makepkg_version"
 	printf "# using %s\n" "$(fakeroot -v)"
@@ -2359,13 +2379,24 @@ lint_arch() {
 }
 
 lint_provides() {
-	local list name provides_list ret=0
+	local a list name provides_list ret=0
 
 	provides_list=("${provides[@]}")
+	for a in "${arch[@]}"; do
+		array_build list "provides_$a"
+		provides_list+=("${list[@]}")
+	done
+
 	for name in "${pkgname[@]}"; do
 		if extract_function_var "package_$name" provides 1 list; then
 			provides_list+=("${list[@]}")
 		fi
+
+		for a in "${arch[@]}"; do
+			if extract_function_var "package_$name" "provides_$a" 1 list; then
+				provides_list+=("${list[@]}")
+			fi
+		done
 	done
 
 	for provide in "${provides_list[@]}"; do
@@ -2399,13 +2430,24 @@ lint_backup() {
 }
 
 lint_optdepends() {
-	local list name optdepends_list ret=0
+	local a list name optdepends_list ret=0
 
 	optdepends_list=("${optdepends[@]}")
+	for a in "${arch[@]}"; do
+		array_build list "optdepends_$a"
+		optdepends_list+=("${list[@]}")
+	done
+
 	for name in "${pkgname[@]}"; do
 		if extract_function_var "package_$name" optdepends 1 list; then
 			optdepends_list+=("${list[@]}")
 		fi
+
+		for a in "${arch[@]}"; do
+			if extract_function_var "package_$name" "optdepends_$a" 1 list; then
+				optdepends_list+=("${list[@]}")
+			fi
+		done
 	done
 
 	for name in "${optdepends_list[@]}"; do
@@ -3161,7 +3203,7 @@ else
 	if [[ ${BUILDFILE:0:1} != "/" ]]; then
 		BUILDFILE="$startdir/$BUILDFILE"
 	fi
-	source_safe "$BUILDFILE"
+	source_buildfile "$BUILDFILE"
 fi
 
 # set defaults if they weren't specified in buildfile