VirtualBox

Ignore:
Timestamp:
Jan 30, 2013 4:37:38 PM (12 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
83481
Message:

Additions/x11: rework checking missing symbols in the X server drivers and do not accept libc etc. symbols in the XFree86 ones.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/x11/vboxvideo/Makefile.kmk

    r44471 r44473  
    344344# Check the undefined symbols in the X.Org modules against lists of allowed
    345345# symbols.  Not very elegant, but it will catch problems early.
     346
    346347ifdef VBOX_WITH_TESTCASES
    347348# ifndef VBOX_ONLY_ADDITIONS
    … …  
    352353     VBOXVIDEO_SRC_PATH := $(PATH_SUB_CURRENT)
    353354
    354 if 0
    355 ##
    356 # Using the extra expansion to replace $(ver) before eval, thus everything
    357 # else needs escaped dollars.
    358 define def_vboxvideo_test
    359 TESTING += $$(vboxvideo_drv$(ver)_0_OUTDIR)/tstvboxvideo$(ver).run
    360 OTHERS  += $$(vboxvideo_drv$(ver)_0_OUTDIR)/tstvboxvideo$(ver).run
    361 $$$$(vboxvideo_drv_$(ver)_0_OUTDIR)/tstvboxvideo$(ver).run: $$$$(vboxvideo_drv$(ver)_1_STAGE_TARGET)
    362         $$(QUIET)$$(call MSG_L1,Checking for unresolved symbols in $$<)
    363         $$(QUIET)$$(ASH) $$(PATH_ROOT)/src/bldprogs/checkUndefined.sh $$(KBUILD_HOST)  \
    364             $$(vboxvideo_drv$(ver)_1_STAGE_TARGET) $$(VBOXVIDEO_SRC_PATH)/undefined --static
    365         $$(QUIET)$$(APPEND) -t "$$@" "done"
    366 endef
    367 ver :=
    368 $(eval $(def_vboxvideo_test))
    369 $(foreach ver, _70 _71 _13 _14 _15 _16 _17 _18 _19 _110 _111 _112 _113, $(eval $(def_vboxvideo_test)))
    370 
    371 else  # old
    372 
    373355     ifeq ($(KBUILD_TARGET),linux)
    374356      TESTING += $(vboxvideo_drv_0_OUTDIR)/tstvboxvideo68.run
    … …  
    376358$$(vboxvideo_drv_0_OUTDIR)/tstvboxvideo68.run: $$(vboxvideo_drv_1_STAGE_TARGET)
    377359        $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
    378         $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST)  \
    379             $(vboxvideo_drv_1_STAGE_TARGET) $(VBOXVIDEO_SRC_PATH)/undefined --static
     360        $(QUIET)$(ASH) $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST)  \
     361            $(vboxvideo_drv_1_STAGE_TARGET) --static $(VBOXVIDEO_SRC_PATH)/undefined
    380362        $(QUIET)$(APPEND) -t "$@" "done"
    381363     endif
    382364
    383      TESTING += $(vboxvideo_drv_70_0_OUTDIR)/tstvboxvideo70.run
    384      OTHERS += $(vboxvideo_drv_70_0_OUTDIR)/tstvboxvideo70.run
    385 $$(vboxvideo_drv_70_0_OUTDIR)/tstvboxvideo70.run: $$(vboxvideo_drv_70_1_STAGE_TARGET)
    386         $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
    387         $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST)  \
    388             $(vboxvideo_drv_70_1_STAGE_TARGET) $(VBOXVIDEO_SRC_PATH)/undefined
    389         $(QUIET)$(APPEND) -t "$@" "done"
    390 
    391      TESTING += $(vboxvideo_drv_71_0_OUTDIR)/tstvboxvideo71.run
    392      OTHERS += $(vboxvideo_drv_71_0_OUTDIR)/tstvboxvideo71.run
    393 $$(vboxvideo_drv_71_0_OUTDIR)/tstvboxvideo71.run: $$(vboxvideo_drv_71_1_STAGE_TARGET)
    394         $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
    395         $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST)  \
    396             $(vboxvideo_drv_71_1_STAGE_TARGET) $(VBOXVIDEO_SRC_PATH)/undefined
    397         $(QUIET)$(APPEND) -t "$@" "done"
    398 
    399      TESTING += $(vboxvideo_drv_13_0_OUTDIR)/tstvboxvideo13.run
    400      OTHERS += $(vboxvideo_drv_13_0_OUTDIR)/tstvboxvideo13.run
    401 $$(vboxvideo_drv_13_0_OUTDIR)/tstvboxvideo13.run: $$(vboxvideo_drv_13_1_STAGE_TARGET)
    402         $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
    403         $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST)  \
    404             $(vboxvideo_drv_13_1_STAGE_TARGET) $(VBOXVIDEO_SRC_PATH)/undefined
    405         $(QUIET)$(APPEND) -t "$@" "done"
    406 
    407      TESTING += $(vboxvideo_drv_14_0_OUTDIR)/tstvboxvideo14.run
    408      OTHERS += $(vboxvideo_drv_14_0_OUTDIR)/tstvboxvideo14.run
    409 $$(vboxvideo_drv_14_0_OUTDIR)/tstvboxvideo14.run: $$(vboxvideo_drv_14_1_STAGE_TARGET)
    410         $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
    411         $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST)  \
    412             $(vboxvideo_drv_14_1_STAGE_TARGET) $(VBOXVIDEO_SRC_PATH)/undefined
    413         $(QUIET)$(APPEND) -t "$@" "done"
    414 
    415      TESTING += $(vboxvideo_drv_15_0_OUTDIR)/tstvboxvideo15.run
    416      OTHERS += $(vboxvideo_drv_15_0_OUTDIR)/tstvboxvideo15.run
    417 $$(vboxvideo_drv_15_0_OUTDIR)/tstvboxvideo15.run: $$(vboxvideo_drv_15_1_STAGE_TARGET)
    418         $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
    419         $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST)  \
    420             $(vboxvideo_drv_15_1_STAGE_TARGET) $(VBOXVIDEO_SRC_PATH)/undefined
    421         $(QUIET)$(APPEND) -t "$@" "done"
    422 
    423      TESTING += $(vboxvideo_drv_16_0_OUTDIR)/tstvboxvideo16.run
    424      OTHERS += $(vboxvideo_drv_16_0_OUTDIR)/tstvboxvideo16.run
    425 $$(vboxvideo_drv_16_0_OUTDIR)/tstvboxvideo16.run: $$(vboxvideo_drv_16_1_STAGE_TARGET)
    426         $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
    427         $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST)  \
    428             $(vboxvideo_drv_16_1_STAGE_TARGET) $(VBOXVIDEO_SRC_PATH)/undefined
    429         $(QUIET)$(APPEND) -t "$@" "done"
    430 
    431      TESTING += $(vboxvideo_drv_17_0_OUTDIR)/tstvboxvideo17.run
    432      OTHERS += $(vboxvideo_drv_17_0_OUTDIR)/tstvboxvideo17.run
    433 $$(vboxvideo_drv_17_0_OUTDIR)/tstvboxvideo17.run: $$(vboxvideo_drv_17_1_STAGE_TARGET)
    434         $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
    435         $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST)  \
    436             $(vboxvideo_drv_17_1_STAGE_TARGET) $(VBOXVIDEO_SRC_PATH)/undefined
    437         $(QUIET)$(APPEND) -t "$@" "done"
    438 
    439      TESTING += $(vboxvideo_drv_18_0_OUTDIR)/tstvboxvideo18.run
    440      OTHERS += $(vboxvideo_drv_18_0_OUTDIR)/tstvboxvideo18.run
    441 $$(vboxvideo_drv_18_0_OUTDIR)/tstvboxvideo18.run: $$(vboxvideo_drv_18_1_STAGE_TARGET)
    442         $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
    443         $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST)  \
    444             $(vboxvideo_drv_18_1_STAGE_TARGET) $(VBOXVIDEO_SRC_PATH)/undefined
    445         $(QUIET)$(APPEND) -t "$@" "done"
    446 
    447      TESTING += $(vboxvideo_drv_19_0_OUTDIR)/tstvboxvideo19.run
    448      OTHERS += $(vboxvideo_drv_19_0_OUTDIR)/tstvboxvideo19.run
    449 $$(vboxvideo_drv_19_0_OUTDIR)/tstvboxvideo19.run: $$(vboxvideo_drv_19_1_STAGE_TARGET)
    450         $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
    451         $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST)  \
    452             $(vboxvideo_drv_19_1_STAGE_TARGET) $(VBOXVIDEO_SRC_PATH)/undefined
    453         $(QUIET)$(APPEND) -t "$@" "done"
    454 
    455      TESTING += $(vboxvideo_drv_110_0_OUTDIR)/tstvboxvideo110.run
    456      OTHERS += $(vboxvideo_drv_110_0_OUTDIR)/tstvboxvideo110.run
    457 $$(vboxvideo_drv_110_0_OUTDIR)/tstvboxvideo110.run: $$(vboxvideo_drv_110_1_STAGE_TARGET)
    458         $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
    459         $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST)  \
    460             $(vboxvideo_drv_110_1_STAGE_TARGET) $(VBOXVIDEO_SRC_PATH)/undefined
    461         $(QUIET)$(APPEND) -t "$@" "done"
    462 
    463      TESTING += $(vboxvideo_drv_111_0_OUTDIR)/tstvboxvideo111.run
    464      OTHERS += $(vboxvideo_drv_111_0_OUTDIR)/tstvboxvideo111.run
    465 $$(vboxvideo_drv_111_0_OUTDIR)/tstvboxvideo111.run: $$(vboxvideo_drv_111_1_STAGE_TARGET)
    466         $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
    467         $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST)  \
    468             $(vboxvideo_drv_111_1_STAGE_TARGET) $(VBOXVIDEO_SRC_PATH)/undefined
    469         $(QUIET)$(APPEND) -t "$@" "done"
    470 
    471      TESTING += $(vboxvideo_drv_112_0_OUTDIR)/tstvboxvideo112.run
    472      OTHERS += $(vboxvideo_drv_112_0_OUTDIR)/tstvboxvideo112.run
    473 $$(vboxvideo_drv_112_0_OUTDIR)/tstvboxvideo112.run: $$(vboxvideo_drv_112_1_STAGE_TARGET)
    474         $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
    475         $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST)  \
    476             $(vboxvideo_drv_112_1_STAGE_TARGET) $(VBOXVIDEO_SRC_PATH)/undefined
    477         $(QUIET)$(APPEND) -t "$@" "done"
    478 
    479      TESTING += $(vboxvideo_drv_113_0_OUTDIR)/tstvboxvideo113.run
    480      OTHERS += $(vboxvideo_drv_113_0_OUTDIR)/tstvboxvideo113.run
    481 $$(vboxvideo_drv_113_0_OUTDIR)/tstvboxvideo113.run: $$(vboxvideo_drv_113_1_STAGE_TARGET)
    482         $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
    483         $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST)  \
    484             $(vboxvideo_drv_113_1_STAGE_TARGET) $(VBOXVIDEO_SRC_PATH)/undefined
    485         $(QUIET)$(APPEND) -t "$@" "done"
    486 endif # old
     365##
     366# Using the extra expansion to replace $(ver) before eval, thus everything
     367# else needs escaped dollars.
     368     define def_vboxvideo_test
     369      TESTING += $$(vboxvideo_drv$(ver)_0_OUTDIR)/tstvboxvideo$(ver).run
     370      OTHERS  += $$(vboxvideo_drv$(ver)_0_OUTDIR)/tstvboxvideo$(ver).run
     371      $$$$(vboxvideo_drv$(ver)_0_OUTDIR)/tstvboxvideo$(ver).run: $$$$(vboxvideo_drv$(ver)_1_STAGE_TARGET)
     372        $$(QUIET)$$(call MSG_L1,Checking for unresolved symbols in $$<)
     373        $$(QUIET)$$(ASH) $$(PATH_ROOT)/src/bldprogs/checkUndefined.sh $$(KBUILD_HOST)  \
     374                $$(vboxvideo_drv$(ver)_1_STAGE_TARGET) $$(VBOXVIDEO_SRC_PATH)/undefined $$(VBOXVIDEO_SRC_PATH)/undefined_extra
     375        $$(QUIET)$$(APPEND) -t "$$@" "done"
     376    endef
     377
     378    $(foreach ver, _70 _71 _13 _14 _15 _16 _17 _18 _19 _110 _111 _112 _113, $(eval $(def_vboxvideo_test)))
    487379
    488380    endif # ! VBOX_ONLY_SDK
    489381   endif # eq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
    490   endif # eq ($(KBUILD_TARGET),linux)
     382  endif # 1of ($(KBUILD_TARGET),linux solaris)
    491383 endif # ! VBOX_USE_SYSTEM_XORG_HEADERS
    492384# endif # ! VBOX_ONLY_ADDITIONS
Note: See TracChangeset for help on using the changeset viewer.

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