i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions 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 <[email protected]>
Reviewed-by: Adrien Destugues <[email protected]>
This commit is contained in:
Jessica Hamilton
2021-09-11 11:12:10 +00:00
committed by Adrien Destugues
parent b40866e65f
commit 8f362bfdfc
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/packages/HaikuDevel
+2 -2
View File
@@ -28,12 +28,12 @@ AddFilesToPackage lib : $(developmentLibs) ;
# library symlinks # library symlinks
local lib ; local lib ;
for lib in [ HaikuImageGetSystemLibs ] $(developmentLibs) { 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) ] ; local abiVersion = [ on $(lib) return $(HAIKU_LIB_ABI_VERSION) ] ;
if $(abiVersion) { if $(abiVersion) {
local abiVersionedLib = $(lib:BS).$(abiVersion) ; local abiVersionedLib = $(lib:BS).$(abiVersion) ;
AddSymlinkToPackage develop lib AddSymlinkToPackage develop lib
: /system/lib $(abiVersionedLib) ; : ../../lib $(abiVersionedLib) ;
} }
} }
build/jam/packages/HaikuDevelSecondary
+2 -2
View File
@@ -23,12 +23,12 @@ AddFilesToPackage lib $(architecture) : $(developmentLibs) ;
local lib ; local lib ;
for lib in [ HaikuImageGetSystemLibs ] $(developmentLibs) { for lib in [ HaikuImageGetSystemLibs ] $(developmentLibs) {
AddSymlinkToPackage develop lib $(architecture) AddSymlinkToPackage develop lib $(architecture)
: /system/lib/$(architecture) $(lib:BS) ; : ../../../lib/$(architecture) $(lib:BS) ;
local abiVersion = [ on $(lib) return $(HAIKU_LIB_ABI_VERSION) ] ; local abiVersion = [ on $(lib) return $(HAIKU_LIB_ABI_VERSION) ] ;
if $(abiVersion) { if $(abiVersion) {
local abiVersionedLib = $(lib:BS).$(abiVersion) ; local abiVersionedLib = $(lib:BS).$(abiVersion) ;
AddSymlinkToPackage develop lib $(architecture) AddSymlinkToPackage develop lib $(architecture)
: /system/lib/$(architecture) $(abiVersionedLib) ; : ../../../lib/$(architecture) $(abiVersionedLib) ;
} }
} }