From 2506bbb6f31e5988bd406be0e170636219527f89 Mon Sep 17 00:00:00 2001 From: shatty Date: Mon, 29 Nov 2004 00:19:29 +0000 Subject: [PATCH] utilize SELECT_UNAME_ETC_LIB git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10283 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- Jamrules | 2 ++ src/apps/bin/bash/Jamfile | 2 +- src/apps/bin/coreutils-5.0/src/Jamfile | 11 ++++++++--- src/apps/bin/sharutils-4.2.1/src/Jamfile | 2 +- src/apps/bin/vim/src/Jamfile | 2 +- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Jamrules b/Jamrules index 1f9383fd7e..bcb8c1a9cf 100644 --- a/Jamrules +++ b/Jamrules @@ -110,8 +110,10 @@ switch $(TARGET_PLATFORM) } if $(BONE_COMPATIBLE) { NETWORK_LIBS = libsocket.so libbind.so ; + SELECT_UNAME_ETC_LIB = libroot.so ; } else { NETWORK_LIBS = libnet.so ; + SELECT_UNAME_ETC_LIB = libnet.so ; } # Determine if we're building on PPC or x86 diff --git a/src/apps/bin/bash/Jamfile b/src/apps/bin/bash/Jamfile index 547d8d5a79..3ed1c39c6b 100644 --- a/src/apps/bin/bash/Jamfile +++ b/src/apps/bin/bash/Jamfile @@ -63,7 +63,7 @@ BinCommand sh : list.c stringlib.c locale.c findcmd.c redir.c pcomplete.c pcomplib.c syntax.c xmalloc.c test.c sig.c : libreadline.a libglob.a libbuiltins.a libtilde.a libsh.a - libtermcap.a + libtermcap.a $(SELECT_UNAME_ETC_LIB) : bash.rdef ; # trap.c includes signames.h diff --git a/src/apps/bin/coreutils-5.0/src/Jamfile b/src/apps/bin/coreutils-5.0/src/Jamfile index e8a8d51f85..b12a750470 100644 --- a/src/apps/bin/coreutils-5.0/src/Jamfile +++ b/src/apps/bin/coreutils-5.0/src/Jamfile @@ -30,7 +30,6 @@ StdBinCommands fmt.c fold.c head.c - hostname.c id.c join.c kill.c @@ -61,7 +60,6 @@ StdBinCommands sum.c sync.c tac.c - tail.c tee.c test.c touch.c @@ -69,7 +67,6 @@ StdBinCommands true.c tsort.c tty.c - uname.c unexpand.c uniq.c unlink.c @@ -78,6 +75,14 @@ StdBinCommands yes.c : libfetish.a : $(coreutils_rsrc) ; +# commands requiring select, uname, etc. + +StdBinCommands + hostname.c + tail.c + uname.c + : libfetish.a $(SELECT_UNAME_ETC_LIB) : $(coreutils_rsrc) ; + # stat.c # chroot.c # df.c diff --git a/src/apps/bin/sharutils-4.2.1/src/Jamfile b/src/apps/bin/sharutils-4.2.1/src/Jamfile index 5a4615534c..b36de89af2 100644 --- a/src/apps/bin/sharutils-4.2.1/src/Jamfile +++ b/src/apps/bin/sharutils-4.2.1/src/Jamfile @@ -9,7 +9,7 @@ ResComp $(sharutils_rsrc) : [ FGristFiles sharutils.rdef ] ; BinCommand shar : shar.c encode.c - : libsharutils.a + : libsharutils.a $(SELECT_UNAME_ETC_LIB) : sharutils.rsrc ; BinCommand unshar : diff --git a/src/apps/bin/vim/src/Jamfile b/src/apps/bin/vim/src/Jamfile index 77852c60d4..68c6ab97d1 100644 --- a/src/apps/bin/vim/src/Jamfile +++ b/src/apps/bin/vim/src/Jamfile @@ -56,7 +56,7 @@ BinCommand vim : os_beos.c version.c pathdef.c - : be libtermcap.a $(NETWORK_LIBS) + : be libtermcap.a $(SELECT_UNAME_ETC_LIB) : vim.rdef ; SEARCH on [ FGristFiles pathdef.c ] = [ FDirName $(SUBDIR) auto ] ;