i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86_64/x86_gcc2: don't depend on libgcc_s, libstdc++, libsupc++.

Browse Source
This commit is contained in:
Jérôme Duval
2018-07-23 20:57:59 +02:00
parent 46f078c0a3
commit a27099f559
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/PackageRules
+1
View File
@@ -103,6 +103,7 @@ rule PreprocessPackageOrRepositoryInfo target : source : architecture
local sedReplacements = %HAIKU_PACKAGING_ARCH%,$(architecture) ; local sedReplacements = %HAIKU_PACKAGING_ARCH%,$(architecture) ;
if $(secondaryArchitecture) { if $(secondaryArchitecture) {
defines += HAIKU_SECONDARY_PACKAGING_ARCH=$(secondaryArchitecture) ; defines += HAIKU_SECONDARY_PACKAGING_ARCH=$(secondaryArchitecture) ;
defines += HAIKU_SECONDARY_PACKAGING_ARCH_$(secondaryArchitecture:U) ;
sedReplacements sedReplacements
+= %HAIKU_SECONDARY_PACKAGING_ARCH%,$(secondaryArchitecture) ; += %HAIKU_SECONDARY_PACKAGING_ARCH%,$(secondaryArchitecture) ;
sedReplacements += sedReplacements +=
src/data/package_infos/x86_64/haiku_secondary
+4
View File
@@ -22,7 +22,9 @@ provides {
requires { requires {
lib:libfreetype_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libfreetype_%HAIKU_SECONDARY_PACKAGING_ARCH%
#ifndef HAIKU_SECONDARY_PACKAGING_ARCH_X86_GCC2
lib:libgcc_s_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libgcc_s_%HAIKU_SECONDARY_PACKAGING_ARCH%
#endif
lib:libicudata_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicudata_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libicui18n_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicui18n_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libicuio_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicuio_%HAIKU_SECONDARY_PACKAGING_ARCH%
@@ -37,7 +39,9 @@ requires {
#endif #endif
lib:libsolv_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libsolv_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libsolvext_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libsolvext_%HAIKU_SECONDARY_PACKAGING_ARCH%
#ifndef HAIKU_SECONDARY_PACKAGING_ARCH_X86_GCC2
lib:libstdc++_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libstdc++_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libsupc++_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libsupc++_%HAIKU_SECONDARY_PACKAGING_ARCH%
#endif
lib:libz_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libz_%HAIKU_SECONDARY_PACKAGING_ARCH%
} }