diff options
| author | Michael Mason <ms13sp@gmail.com> | 2009-12-21 14:47:25 +0000 |
|---|---|---|
| committer | Michael Mason <ms13sp@gmail.com> | 2009-12-21 14:47:25 +0000 |
| commit | d06ed46c4a54d0192aa2070631e400caf173fcf4 (patch) | |
| tree | 5a4a5bd577fdb3e15702bc7c85b157a9d53e571a /x11/mesa/mesa-7.1-link-shared.patch | |
| parent | b7c30010b016b86d1a74263641c39facd754c497 (diff) | |
| parent | b316c8b937ab28b0e1ad8bf6cd43da81d8e5d0e8 (diff) | |
| download | aports-d06ed46c4a54d0192aa2070631e400caf173fcf4.tar.bz2 aports-d06ed46c4a54d0192aa2070631e400caf173fcf4.tar.xz | |
Merge branch 'master' of git://git.alpinelinux.org/aports
Diffstat (limited to 'x11/mesa/mesa-7.1-link-shared.patch')
| -rw-r--r-- | x11/mesa/mesa-7.1-link-shared.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/x11/mesa/mesa-7.1-link-shared.patch b/x11/mesa/mesa-7.1-link-shared.patch index f04238311a..46b54b78bb 100644 --- a/x11/mesa/mesa-7.1-link-shared.patch +++ b/x11/mesa/mesa-7.1-link-shared.patch @@ -13,7 +13,7 @@ diff -up mesa-20080814/src/mesa/drivers/dri/Makefile.dricore mesa-20080814/src/m -mkdir $(TOP)/$(LIB_DIR) +libdricore.so: -+ gcc -shared -o libdricore.so -Wl,--whole-archive ../../libmesa.a -Wl,--no-whole-archive -lm -lpthread -lc ++ gcc -shared -o libdricore.so -Wl,--whole-archive ../../libmesa.a -Wl,--no-whole-archive $(LDFLAGS) -lm -lpthread -lc + +$(TOP)/$(LIB_DIR)/libdricore.so: $(TOP)/$(LIB_DIR) libdricore.so + $(INSTALL) libdricore.so $(TOP)/$(LIB_DIR) @@ -59,8 +59,8 @@ diff -up mesa-20080814/src/mesa/drivers/dri/Makefile.template.dricore mesa-20080 $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template $(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \ - $(OBJECTS) $(PIPE_DRIVERS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS) -+ $(OBJECTS) $(PIPE_DRIVERS) $(WINOBJ) \ + -L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore \ ++ $(OBJECTS) $(PIPE_DRIVERS) $(WINOBJ) \ + $(DRI_LIB_DEPS) |