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

haiku_devel: use relative symlinks to libraries in haiku package.

Browse Source 
* This helps with creating a sysroot, otherwise extracted package
  links refer to /system, which is outside of the sysroot.
* Should have no functional impact on Haiku, as these are already
  symlinks

Change-Id: I29f719dc2c0839dd090e7f33eea0b8f98e0d6355
Reviewed-on: https://review.haiku-os.org/c/haiku/+/4218
Tested-by: Commit checker robot <no-reply+buildbot@haiku-os.org>
Reviewed-by: Adrien Destugues <pulkomandy@gmail.com>
This commit is contained in:
Jessica Hamilton 2021-07-18 11:21:17 +00:00 committed by Adrien Destugues
parent b40866e65f
commit 8f362bfdfc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/jam/packages/HaikuDevel
View File

@ -28,12 +28,12 @@ AddFilesToPackage lib : $(developmentLibs) ;
# library symlinks
local lib ;
for lib in [ HaikuImageGetSystemLibs ] $(developmentLibs) {
AddSymlinkToPackage develop lib : /system/lib $(lib:BS) ;
AddSymlinkToPackage develop lib : ../../lib $(lib:BS) ;
local abiVersion = [ on $(lib) return $(HAIKU_LIB_ABI_VERSION) ] ;
if $(abiVersion) {
local abiVersionedLib = $(lib:BS).$(abiVersion) ;
AddSymlinkToPackage develop lib
: /system/lib $(abiVersionedLib) ;
: ../../lib $(abiVersionedLib) ;
}
}

4
build/jam/packages/HaikuDevelSecondary
View File

@ -23,12 +23,12 @@ AddFilesToPackage lib $(architecture) : $(developmentLibs) ;
local lib ;
for lib in [ HaikuImageGetSystemLibs ] $(developmentLibs) {
AddSymlinkToPackage develop lib $(architecture)
: /system/lib/$(architecture) $(lib:BS) ;
: ../../../lib/$(architecture) $(lib:BS) ;
local abiVersion = [ on $(lib) return $(HAIKU_LIB_ABI_VERSION) ] ;
if $(abiVersion) {
local abiVersionedLib = $(lib:BS).$(abiVersion) ;
AddSymlinkToPackage develop lib $(architecture)
: /system/lib/$(architecture) $(abiVersionedLib) ;
: ../../../lib/$(architecture) $(abiVersionedLib) ;
}
}