metalefty/mesa
1
0
Fork 0
forked from rpms/mesa
Code Pull Requests Activity
a2ea5378b5
mesa/mesa-7.1-link-shared.patch

102 lines
3.8 KiB
Diff
Raw Normal View History

- merged 7.1-0.29 ... 7.1-0.37 changes from F-9 branch
2008-07-02 12:35:05 +00:00
diff -up mesa-20080612/src/mesa/drivers/dri/Makefile.dricore mesa-20080612/src/mesa/drivers/dri/Makefile
--- mesa-20080612/src/mesa/drivers/dri/Makefile.dricore 2008-06-12 12:06:50.000000000 +1000
+++ mesa-20080612/src/mesa/drivers/dri/Makefile 2008-06-12 13:25:58.000000000 +1000
- mesa-7.1-link-shared.patch: Make a libdricore.so from libmesa.a, install it into %_libdir/dri, and link the DRI drivers against it. Drops ~20M from the installed system (not including debuginfo). Inspired by a similar patch in openSUSE but reworked to be compatible with the OSMesa build.
2008-04-10 18:20:31 +00:00
@@ -6,12 +6,17 @@ include $(TOP)/configs/current
-default: $(TOP)/$(LIB_DIR) subdirs
+default: $(TOP)/$(LIB_DIR) $(TOP)/$(LIB_DIR)/libdricore.so subdirs
$(TOP)/$(LIB_DIR):
-mkdir $(TOP)/$(LIB_DIR)
+libdricore.so:
- merged 7.1-0.29 ... 7.1-0.37 changes from F-9 branch
2008-07-02 12:35:05 +00:00
+ gcc -shared -o libdricore.so -Wl,--whole-archive ../../libmesa.a -Wl,--no-whole-archive -lm -lpthread -lc
- mesa-7.1-link-shared.patch: Make a libdricore.so from libmesa.a, install it into %_libdir/dri, and link the DRI drivers against it. Drops ~20M from the installed system (not including debuginfo). Inspired by a similar patch in openSUSE but reworked to be compatible with the OSMesa build.
2008-04-10 18:20:31 +00:00
+
+$(TOP)/$(LIB_DIR)/libdricore.so: $(TOP)/$(LIB_DIR) libdricore.so
+ $(INSTALL) libdricore.so $(TOP)/$(LIB_DIR)
subdirs:
@for dir in $(DRI_DIRS) ; do \
@@ -21,12 +26,14 @@ subdirs:
done
-install:
+install: $(TOP)/$(LIB_DIR)/libdricore.so
@for dir in $(DRI_DIRS) ; do \
if [ -d $$dir ] ; then \
(cd $$dir && $(MAKE) install) || exit 1 ; \
fi \
done
+ $(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
+ $(INSTALL) -m 755 $(TOP)/$(LIB_DIR)/libdricore.so $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
- merged 7.1-0.29 ... 7.1-0.37 changes from F-9 branch
2008-07-02 12:35:05 +00:00
$(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GL/internal
$(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_interface.h $(DESTDIR)$(INSTALL_DIR)/include/GL/internal
$(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_sarea.h $(DESTDIR)$(INSTALL_DIR)/include/GL/internal
- mesa-7.1-link-shared.patch: Make a libdricore.so from libmesa.a, install it into %_libdir/dri, and link the DRI drivers against it. Drops ~20M from the installed system (not including debuginfo). Inspired by a similar patch in openSUSE but reworked to be compatible with the OSMesa build.
2008-04-10 18:20:31 +00:00
@@ -38,4 +45,5 @@ clean:
(cd $$dir && $(MAKE) clean) ; \
fi \
done
+ -rm -f libdricore.so $(TOP)/$(LIB_DIR)/libdricore.so
-rm -f common/*.o
- merged 7.1-0.29 ... 7.1-0.37 changes from F-9 branch
2008-07-02 12:35:05 +00:00
diff -up mesa-20080612/src/mesa/drivers/dri/Makefile.template.dricore mesa-20080612/src/mesa/drivers/dri/Makefile.template
--- mesa-20080612/src/mesa/drivers/dri/Makefile.template.dricore 2008-06-12 12:06:50.000000000 +1000
+++ mesa-20080612/src/mesa/drivers/dri/Makefile.template 2008-06-12 13:15:34.000000000 +1000
- mesa-7.1-link-shared.patch: Make a libdricore.so from libmesa.a, install it into %_libdir/dri, and link the DRI drivers against it. Drops ~20M from the installed system (not including debuginfo). Inspired by a similar patch in openSUSE but reworked to be compatible with the OSMesa build.
2008-04-10 18:20:31 +00:00
@@ -1,6 +1,6 @@
# -*-makefile-*-
-MESA_MODULES = $(TOP)/src/mesa/libmesa.a
+MESA_MODULES = $(TOP)/$(LIB_DIR)/libdricore.so
COMMON_SOURCES = \
- merged 7.1-0.29 ... 7.1-0.37 changes from F-9 branch
2008-07-02 12:35:05 +00:00
../common/utils.c \
@@ -69,7 +69,9 @@ default: symlinks depend $(LIBNAME) $(TO
- mesa-7.1-link-shared.patch: Make a libdricore.so from libmesa.a, install it into %_libdir/dri, and link the DRI drivers against it. Drops ~20M from the installed system (not including debuginfo). Inspired by a similar patch in openSUSE but reworked to be compatible with the OSMesa build.
2008-04-10 18:20:31 +00:00
$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
$(TOP)/bin/mklib -ldflags '$(LDFLAGS)' -noprefix -o $@ \
- $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS)
+ $(OBJECTS) $(WINOBJ) \
+ -L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore \
+ $(DRI_LIB_DEPS)
$(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)
- merged 7.1-0.29 ... 7.1-0.37 changes from F-9 branch
2008-07-02 12:35:05 +00:00
diff -up mesa-20080612/src/mesa/x86/read_rgba_span_x86.S.dricore mesa-20080612/src/mesa/x86/read_rgba_span_x86.S
--- mesa-20080612/src/mesa/x86/read_rgba_span_x86.S.dricore 2008-06-12 12:06:50.000000000 +1000
+++ mesa-20080612/src/mesa/x86/read_rgba_span_x86.S 2008-06-12 13:15:34.000000000 +1000
@@ -77,7 +77,6 @@
*/
.globl _generic_read_RGBA_span_BGRA8888_REV_MMX
-.hidden _generic_read_RGBA_span_BGRA8888_REV_MMX
.type _generic_read_RGBA_span_BGRA8888_REV_MMX, @function
_generic_read_RGBA_span_BGRA8888_REV_MMX:
pushl %ebx
@@ -172,7 +171,6 @@ _generic_read_RGBA_span_BGRA8888_REV_MMX
*/
.globl _generic_read_RGBA_span_BGRA8888_REV_SSE
-.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE
.type _generic_read_RGBA_span_BGRA8888_REV_SSE, @function
_generic_read_RGBA_span_BGRA8888_REV_SSE:
pushl %esi
@@ -335,7 +333,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE
.text
.globl _generic_read_RGBA_span_BGRA8888_REV_SSE2
-.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE2
.type _generic_read_RGBA_span_BGRA8888_REV_SSE2, @function
_generic_read_RGBA_span_BGRA8888_REV_SSE2:
pushl %esi
@@ -494,7 +491,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE
.text
.globl _generic_read_RGBA_span_RGB565_MMX
- .hidden _generic_read_RGBA_span_RGB565_MMX
.type _generic_read_RGBA_span_RGB565_MMX, @function
_generic_read_RGBA_span_RGB565_MMX:
Copy Permalink