Attachment #214077 for bug #298124

View | Details | Raw Unified | Return to bug 298124
Collapse All | Expand All

Lines 34-41 Link Here

(-)Mesa-7.7~orig/src/gallium/winsys/drm/intel/xorg/Makefile (-2 / +2 lines)
34	all default: $(TARGET)	34	all default: $(TARGET)
35		35
36	$(TARGET): $(OBJECTS) Makefile $(TOP)/src/gallium/state_trackers/xorg/libxorgtracker.a $(LIBS)	36	$(TARGET): $(OBJECTS) Makefile $(TOP)/src/gallium/state_trackers/xorg/libxorgtracker.a $(LIBS)
37	$(TOP)/bin/mklib -noprefix -o $@ \	37	$(TOP)/bin/mklib -noprefix -o $@ -linker '$(CC)' -ldflags '$(LDFLAGS)' \
38	$(OBJECTS) $(LIBS) $(shell pkg-config --libs libdrm) -ldrm_intel	38	$(OBJECTS) $(LIBS) $(shell pkg-config --libs libdrm) -ldrm_intel
39		39
40	clean:	40	clean:
41	rm -rf $(OBJECTS) $(TARGET)	41	rm -rf $(OBJECTS) $(TARGET)





$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(PIPE_DRIVERS) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
	$(MKLIB) -noprefix -o $@ \
		-linker '$(CC)' -ldflags '$(LDFLAGS)' \
		$(OBJECTS) $(PIPE_DRIVERS) \
                -Wl,--start-group $(MESA_MODULES) -Wl,--end-group \
                 $(WINOBJ) $(DRI_LIB_DEPS) $(DRIVER_EXTRAS)

$(LIBNAME_EGL): $(WINSYS_OBJECTS) $(LIBS)
	$(MKLIB) -o $(LIBNAME_EGL) \
		-linker '$(CC)' -ldflags '$(LDFLAGS)' \
		-noprefix \
		$(OBJECTS) $(MKLIB_OPTIONS) $(WINSYS_OBJECTS) $(PIPE_DRIVERS) $(WINOBJ) $(DRI_LIB_DEPS) \
		--whole-archive $(LIBS) $(GALLIUM_AUXILIARIES) --no-whole-archive $(DRIVER_EXTRAS)

Lines 38-45 Link Here

(-)Mesa-7.7~orig/src/gallium/winsys/drm/nouveau/xorg/Makefile (-2 / +2 lines)
38	all default: $(TARGET)	38	all default: $(TARGET)
39		39
40	$(TARGET): $(OBJECTS) Makefile $(TOP)/src/gallium/state_trackers/xorg/libxorgtracker.a $(LIBS)	40	$(TARGET): $(OBJECTS) Makefile $(TOP)/src/gallium/state_trackers/xorg/libxorgtracker.a $(LIBS)
41	$(TOP)/bin/mklib -noprefix -o $@ \	41	$(TOP)/bin/mklib -noprefix -o $@ -linker '$(CC)' -ldflags '$(LDFLAGS)' \
42	$(OBJECTS) $(LIBS) $(shell pkg-config --libs libdrm) -ldrm_nouveau	42	$(OBJECTS) $(LIBS) $(shell pkg-config --libs libdrm) -ldrm_nouveau
43		43
44	clean:	44	clean:
45	rm -rf $(OBJECTS) $(TARGET)	45	rm -rf $(OBJECTS) $(TARGET)

Lines 31-38 Link Here

(-)Mesa-7.7~orig/src/gallium/winsys/drm/radeon/xorg/Makefile (-2 / +2 lines)
31	all default: $(TARGET)	31	all default: $(TARGET)
32		32
33	$(TARGET): $(OBJECTS) Makefile $(GALLIUMDIR)/state_trackers/xorg/libxorgtracker.a	33	$(TARGET): $(OBJECTS) Makefile $(GALLIUMDIR)/state_trackers/xorg/libxorgtracker.a
34	$(TOP)/bin/mklib -noprefix -o $@ \	34	$(TOP)/bin/mklib -noprefix -o $@ -linker '$(CC)' -ldflags '$(LDFLAGS)' \
35	$(OBJECTS) $(LIBS) $(shell pkg-config --libs libdrm) -ldrm_radeon	35	$(OBJECTS) $(LIBS) $(shell pkg-config --libs libdrm) -ldrm_radeon
36		36
37	clean:	37	clean:
38	rm -rf $(OBJECTS) $(TARGET)	38	rm -rf $(OBJECTS) $(TARGET)

Lines 43-49 Link Here

(-)Mesa-7.7~orig/src/gallium/winsys/drm/vmware/xorg/Makefile (-1 / +2 lines)
43	all default: $(TARGET) $(TARGET_STAGING)	43	all default: $(TARGET) $(TARGET_STAGING)
44		44
45	$(TARGET): $(OBJECTS) Makefile $(LIBS)	45	$(TARGET): $(OBJECTS) Makefile $(LIBS)
46	$(MKLIB) -noprefix -o $@ $(OBJECTS) $(LIBS) $(LINKS)	46	$(MKLIB) -noprefix -o $@ -linker '$(CC)' -ldflags '$(LDFLAGS)' \
		47	$(OBJECTS) $(LIBS) $(LINKS)
47		48
48	$(TOP)/$(LIB_DIR)/gallium:	49	$(TOP)/$(LIB_DIR)/gallium:
49	mkdir -p $@	50	mkdir -p $@

Return to bug 298124

Lines 83-95 Link Here

(-)Mesa-7.7~orig/src/gallium/winsys/drm/Makefile.template (-1 / +2 lines)
83		83
84	$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(PIPE_DRIVERS) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template	84	$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(PIPE_DRIVERS) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
85	$(MKLIB) -noprefix -o $@ \	85	$(MKLIB) -noprefix -o $@ \
		86	-linker '$(CC)' -ldflags '$(LDFLAGS)' \
86	$(OBJECTS) $(PIPE_DRIVERS) \	87	$(OBJECTS) $(PIPE_DRIVERS) \
87	-Wl,--start-group $(MESA_MODULES) -Wl,--end-group \	88	-Wl,--start-group $(MESA_MODULES) -Wl,--end-group \
88	$(WINOBJ) $(DRI_LIB_DEPS) $(DRIVER_EXTRAS)	89	$(WINOBJ) $(DRI_LIB_DEPS) $(DRIVER_EXTRAS)
89		90
90	$(LIBNAME_EGL): $(WINSYS_OBJECTS) $(LIBS)	91	$(LIBNAME_EGL): $(WINSYS_OBJECTS) $(LIBS)
91	$(MKLIB) -o $(LIBNAME_EGL) \	92	$(MKLIB) -o $(LIBNAME_EGL) \
92	-linker "$(CC)" \	93	-linker '$(CC)' -ldflags '$(LDFLAGS)' \
93	-noprefix \	94	-noprefix \
94	$(OBJECTS) $(MKLIB_OPTIONS) $(WINSYS_OBJECTS) $(PIPE_DRIVERS) $(WINOBJ) $(DRI_LIB_DEPS) \	95	$(OBJECTS) $(MKLIB_OPTIONS) $(WINSYS_OBJECTS) $(PIPE_DRIVERS) $(WINOBJ) $(DRI_LIB_DEPS) \
95	--whole-archive $(LIBS) $(GALLIUM_AUXILIARIES) --no-whole-archive $(DRIVER_EXTRAS)	96	--whole-archive $(LIBS) $(GALLIUM_AUXILIARIES) --no-whole-archive $(DRIVER_EXTRAS)