VirtualBox

Changeset 762 in vbox for trunk/src/VBox/Additions


Ignore:
Timestamp:
Feb 7, 2007 11:15:42 PM (18 years ago)
Author:
vboxsync
Message:
  • Additions, Config.kmk, Runtime:

o Make the additions build on linux.amd64. All the Ring-0 stuff is

skipped there because of /usr/linux/.config dependencies of the
linux stuff.

o While at it, I've removed the gcc as ld hacks and changed the

linking of the X drivers. The latter is a bit risky of course.

Location:
trunk/src/VBox/Additions
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/common/VBoxGuestLib/Makefile

    r1 r762  
    3232 endif
    3333endif
    34 ifdef VBOX_WITH_LINUX_ADDITIONS
     34ifdef VBOX_WITH_LINUX_ADDITIONS_32BIT_R0
    3535 LIBRARIES += \
    3636        VBoxGuestLibLinux \

  • trunk/src/VBox/Additions/linux/daemon/Makefile

    r1 r762  
    2626PROGRAMS = vboxadd-timesync
    2727
    28 vboxadd-timesync_TEMPLATE = VBOXLNX32GUESTR3EXE
     28vboxadd-timesync_TEMPLATE = VBOXLNX32GUESTR3EXENOCPP
    2929vboxadd-timesync_SOURCES  = \
    30     vboxadd_timesync.c supc++.c
     30    vboxadd_timesync.c \
     31    supc++.c
    3132vboxadd-timesync_LIBS     = \
    32     $(PATH_LIB)/VBoxGuestLibLinux.a \
    3333    $(PATH_LIB)/RuntimeLnx32GuestR3.a
     34#    $(PATH_LIB)/VBoxGuestLibLinux.a - what was this doing here? it's ring-0 library from what I can tell...
    3435vboxadd-timesync_DEFS     = _GNU_SOURCE
    35 
    36 # use gcc not g++ as linker to not depend on libstdc++
    37 TOOL_GCC3_LD              = $(TOOL_$(VBOX_GCC32_TOOL)_CC)
    38 
    39 # prevent generation of cross reference table (broken with some binutils)
    40 ## @todo r=bird: Why is this only a problem here and not for the 50 other binaries?
    41 TOOL_GCC3_LD_MAP          = -Wl,-Map -Wl,$(1)
    4236
    4337include $(PATH_KBUILD)/footer.kmk

  • trunk/src/VBox/Additions/linux/module/Makefile

    r719 r762  
    2323
    2424INSTALLS = vboxmod-bin
    25 SYSMODS.linux = vboxadd
     25ifdef VBOX_WITH_LINUX_ADDITIONS_32BIT_R0
     26SYSMODS = vboxadd
     27endif
    2628
    2729vboxmod-bin_INST    = bin/additions/src/vboxadd/

  • trunk/src/VBox/Additions/linux/xgraphics/Makefile

    r1 r762  
    2222include $(PATH_KBUILD)/header.kmk
    2323
    24 LIBRARIES   = vboxvideo vboxvideo_so_70 vboxvideo_so_71
    25 OTHERS      = \
    26         $(PATH_BIN)/additions/vboxvideo_drv.o \
    27         $(PATH_BIN)/additions/vboxvideo_drv_70.so \
    28         $(PATH_BIN)/additions/vboxvideo_drv_71.so
    29 OTHER_CLEAN = $(OTHERS)
     24SYSMODS = vboxvideo_drv
     25DLLS = vboxvideo_drv_70 vboxvideo_drv_71
    3026
    31 vboxvideo_NOINST   = 1
    32 vboxvideo_TEMPLATE = VBOXLNX32GUESTR3
    33 vboxvideo_SOURCES  = \
    34         vboxvideo.c \
    35         vboxutils.c
    3627
    37 vboxvideo_so_70_NOINST   = 1
    38 vboxvideo_so_70_TEMPLATE = VBOXLNX32GUESTR3
    39 vboxvideo_so_70_SOURCES  = \
    40         $(vboxvideo_SOURCES)
    41 
    42 vboxvideo_so_71_NOINST   = 1
    43 vboxvideo_so_71_TEMPLATE = VBOXLNX32GUESTR3
    44 vboxvideo_so_71_SOURCES  = \
    45         $(vboxvideo_SOURCES)
    46 
     28vboxvideo_drv_TEMPLATE = VBOXLNX32GUESTR3EXE
     29vboxvideo_drv_SYSSUFF = .o
     30vboxvideo_drv_DEFS = \
     31        linux __i386__ _POSIX_C_SOURCE=199309L _POSIX_SOURCE _XOPEN_SOURCE \
     32        _BSD_SOURCE _SVID_SOURCE _GNU_SOURCE SHAPE XINPUT XKB LBX XAPPGROUP \
     33        XCSECURITY TOGCUP XF86BIGFONT DPMSExtension PIXPRIV PANORAMIX RENDER \
     34        GCCUSESGAS AVOID_GLYPHBLT PIXPRIV SINGLEDEPTH XFreeXDGA XvExtension \
     35        XFree86LOADER XFree86Server XF86VIDMODE XvMCExtension SMART_SCHEDULE \
     36        BUILDDEBUG X_BYTE_ORDER=X_LITTLE_ENDIAN DNDEBUG FUNCPROTO=15 NARROWPROTO \
     37        IN_MODULE XFree86Module \
     38        IN_RING3 VBOX
     39vboxvideo_drv_CFLAGS.linux := \
     40        -fno-merge-constants -Wno-conversion -Wno-unused-parameter \
     41        $(VBOX_GCC_Wno-variadic-macros)
     42vboxvideo_drv_LDFLAGS.release = -S
    4743ARGB_CURSORS=1
    4844ifdef ARGB_CURSORS
    49 vboxvideo_INCS = \
     45vboxvideo_drv_INCS = \
    5046        ../x11include/4.3/include \
    5147        ../x11include/4.3/include/extensions \
    … …  
    7571        ../x11include/4.3/programs/Xserver/Xext
    7672else
    77 vboxvideo_INCS = \
     73vboxvideo_drv_INCS = \
    7874        ../x11include/4.2/exports/include/X11 \
    7975        ../x11include/4.2/include \
    … …  
    10399        ../x11include/4.2/programs/Xserver/Xext
    104100endif
     101vboxvideo_drv_SOURCES = \
     102        vboxvideo.c \
     103        vboxutils.c
    105104
    106 vboxvideo_so_70_INCS = \
     105
     106vboxvideo_drv_70_TEMPLATE = VBOXLNX32GUESTR3DLLNOCPP
     107vboxvideo_drv_70_DEFS := \
     108        XFree86Server IN_MODULE XFree86Module XFree86LOADER \
     109        IN_RING3 VBOX XORG_7X PIC RENDER=1
     110vboxvideo_drv_70_CFLAGS.linux := \
     111        -Wno-conversion -Wno-unused-parameter \
     112        $(VBOX_GCC_Wno-variadic-macros)
     113vboxvideo_drv_70_LDFLAGS = -s
     114vboxvideo_drv_70_INCS = \
    107115        ../x11include/7.0 \
    108116        ../x11include/7.0/X11 \
    109117        ../x11include/7.0/xorg
     118vboxvideo_drv_70_SOURCES  = \
     119        $(vboxvideo_drv_SOURCES)
    110120
    111 vboxvideo_so_71_INCS = \
     121
     122vboxvideo_drv_71_TEMPLATE = VBOXLNX32GUESTR3DLLNOCPP
     123vboxvideo_drv_71_DEFS := $(vboxvideo_drv_70_DEFS)
     124vboxvideo_drv_71_CFLAGS.linux := $(vboxvideo_drv_70_CFLAGS.linux)
     125vboxvideo_drv_71_LDFLAGS = -s
     126vboxvideo_drv_71_INCS = \
    112127        ../x11include/7.1 \
    113128        ../x11include/7.1/X11 \
    114129        ../x11include/7.1/xorg
     130vboxvideo_drv_71_SOURCES  = \
     131        $(vboxvideo_drv_SOURCES)
    115132
    116 vboxvideo_DEFS = \
    117         linux __i386__ _POSIX_C_SOURCE=199309L _POSIX_SOURCE _XOPEN_SOURCE \
    118         _BSD_SOURCE _SVID_SOURCE _GNU_SOURCE SHAPE XINPUT XKB LBX XAPPGROUP \
    119         XCSECURITY TOGCUP XF86BIGFONT DPMSExtension PIXPRIV PANORAMIX RENDER \
    120         GCCUSESGAS AVOID_GLYPHBLT PIXPRIV SINGLEDEPTH XFreeXDGA XvExtension \
    121         XFree86LOADER XFree86Server XF86VIDMODE XvMCExtension SMART_SCHEDULE \
    122         BUILDDEBUG X_BYTE_ORDER=X_LITTLE_ENDIAN DNDEBUG FUNCPROTO=15 NARROWPROTO \
    123         IN_MODULE XFree86Module \
    124         IN_RING3 VBOX
    125 
    126 vboxvideo_CFLAGS.linux := \
    127         -fno-merge-constants -Wno-conversion -Wno-unused-parameter \
    128         $(VBOX_GCC_Wno-variadic-macros)
    129 
    130 vboxvideo_so_70_DEFS := \
    131         XFree86Server IN_MODULE XFree86Module XFree86LOADER \
    132         IN_RING3 VBOX XORG_7X PIC RENDER=1
    133 vboxvideo_so_71_DEFS := $(vboxvideo_so_70_DEFS)
    134 
    135 vboxvideo_so_70_CFLAGS.linux := \
    136         -fPIC -Wno-conversion -Wno-unused-parameter \
    137         $(VBOX_GCC_Wno-variadic-macros)
    138 vboxvideo_so_71_CFLAGS.linux := $(vboxvideo_so_70_CFLAGS.linux)
    139133
    140134include $(PATH_KBUILD)/footer.kmk
    141135
    142 $(PATH_BIN)/additions/vboxvideo_drv.o: vboxvideo.c vboxutils.c
    143         $(call MSG_L1,Linking $@)
    144         $(QUIET)$(MKDIR) -p $(PATH_BIN)/additions
    145         $(QUIET)ld -r -o $@ $(PATH_vboxvideo)/vboxvideo.o $(PATH_vboxvideo)/vboxutils.o
    146 
    147 $(PATH_BIN)/additions/vboxvideo_drv_70.so: vboxvideo.c vboxutils.c
    148         $(call MSG_L1,Linking $@)
    149         $(QUIET)$(MKDIR) -p $(PATH_BIN)/additions
    150         $(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -shared -s -o $@ $(PATH_vboxvideo_so_70)/vboxvideo.o $(PATH_vboxvideo_so_70)/vboxutils.o
    151 
    152 $(PATH_BIN)/additions/vboxvideo_drv_71.so: vboxvideo.c vboxutils.c
    153         $(call MSG_L1,Linking $@)
    154         $(QUIET)$(MKDIR) -p $(PATH_BIN)/additions
    155         $(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -shared -s -o $@ $(PATH_vboxvideo_so_71)/vboxvideo.o $(PATH_vboxvideo_so_71)/vboxutils.o
    156 

  • trunk/src/VBox/Additions/linux/xmouse/Makefile

    r52 r762  
    2222include $(PATH_KBUILD)/header.kmk
    2323
    24 LIBRARIES   = vboxmouse vboxmouse_so_70 vboxmouse_so_71
    25 OTHERS      = \
    26         $(PATH_BIN)/additions/vboxmouse_drv.o \
    27         $(PATH_BIN)/additions/vboxmouse_drv_70.so \
    28         $(PATH_BIN)/additions/vboxmouse_drv_71.so
    29 OTHER_CLEAN = $(OTHERS)
     24SYSMODS = vboxmouse_drv
     25DLLS = vboxmouse_drv_70 vboxmouse_drv_71
     26#LIBRARIES   = vboxmouse vboxmouse_so_70 vboxmouse_so_71
     27#OTHERS      = \
     28#       $(PATH_BIN)/additions/vboxmouse_drv.o \
     29#       $(PATH_BIN)/additions/vboxmouse_drv_70.so \
     30#       $(PATH_BIN)/additions/vboxmouse_drv_71.so
     31#OTHER_CLEAN = $(OTHERS)
    3032
    31 vboxmouse_NOINST   = 1
    32 vboxmouse_TEMPLATE = VBOXLNX32GUESTR3
    33 vboxmouse_SOURCES  = \
    34         mouse.c \
    35         pnp.c \
    36         VBoxUtils.c
    3733
    38 vboxmouse_so_70_NOINST   = 1
    39 vboxmouse_so_70_TEMPLATE = VBOXLNX32GUESTR3
    40 vboxmouse_so_70_SOURCES  = \
    41         xorg70/mouse.c \
    42         xorg70/pnp.c \
    43         VBoxUtils.c
    44 
    45 vboxmouse_so_71_NOINST   = 1
    46 vboxmouse_so_71_TEMPLATE = VBOXLNX32GUESTR3
    47 vboxmouse_so_71_SOURCES  = \
    48         xorg71/mouse.c \
    49         xorg71/pnp.c \
    50         VBoxUtils.c
    51 
    52 vboxmouse_INCS = \
     34vboxmouse_drv_TEMPLATE = VBOXLNX32GUESTR3EXE
     35vboxmouse_drv_DEFS = \
     36        linux __i386__ _POSIX_C_SOURCE=199309L _POSIX_SOURCE _XOPEN_SOURCE \
     37        _BSD_SOURCE _SVID_SOURCE _GNU_SOURCE SHAPE XINPUT XKB LBX XAPPGROUP \
     38        XCSECURITY TOGCUP XF86BIGFONT DPMSExtension PIXPRIV PANORAMIX RENDER \
     39        GCCUSESGAS AVOID_GLYPHBLT PIXPRIV SINGLEDEPTH XFreeXDGA XvExtension \
     40        XFree86LOADER XFree86Server XF86VIDMODE XvMCExtension SMART_SCHEDULE \
     41        BUILDDEBUG X_BYTE_ORDER=X_LITTLE_ENDIAN DNDEBUG FUNCPROTO=15 NARROWPROTO \
     42        IN_MODULE XFree86Module PNP_MOUSE \
     43        IN_RING3 VBOX
     44vboxmouse_drv_CFLAGS = -fno-merge-constants
     45vboxmouse_drv_SYSSUFF = .o
     46vboxmouse_drv_LDFLAGS.release = -S
     47vboxmouse_drv_INCS = \
    5348        ../x11include/4.2/exports/include/X11 \
    5449        ../x11include/4.2/include \
    … …  
    6156        ../x11include/4.2/programs/Xserver/mi \
    6257        $(PATH_ROOT)/include
     58vboxmouse_drv_SOURCES  = \
     59        mouse.c \
     60        pnp.c \
     61        VBoxUtils.c
    6362
    64 vboxmouse_so_70_INCS = \
     63
     64vboxmouse_drv_70_TEMPLATE = VBOXLNX32GUESTR3DLLNOCPP
     65vboxmouse_drv_70_DEFS = \
     66        XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT \
     67        IN_RING3 VBOX XORG_7X PIC
     68vboxmouse_drv_70_LDFLAGS = -s
     69vboxmouse_drv_70_INCS = \
    6570        ../x11include/7.0 \
    6671        ../x11include/7.0/X11 \
    6772        ../x11include/7.0/xorg
     73vboxmouse_drv_70_SOURCES  = \
     74        xorg70/mouse.c \
     75        xorg70/pnp.c \
     76        VBoxUtils.c
    6877
    69 vboxmouse_so_71_INCS = \
     78
     79vboxmouse_drv_71_TEMPLATE = VBOXLNX32GUESTR3DLLNOCPP
     80vboxmouse_drv_71_DEFS = $(vboxmouse_drv_70_DEFS)
     81vboxmouse_drv_71_LDFLAGS = -s
     82vboxmouse_drv_71_INCS = \
    7083        ../x11include/7.1 \
    7184        ../x11include/7.1/X11 \
    7285        ../x11include/7.1/xorg
    73 
    74 vboxmouse_DEFS = \
    75         linux __i386__ _POSIX_C_SOURCE=199309L _POSIX_SOURCE _XOPEN_SOURCE \
    76         _BSD_SOURCE _SVID_SOURCE _GNU_SOURCE SHAPE XINPUT XKB LBX XAPPGROUP \
    77         XCSECURITY TOGCUP XF86BIGFONT DPMSExtension PIXPRIV PANORAMIX RENDER \
    78         GCCUSESGAS AVOID_GLYPHBLT PIXPRIV SINGLEDEPTH XFreeXDGA XvExtension \
    79         XFree86LOADER XFree86Server XF86VIDMODE XvMCExtension SMART_SCHEDULE \
    80         BUILDDEBUG X_BYTE_ORDER=X_LITTLE_ENDIAN DNDEBUG FUNCPROTO=15 NARROWPROTO \
    81         IN_MODULE XFree86Module PNP_MOUSE \
    82         IN_RING3 VBOX
    83 
    84 vboxmouse_so_70_DEFS = \
    85         XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT \
    86         IN_RING3 VBOX XORG_7X PIC
    87 
    88 vboxmouse_so_71_DEFS   := $(vboxmouse_so_70_DEFS)
    89 
    90 vboxmouse_CFLAGS       := -fno-merge-constants
    91 vboxmouse_so_70_CFLAGS := -fPIC
    92 vboxmouse_so_71_CFLAGS := $(vboxmouse_so_70_CFLAGS)
     86vboxmouse_drv_71_SOURCES  = \
     87        xorg71/mouse.c \
     88        xorg71/pnp.c \
     89        VBoxUtils.c
    9390
    9491
    9592include $(PATH_KBUILD)/footer.kmk
    9693
    97 $(PATH_BIN)/additions/vboxmouse_drv.o: mouse.c pnp.c VBoxUtils.c
    98         $(call MSG_L1,Linking $@)
    99         $(QUIET)$(MKDIR) -p $(PATH_BIN)/additions
    100         $(QUIET)ld -r -o $@ $(PATH_vboxmouse)/mouse.o $(PATH_vboxmouse)/pnp.o $(PATH_vboxmouse)/VBoxUtils.o
     94#$(PATH_BIN)/additions/vboxmouse_drv.o: mouse.c pnp.c VBoxUtils.c
     95#       $(call MSG_L1,Linking $@)
     96#       $(QUIET)$(MKDIR) -p $(PATH_BIN)/additions
     97#       $(QUIET)ld -r -o $@ $(PATH_vboxmouse)/mouse.o $(PATH_vboxmouse)/pnp.o $(PATH_vboxmouse)/VBoxUtils.o
     98#
     99# This is a DLL...
     100#$(PATH_BIN)/additions/vboxmouse_drv_70.so: xorg70/mouse.c xorg70/pnp.c VBoxUtils.c
     101#       $(call MSG_L1,Linking $@)
     102#       $(QUIET)$(MKDIR) -p $(PATH_BIN)/additions
     103#       $(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -shared -s -o $@ $(PATH_vboxmouse_drv_70)/xorg70/mouse.o $(PATH_vboxmouse_drv_70)/xorg70/pnp.o $(PATH_vboxmouse_drv_70)/VBoxUtils.o
     104#
     105#$(PATH_BIN)/additions/vboxmouse_drv_71.so: xorg71/mouse.c xorg71/pnp.c VBoxUtils.c
     106#       $(call MSG_L1,Linking $@)
     107#       $(QUIET)$(MKDIR) -p $(PATH_BIN)/additions
     108#       $(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -shared -s -o $@ $(PATH_vboxmouse_drv_71)/xorg71/mouse.o $(PATH_vboxmouse_drv_71)/xorg71/pnp.o $(PATH_vboxmouse_drv_71)/VBoxUtils.o
    101109
    102 # This is a DLL...
    103 $(PATH_BIN)/additions/vboxmouse_drv_70.so: xorg70/mouse.c xorg70/pnp.c VBoxUtils.c
    104         $(call MSG_L1,Linking $@)
    105         $(QUIET)$(MKDIR) -p $(PATH_BIN)/additions
    106         $(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -shared -s -o $@ $(PATH_vboxmouse_so_70)/xorg70/mouse.o $(PATH_vboxmouse_so_70)/xorg70/pnp.o $(PATH_vboxmouse_so_70)/VBoxUtils.o
    107 
    108 $(PATH_BIN)/additions/vboxmouse_drv_71.so: xorg71/mouse.c xorg71/pnp.c VBoxUtils.c
    109         $(call MSG_L1,Linking $@)
    110         $(QUIET)$(MKDIR) -p $(PATH_BIN)/additions
    111         $(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -shared -s -o $@ $(PATH_vboxmouse_so_71)/xorg71/mouse.o $(PATH_vboxmouse_so_71)/xorg71/pnp.o $(PATH_vboxmouse_so_71)/VBoxUtils.o
    112 
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