diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2015-06-11 12:02:26 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-06-11 12:02:58 +0000 |
commit | 70975c557510bdc77293131582c59f7f37a5de22 (patch) | |
tree | d6dc8fe938742283841aab5c1ed08ef2cefbace0 /main/abuild/0001-abuild-fix-provides-and-install_if-in-subpackages.patch | |
parent | c4285b80cfddd5c3af79d9cfab20510830207e5f (diff) | |
download | aports-70975c557510bdc77293131582c59f7f37a5de22.tar.bz2 aports-70975c557510bdc77293131582c59f7f37a5de22.tar.xz |
main/abuild: another fix for provides in subpackages
Diffstat (limited to 'main/abuild/0001-abuild-fix-provides-and-install_if-in-subpackages.patch')
-rw-r--r-- | main/abuild/0001-abuild-fix-provides-and-install_if-in-subpackages.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/main/abuild/0001-abuild-fix-provides-and-install_if-in-subpackages.patch b/main/abuild/0001-abuild-fix-provides-and-install_if-in-subpackages.patch new file mode 100644 index 0000000000..275e52393e --- /dev/null +++ b/main/abuild/0001-abuild-fix-provides-and-install_if-in-subpackages.patch @@ -0,0 +1,58 @@ +From 0e58eeff8089c8c148c20a5e239d618095ec434f Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Thu, 11 Jun 2015 11:56:04 +0000 +Subject: [PATCH] abuild: fix provides and install_if in subpackages + +we need to clear provides set in global scope before splitting the +subpackages so the subpackage does not inherit main packages' provides. + +But at the same time, we must not clear the provides/install_if set in +the splitfunction itself. +--- + abuild.in | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +diff --git a/abuild.in b/abuild.in +index cb069f2..dc72d79 100644 +--- a/abuild.in ++++ b/abuild.in +@@ -683,6 +683,15 @@ postcheck() { + return 0 + } + ++pre_split() { ++ if [ -z "$subpkgname" ]; then ++ return 0 ++ fi ++ # the subpackages should not inherit those form main package ++ provides="" ++ install_if="" ++} ++ + prepare_subpackages() { + local i + cd "$startdir" +@@ -692,7 +701,7 @@ prepare_subpackages() { + msg "Running split function $func..." + local dir="$pkgbasedir/${i%:*}" name="${i%:*}" + ( subpkgdir="$dir" subpkgname="$name" \ +- $0 $func prepare_package \ ++ $0 pre_split $func prepare_package \ + && postcheck "$dir" "$name" ) || return 1 + done + postcheck "$pkgdir" "$pkgname" || return 1 +@@ -947,11 +956,6 @@ archcheck() { + + prepare_package() { + msg "Preparing ${subpkgname:+sub}package ${subpkgname:-$pkgname}..." +- if [ -n "$subpkgname" ]; then +- # the subpackages should not inherit those +- provides="" +- install_if="" +- fi + stripbin + prepare_metafiles \ + && prepare_trace_rpaths \ +-- +2.4.2 + |