VirtualBox

Changeset 34466 in vbox


Ignore:
Timestamp:
Nov 29, 2010 3:00:56 PM (14 years ago)
Author:
vboxsync
Message:

Made RTManifest a build program, this drags in IPRT and libcrypto into the build program run.

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r34444 r34466  
    21802180 VBOX_OPENSSL_ALL = 1
    21812181endif
     2182
     2183SDK_VBOX_BLD_OPENSSL      = .
     2184SDK_VBOX_BLD_OPENSSL_EXTENDS = VBOX_OPENSSL
     2185SDK_VBOX_BLD_OPENSSL_LIBS ?= $(PATH_LIB)/VBoxBldProg-libcrypto$(VBOX_SUFF_LIB)
    21822186
    21832187VBOX_WITH_LIBCURL = 1
    … …  
    38623866TEMPLATE_VBOXBLDPROG_CFLAGS.profile      = $(TEMPLATE_VBOXBLDPROG_CXXFLAGS.profile)
    38633867TEMPLATE_VBOXBLDPROG_CFLAGS.kprofile     = $(TEMPLATE_VBOXBLDPROG_CXXFLAGS.kprofile)
    3864 TEMPLATE_VBOXBLDPROG_CXXFLAGS            = -g -pipe $(VBOX_GCC_PEDANTIC_CXX)
     3868TEMPLATE_VBOXBLDPROG_CXXFLAGS            = -g -pipe $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros)
    38653869TEMPLATE_VBOXBLDPROG_CXXFLAGS.x86        = -m32
    38663870TEMPLATE_VBOXBLDPROG_CXXFLAGS.sparc32    = -m32
    … …  
    39383942
    39393943#
     3944# Advanced build programs using IPRT, openssl and worse stuff.
     3945#
     3946TEMPLATE_VBoxAdvBldProg = Advanced VBox Build Program
     3947TEMPLATE_VBoxAdvBldProg_EXTENDS = VBOXBLDPROG
     3948TEMPLATE_VBoxAdvBldProg_SDKS    = $(TEMPLATE_VBOXBLDPROG_SDKS) VBOX_BLD_OPENSSL
     3949TEMPLATE_VBoxAdvBldProg_DEFS    = $(TEMPLATE_VBOXBLDPROG_DEFS) IN_RT_R3
     3950TEMPLATE_VBoxAdvBldProg_LIBS    = \
     3951        $(PATH_LIB)/RuntimeBldProg$(VBOX_SUFF_LIB) \
     3952        $(TEMPLATE_VBOXBLDPROG_LIBS)
     3953TEMPLATE_VBoxAdvBldProg_LIBS.darwin = \
     3954        iconv \
     3955        $(TEMPLATE_VBOXBLDPROG_LIBS.darwin)
     3956TEMPLATE_VBoxAdvBldProg_LIBS.freebsd = \
     3957        iconv \
     3958        rt \
     3959        $(TEMPLATE_VBOXBLDPROG_LIBS.freebsd)
     3960TEMPLATE_VBoxAdvBldProg_LIBS.linux = \
     3961        crypt \
     3962        $(TEMPLATE_VBOXBLDPROG_LIBS.linux)
     3963TEMPLATE_VBoxAdvBldProg_LIBS.solaris = \
     3964        kstat \
     3965        contract \
     3966        $(TEMPLATE_VBOXBLDPROG_LIBS.solaris)
     3967
     3968
     3969#
    39403970# Windows rc workaround for crosscompiling.
    39413971# (Some (old) Wine versions fails loading msvcrt.dll from the VCC bin directory.)

  • trunk/configure

    r33515 r34466  
    851851        cnf_append "SDK_VBOX_OPENSSL_INCS" "`strip_I "$INCCRYPTO"`"
    852852        cnf_append "SDK_VBOX_OPENSSL_LIBS" "`strip_l "$LIBCRYPTO"`"
     853        cnf_append "SDK_VBOX_BLD_OPENSSL_LIBS" "`strip_l "$LIBCRYPTO"`"
    853854      fi
    854855    fi

  • trunk/configure.vbs

    r31874 r34466  
    20382038   CfgPrint "SDK_VBOX_OPENSSL_INCS := " & strPathSsl & "/include"
    20392039   CfgPrint "SDK_VBOX_OPENSSL_LIBS := " & strPathSsl & "/lib/ssleay32.lib" & " " & strPathSsl & "/lib/libeay32.lib"
     2040   CfgPrint "SDK_VBOX_BLD_OPENSSL_LIBS := " & strPathSsl & "/lib/ssleay32.lib" & " " & strPathSsl & "/lib/libeay32.lib"
    20402041
    20412042   PrintResult "openssl", strPathSsl

  • trunk/src/VBox/Runtime/Makefile.kmk

    r34464 r34466  
    6262
    6363 BLDPROGS += uniread
    64  LIBRARIES += RuntimeR3 RuntimeR0 RuntimeEFCPP RuntimeR3NoCRTGCC
     64 LIBRARIES += RuntimeR3 RuntimeBldProg RuntimeR0 RuntimeEFCPP RuntimeR3NoCRTGCC
    6565 LIBRARIES.win += RuntimeR0Stub
    6666 ifdef VBOX_WITH_RAW_MODE
    … …  
    185185#
    186186RuntimeR3_TEMPLATE      = VBoxR3Static
    187 RuntimeR3_SDKS          = VBOX_LIBXML2 VBOX_BOOST
     187RuntimeR3_SDKS          = VBOX_LIBXML2 VBOX_OPENSSL VBOX_BOOST ## @todo why is BOOST and XML2 here? r3/xml.cpp is not in this lib...
    188188RuntimeR3_SDKS.win      = WINPSDK $(VBOX_WINDDK)
    189189RuntimeR3_DEFS          = IN_RT_R3 IN_SUP_R3 LDR_WITH_NATIVE LDR_WITH_ELF32 LDR_WITH_PE RT_WITH_VBOX RT_NO_GIP
    … …  
    234234        common/checksum/ipv4.cpp \
    235235        common/checksum/ipv6.cpp \
     236        common/checksum/manifest.cpp \
     237        common/checksum/manifest2.cpp \
     238        common/checksum/manifest3.cpp \
     239        common/checksum/manifest-file.cpp \
     240        common/checksum/RTSha1Digest.cpp \
     241        common/checksum/sha1.cpp \
     242        common/checksum/sha1str.cpp \
     243        common/checksum/sha256.cpp \
     244        common/checksum/sha256str.cpp \
     245        common/checksum/sha512.cpp \
     246        common/checksum/sha512str.cpp \
    236247        common/dbg/dbg.cpp \
    237248        common/dbg/dbgas.cpp \
    … …  
    913924
    914925#
     926# RuntimeBldProg - Static Runtime for build programs.
     927#
     928# Note! This is a bit of hacky since kBuild doesn't support building libraries
     929#       for build programs.
     930#
     931RuntimeBldProg_TEMPLATE         := VBOXBLDPROG
     932RuntimeBldProg_EXTENDS          := RuntimeR3
     933RuntimeBldProg_BLD_TRG          := $(KBUILD_HOST)
     934RuntimeBldProg_BLD_TRG_ARCH     := $(KBUILD_HOST_ARCH)
     935RuntimeBldProg_BLD_TRG_CPU      := $(KBUILD_HOST_CPU)
     936
     937
     938#
    915939# RuntimeGuestR3 - Guest Additions Runtime (static/exe).
    916940# (The KBUILD_HOST inheritance here is for l4 cross building the linux
    … …  
    11081132VBoxRT_SOURCES                 = \
    11091133        VBox/VBoxRTDeps.cpp \
    1110         $(filter-out common/checksum/crc32.cpp, $(RuntimeR3_SOURCES))
    1111 VBoxRT_SOURCES                += \
    11121134        r3/xml.cpp \
    1113         common/checksum/RTSha1Digest.cpp \
    1114         common/checksum/crc32-zlib.cpp \
    1115         common/checksum/manifest.cpp \
    1116         common/checksum/manifest2.cpp \
    1117         common/checksum/manifest3.cpp \
    1118         common/checksum/manifest-file.cpp \
    1119         common/checksum/sha1.cpp \
    1120         common/checksum/sha1str.cpp \
    1121         common/checksum/sha256.cpp \
    1122         common/checksum/sha256str.cpp \
    1123         common/checksum/sha512.cpp \
    1124         common/checksum/sha512str.cpp
     1135        $(filter-out common/checksum/crc32.cpp, $(RuntimeR3_SOURCES)) \
     1136        common/checksum/crc32-zlib.cpp
    11251137ifdef VBOX_WITH_LIBCURL
    11261138 VBoxRT_SOURCES               += common/misc/s3.cpp
    … …  
    19131925 $(lib)_common/err/errmsgxpcom.cpp_DEPS = $(IPRT_OUT_DIR)/errmsgvboxcomdata.h
    19141926endef
    1915 $(foreach lib,RuntimeR3 VBoxRT RuntimeLnxHostR3,$(eval $(def_errmsgwin_deps)))
     1927$(foreach lib,RuntimeR3 RuntimeBldProg VBoxRT RuntimeLnxHostR3,$(eval $(def_errmsgwin_deps)))
    19161928
    19171929

  • trunk/src/VBox/Runtime/tools/Makefile.kmk

    r34464 r34466  
    3333RTManifest_SOURCES = RTManifest.cpp
    3434
     35BLDPROGS += bldRTManifest
     36bldRTManifest_TEMPLATE = VBoxAdvBldProg
     37bldRTManifest_SOURCES  = RTManifest.cpp
     38
    3539# RTLdrFlt is similar to c++filt, except that it's for VMMR0.r0 stacks.
    3640PROGRAMS += RTLdrFlt

  • trunk/src/VBox/Runtime/tools/RTManifest.cpp

    r34464 r34466  
    3838#include <iprt/message.h>
    3939#include <iprt/path.h>
     40#include <iprt/process.h>
    4041#include <iprt/stream.h>
    4142#include <iprt/string.h>
    … …  
    361362
    362363            case 'h':
    363                 RTMsgInfo("Usage: %s [--manifest <file>] [--chdir <dir>] [--attribute <attrib-name> [..]] <files>\n"
    364                           "   or  %s --verify [--manifest <file>] [--chdir <dir>]\n"
    365                           "\n"
    366                           "attrib-name: size, md5, sha1, sha256 or sha512\n"
    367                           , argv[0], argv[0]);
     364                RTPrintf("Usage: %s [--manifest <file>] [--chdir <dir>] [--attribute <attrib-name> [..]] <files>\n"
     365                         "   or  %s --verify [--manifest <file>] [--chdir <dir>]\n"
     366                         "\n"
     367                         "attrib-name: size, md5, sha1, sha256 or sha512\n"
     368                         , RTProcShortName(), RTProcShortName());
    368369                return RTEXITCODE_SUCCESS;
    369370
Note: See TracChangeset for help on using the changeset viewer.

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