VirtualBox

Changeset 1564 in vbox


Ignore:
Timestamp:
Mar 20, 2007 1:27:04 AM (18 years ago)
Author:
vboxsync
Message:

Removed libuuid dependency.

Location:
trunk
Files:
1 deleted
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/Config.kmk

    r1546 r1564  
    702702
    703703# Overridable libraries (unix).
    704 LIB_UUID         ?= uuid
    705704LIB_PTHREAD      ?= pthread
    706705LIB_XCURSOR      ?= Xcursor
     
    13291328        -Wl,--rpath-link,$(L4_LIBDIR)
    13301329 ifeq ($(BUILD_TARGET),linux)
    1331 TEMPLATE_VBOXR3EXE_LIBS                = pthread m $(LIB_UUID) rt dl
     1330TEMPLATE_VBOXR3EXE_LIBS                = pthread m rt dl
    13321331 else ifeq ($(BUILD_TARGET),l4)
    13331332TEMPLATE_VBOXR3EXE_LIBS                = \
     
    15451544TEMPLATE_VBOXMAINEXE_INCS               += $(VBOX_XPCOM_INCS)
    15461545 ifeq ($(BUILD_TARGET),linux)
    1547 TEMPLATE_VBOXMAINEXE_LIBS                = pthread m $(LIB_UUID) rt
     1546TEMPLATE_VBOXMAINEXE_LIBS                = pthread m rt
    15481547 else ifeq ($(BUILD_TARGET),l4)
    15491548TEMPLATE_VBOXMAINEXE_LIBS                = $(LIB_RUNTIME)
     
    17921791TEMPLATE_VBOXBLDPROG_CXXFLAGS.kprofile   = $(TEMPLATE_VBOXBLDPROG_CXXFLAGS.release)
    17931792 ifeq ($(BUILD_PLATFORM),linux)
    1794 TEMPLATE_VBOXBLDPROG_LIBS                = pthread m $(LIB_UUID) rt dl
     1793TEMPLATE_VBOXBLDPROG_LIBS                = pthread m rt dl
    17951794 else ifeq ($(BUILD_PLATFORM),os2)
    17961795TEMPLATE_VBOXBLDPROG_TOOL                = GCC3OMF
  • trunk/configure

    r1542 r1564  
    4343INCXERCES=""
    4444LIBXERCES="-lxerces-c"
    45 LIBUUID="-luuid"
    4645INCSDL="/usr/include/SDL"
    4746LIBSDL="-lSDL"
     
    512511
    513512#
    514 # Check for uuid, needed by Runtime, VBoxSVC, VBoxSDL, and VBoxBFE
    515 #
    516 function check_uuid()
    517 {
    518   test_header uuid
    519   echo '
    520 #include <cstdio>
    521 #include <uuid/uuid.h>
    522 extern "C" int main(void)
    523 {
    524   uuid_t uu;
    525   uuid_clear(uu);
    526   if (uuid_is_null(uu)) {
    527     printf("found, OK.\n");
    528     return 0;
    529   } else {
    530     printf("uuid found but does not work\n");
    531     return 1;
    532   }
    533 }
    534 ' > .tmp_src.cc
    535   if test_compile $LIBUUID uuid uuid; then
    536     if test_execute; then
    537       cnf_append "LIB_UUID" `echo $LIBUUID|sed 's+-l++'`
    538     fi
    539   fi
    540 }
    541 
    542 #
    543513# Check for openssl, needed for RDP
    544514#
     
    12071177(($WITH_XPCOM==1)) && check_xerces
    12081178(($WITH_LIBIDL==1)) && check_libidl
    1209 [ "$OS" != "darwin" ] && check_uuid
    12101179(($OSE==0)) && check_ssl
    12111180[ "$OS" != "darwin" ] && check_pthread
  • trunk/src/VBox/Frontends/VBoxBFE/Makefile

    r994 r1564  
    101101VBoxBFE_LIBS.linux = \
    102102        $(LIB_RUNTIME) \
    103         $(LIB_UUID) \
    104103        $(LIB_XCURSOR)
    105104VBoxBFE_LIBS.l4 = \
  • trunk/src/VBox/Frontends/VBoxFB/Makefile

    r1 r1564  
    4141        $(LIB_PTHREAD) \
    4242        rt \
    43         $(LIB_UUID) \
    4443        directfb
    4544VBoxFB_LIBPATH    = \
  • trunk/src/VBox/Frontends/VBoxSDL/Makefile

    r798 r1564  
    7979        $(PATH_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL)
    8080 VBoxSDL_LIBS.linux = \
    81         $(LIB_UUID) \
    8281        $(LIB_XCURSOR)
    8382 VBoxSDL_LDFLAGS.darwin = \
  • trunk/src/VBox/Runtime/Makefile

    r1456 r1564  
    123123endif
    124124RuntimeR3_INCS.l4       = \
    125         $(PATH_ROOT)/src/libs/libuuid \
    126125        $(L4_INCDIR)
    127126# for iconv.h
     
    386385RuntimeR3L4_TEMPLATE      = VBOXR3NP
    387386RuntimeR3L4_DEFS          = IN_RT_R3 IN_SUP_R3 LDR_WITH_NATIVE LDR_WITH_ELF LDR_WITH_PE
    388 RuntimeR3L4_INCS          = $(L4_INCDIR) \
    389         $(PATH_ROOT)/src/libs/libuuid
     387RuntimeR3L4_INCS          = $(L4_INCDIR)
    390388
    391389RuntimeR3L4_SOURCES = \
     
    490488endif
    491489VBoxRT_LIBS.l4                 = \
    492         $(PATH_LIB)/VBox-uuid$(VBOX_SUFF_LIB) \
    493490        $(PATH_LIB)/RuntimeR3L4$(VBOX_SUFF_LIB)
    494491
  • trunk/src/libs/Makefile.kmk

    r601 r1564  
    2323
    2424
    25 subdirs.l4 = libuuid ## @todo Use uuid-generic.cpp !
    2625subdirs := liblzf-1.51 $(subdirs.$(BUILD_TARGET))
    2726ifndef VBOX_OSE
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy