Add package definition HaikuSecondaryBootstrap
A haiku_<arch>.hpkg package is produced for each secondary architecture.
This commit is contained in:
+19
-1
@@ -18,10 +18,18 @@ local archDependentPackages =
|
||||
HaikuCrossDevel
|
||||
;
|
||||
|
||||
local secondaryArchPackages ;
|
||||
if $(HAIKU_BOOTSTRAP_BUILD) {
|
||||
secondaryArchPackages += HaikuSecondaryBootstrap ;
|
||||
} else {
|
||||
secondaryArchPackages += HaikuSecondary ;
|
||||
}
|
||||
|
||||
|
||||
packages = $(packages:G=package-rules) ;
|
||||
archDependentPackages = $(archDependentPackages:G=package-rules) ;
|
||||
SEARCH on $(packages) $(archDependentPackages)
|
||||
secondaryArchPackages = $(secondaryArchPackages:G=package-rules) ;
|
||||
SEARCH on $(packages) $(archDependentPackages) $(secondaryArchPackages)
|
||||
= [ FDirName $(HAIKU_BUILD_RULES_DIR) packages ] ;
|
||||
|
||||
local package ;
|
||||
@@ -37,3 +45,13 @@ for package in $(archDependentPackages) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for package in $(secondaryArchPackages) {
|
||||
local architectureObject ;
|
||||
for architectureObject in
|
||||
[ MultiArchSubDirSetup $(TARGET_PACKAGING_ARCHS[2-]) ] {
|
||||
on $(architectureObject) {
|
||||
include $(package) ;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
local architecture = $(TARGET_PACKAGING_ARCH) ;
|
||||
|
||||
|
||||
local haikuPackage = haiku_$(architecture).hpkg ;
|
||||
HaikuPackage $(haikuPackage) ;
|
||||
|
||||
|
||||
# libs
|
||||
AddLibrariesToPackage lib $(architecture)
|
||||
: [ HaikuImageGetSystemLibs ] [ HaikuImageGetPrivateSystemLibs ] ;
|
||||
|
||||
# libnetwork.so replaces quite a few libraries
|
||||
if $(HAIKU_GCC_VERSION_$(architecture)[1]) = 2 {
|
||||
local libNetworkAliases = libsocket.so libbind.so libnet.so ;
|
||||
local lib ;
|
||||
for lib in $(libNetworkAliases) {
|
||||
AddSymlinkToPackage lib $(architecture) : libnetwork.so : $(lib) ;
|
||||
}
|
||||
|
||||
AddSymlinkToPackage lib $(architecture) : libbnetapi.so : libnetapi.so ;
|
||||
}
|
||||
|
||||
|
||||
BuildHaikuPackage $(haikuPackage) : haiku_secondary ;
|
||||
Reference in New Issue
Block a user