Fork us on GitHub Follow us on Facebook Follow us on Twitter

Ticket #619: partial_and_parallel_builds.patch

File partial_and_parallel_builds.patch, 4.4 KB (added by Vojtech Horky, 5 years ago)

Fix partial and parallel builds (attempt #1)

  • uspace/Makefile

    === modified file 'uspace/Makefile'
     
    255255
    256256all: $(BUILDS) $(BUILDS_TESTS)
    257257
    258 $(BUILDS_TESTS): $(BUILDS)
     258$(BUILDS_TESTS): $(LIBC_BUILD) $(LIBS_BUILD) $(LIBN_BUILD)
    259259        $(MAKE) -C $(basename $@) all-test PRECHECK=$(PRECHECK)
    260260
    261261clean: $(CLEANS)
  • uspace/Makefile.common

    === modified file 'uspace/Makefile.common'
     
    179179endif
    180180
    181181ifeq ($(STATIC_BUILD),y)
    182         BASE_LIBS = $(LIBC_PREFIX)/libc.a $(LIBSOFTINT_PREFIX)/libsoftint.a
     182        BASE_LIBS = $(LIBC_PREFIX)/libc.a $(LIBURCU_PREFIX)/liburcu.a $(LIBSOFTINT_PREFIX)/libsoftint.a
    183183        LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld
    184184        ifeq ($(MATH),y)
    185185                BASE_LIBS += $(LIBMATH_PREFIX)/libmath.a
     
    314314        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    315315endif
    316316
     317
     318ifneq ($(MAKECMDGOALS),clean)
    317319-include $(DEPEND)
     320endif
    318321
    319322OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    320323LOBJECTS := $(addsuffix .lo,$(basename $(SOURCES)))
     
    354357endif
    355358
    356359ifneq ($(LIBRARY),)
    357 %.a: $(OBJECTS)
     360$(LIBRARY).a: $(OBJECTS)
    358361        $(AR) rc $@ $(OBJECTS)
    359362endif
    360363
    361364ifneq ($(SLIBRARY),)
    362 %.la: $(LOBJECTS)
     365$(SLIBRARY).la: $(LOBJECTS)
    363366        $(AR) rc $@ $(LOBJECTS)
    364367endif
    365368
  • uspace/app/barber/Makefile

    === modified file 'uspace/app/barber/Makefile'
     
    8484
    8585include $(USPACE_PREFIX)/Makefile.common
    8686
    87 images.c images.h: $(IMAGES)
    88         $(ROOT_PATH)/tools/mkarray.py images COMPOSITOR_IMAGES $^
     87image%.c image%.h: $(IMAGES)
     88        $(ROOT_PATH)/tools/mkarray.py images COMPOSITOR_IMAGES $(IMAGES)
  • uspace/lib/c/Makefile

    === modified file 'uspace/lib/c/Makefile'
     
    4646SLIBRARY = libc.so.0.0
    4747LSONAME = libc.so0
    4848
    49 LIBS = $(LIBURCU_PREFIX)/liburcu.a
    5049EXTRA_CFLAGS += -I$(LIBURCU_PREFIX)
    5150
    5251-include $(CONFIG_MAKEFILE)
  • uspace/lib/ext4/Makefile

    === modified file 'uspace/lib/ext4/Makefile'
     
    2929USPACE_PREFIX = ../..
    3030LIBRARY = libext4
    3131EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX)
    32 LIBS = $(LIBBLOCK_PREFIX)/libblock.a
    3332
    3433SOURCES = \
    3534        libext4_balloc.c \
  • uspace/lib/nic/Makefile

    === modified file 'uspace/lib/nic/Makefile'
     
    2929USPACE_PREFIX = ../..
    3030LIBRARY = libnic
    3131EXTRA_CFLAGS += -DLIBNIC_INTERNAL -Iinclude -I$(LIBDRV_PREFIX)/include
    32 LIBS = $(LIBDRV_PREFIX)/libdrv.a
    3332
    3433SOURCES = \
    3534        src/nic_driver.c \
  • uspace/lib/pcut/Makefile

    === modified file 'uspace/lib/pcut/Makefile'
     
    55USPACE_PREFIX = ../..
    66PCUT_TEST_PREFIX = test-libpcut-
    77
    8 EXTRA_OUTPUT = \
     8SELF_TESTS = \
    99        $(PCUT_TEST_PREFIX)abort$(PCUT_TEST_SUFFIX) \
    1010        $(PCUT_TEST_PREFIX)asserts$(PCUT_TEST_SUFFIX) \
    1111        $(PCUT_TEST_PREFIX)beforeafter$(PCUT_TEST_SUFFIX) \
     
    2424        $(PCUT_TEST_PREFIX)timeout$(PCUT_TEST_SUFFIX) \
    2525        $(PCUT_TEST_PREFIX)xmlreport$(PCUT_TEST_SUFFIX)
    2626
     27EXTRA_CLEAN = $(SELF_TESTS)
     28
    2729include helenos.mak
    2830
    2931include $(USPACE_PREFIX)/Makefile.common
    3032
    3133include helenos.test.mak
    3234
     35all-test: $(SELF_TESTS)
     36
    3337test-libpcut-%: $(OUTPUT)
    3438        $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -o $@ $^ $(OUTPUT) $(BASE_LIBS)
    3539
  • uspace/lib/pcut/update-from-master.sh

    === modified file 'uspace/lib/pcut/update-from-master.sh'
     
    5858USPACE_PREFIX = ../..
    5959PCUT_TEST_PREFIX = test-libpcut-
    6060
    61 EXTRA_OUTPUT = \
     61SELF_TESTS = \
    6262EOF_MAKEFILE_HEAD
    6363
    6464for testfile in tests/*.expected; do
     
    6868
    6969cat >>Makefile <<'EOF_MAKEFILE_TAIL'
    7070
     71EXTRA_CLEAN = $(SELF_TESTS)
     72
    7173include helenos.mak
    7274
    7375include $(USPACE_PREFIX)/Makefile.common
    7476
    7577include helenos.test.mak
    7678
     79all-test: $(SELF_TESTS)
     80
    7781test-libpcut-%: $(OUTPUT)
    7882        $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -o $@ $^ $(OUTPUT) $(BASE_LIBS)
    7983
  • uspace/lib/urcu/Makefile

    === modified file 'uspace/lib/urcu/Makefile'
     
    2828
    2929USPACE_PREFIX = ../..
    3030
    31 LIBS = $(LIBC_PREFIX)/libc.a
    32 
    3331EXTRA_CFLAGS = -I. -I$(LIBC_PREFIX)/include
    3432
    3533LIBRARY = liburcu