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

Remove SYSTEM_LIBS*_ALIASES build variables

Browse Source
This commit is contained in:
Ingo Weinhold
2013-08-05 23:25:09 +02:00
parent 69c69a7d2a
commit e9a0ad7c4d
2 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/packages/Haiku
+2 -8
View File
@@ -91,11 +91,10 @@ AddLibrariesToPackage lib
: [ HaikuImageGetSystemLibs ] [ HaikuImageGetPrivateSystemLibs ] ; : [ HaikuImageGetSystemLibs ] [ HaikuImageGetPrivateSystemLibs ] ;
# libnetwork.so replaces quite a few libraries # libnetwork.so replaces quite a few libraries
SYSTEM_LIBS_LIBNETWORK_ALIASES = libsocket.so libbind.so libnet.so ;
if $(HAIKU_GCC_VERSION_$(architecture)[1]) = 2 { if $(HAIKU_GCC_VERSION_$(architecture)[1]) = 2 {
local libNetworkAliases = libsocket.so libbind.so libnet.so ;
local lib ; local lib ;
for lib in $(SYSTEM_LIBS_LIBNETWORK_ALIASES) { for lib in $(libNetworkAliases) {
AddSymlinkToPackage lib : libnetwork.so : $(lib) ; AddSymlinkToPackage lib : libnetwork.so : $(lib) ;
} }
@@ -103,11 +102,6 @@ if $(HAIKU_GCC_VERSION_$(architecture)[1]) = 2 {
} }
SYSTEM_LIBS_ALIASES =
$(SYSTEM_LIBS_LIBNETWORK_ALIASES)
libnetapi.so
;
# TODO: Remove when the packages have been rebuilt! # TODO: Remove when the packages have been rebuilt!
AddSymlinkToPackage lib : libbe.so : liblocale.so ; AddSymlinkToPackage lib : libbe.so : liblocale.so ;
build/jam/packages/HaikuBootstrap
+2 -8
View File
@@ -90,11 +90,10 @@ AddLibrariesToPackage lib
: [ HaikuImageGetSystemLibs ] [ HaikuImageGetPrivateSystemLibs ] ; : [ HaikuImageGetSystemLibs ] [ HaikuImageGetPrivateSystemLibs ] ;
# libnetwork.so replaces quite a few libraries # libnetwork.so replaces quite a few libraries
SYSTEM_LIBS_LIBNETWORK_ALIASES = libsocket.so libbind.so libnet.so ;
if $(HAIKU_GCC_VERSION_$(architecture)[1]) = 2 { if $(HAIKU_GCC_VERSION_$(architecture)[1]) = 2 {
local libNetworkAliases = libsocket.so libbind.so libnet.so ;
local lib ; local lib ;
for lib in $(SYSTEM_LIBS_LIBNETWORK_ALIASES) { for lib in $(libNetworkAliases) {
AddSymlinkToPackage lib : libnetwork.so : $(lib) ; AddSymlinkToPackage lib : libnetwork.so : $(lib) ;
} }
@@ -102,11 +101,6 @@ if $(HAIKU_GCC_VERSION_$(architecture)[1]) = 2 {
} }
SYSTEM_LIBS_ALIASES =
$(SYSTEM_LIBS_LIBNETWORK_ALIASES)
libnetapi.so
;
# servers # servers
AddFilesToPackage servers : $(SYSTEM_SERVERS) ; AddFilesToPackage servers : $(SYSTEM_SERVERS) ;