Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix haiku_cross_devel package(s).

Browse Source 
* those packages need to be installed on any system that wants to build
  for the respective target architecture, so they need to have the
  package architecture 'any'
* adjust to not require 'haiku', as that isn't needed and wouldn't be
  available either
* use concatenation by macro to inject the target architecture into the
  provides definition
This commit is contained in:
Oliver Tappe 2013-06-04 17:16:01 +02:00
parent eeddc9fd26
commit c915f7bafa
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/data/package_infos/generic/haiku_cross_devel
View File

@ -1,22 +1,21 @@
#define DO_CONCAT(a, b) a ## b
#define CONCAT(a, b) DO_CONCAT(a, b)
name haiku_cross_devel
version R1~alpha4_pm-1
architecture HAIKU_PACKAGING_ARCH
architecture any
summary "The Haiku base system files for cross development"
description "The package contains all files associated with the base system
needed for cross development, like static libraries, glue code, library symlinks,
header files, etc."
description "The package contains all files associated with the base \
system needed for cross development, like static libraries, glue code, \
library symlinks, header files, etc."
packager "The Haiku build system"
vendor "Haiku Project"
copyrights "2001-2011 Haiku, Inc. et al"
copyrights "2001-2013 Haiku, Inc. et al"
licenses "MIT"
provides {
haiku_cross_devel = R1~alpha4_pm-1
}
requires {
haiku == R1~alpha4_pm-1
CONCAT(haiku_cross_devel_, HAIKU_PACKAGING_ARCH) = R1~alpha4_pm-1
}

15
src/data/package_infos/generic/haiku_cross_devel_wrapper
View File

@ -1,10 +1,13 @@
#define DO_CONCAT(a, b) a ## b
#define CONCAT(a, b) DO_CONCAT(a, b)
name haiku_cross_devel_wrapper
version R1~alpha4_pm-1
architecture HAIKU_PACKAGING_ARCH
architecture any
summary "Contains a package with system files for cross development"
description "This package provides a package that contains all files
associated with the base system needed for cross development, like static
description "This package provides a package that contains all files \
associated with the base system needed for cross development, like static \
libraries, glue code, library symlinks, header files, etc."
packager "The Haiku build system"
@ -14,9 +17,5 @@ copyrights "2001-2013 Haiku, Inc. et al"
licenses "MIT"
provides {
haiku_cross_devel_wrapper = R1~alpha4_pm-1
}
requires {
haiku == R1~alpha4_pm-1
CONCAT(haiku_cross_devel_wrapper_, HAIKU_PACKAGING_ARCH) = R1~alpha4_pm-1
}