diff options
| author | tnn <tnn> | 2009-06-11 13:11:32 +0000 |
|---|---|---|
| committer | tnn <tnn> | 2009-06-11 13:11:32 +0000 |
| commit | 827cd91b7afc11d93146e0315b2f96c4098e2623 (patch) | |
| tree | 3188c55ee35e332c9574e8ad26d065fdf909804b /graphics | |
| parent | e7e547ae1166796b9d2300d963bf9f791ada7b8a (diff) | |
| download | pkgsrc-827cd91b7afc11d93146e0315b2f96c4098e2623.tar.gz | |
patch-cc: libtoolize src/mesa/drivers/x11/Makefile.
Should fix build with PKG_OPTION dri disabled. (PR pkg/41572)
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/MesaLib/distinfo | 3 | ||||
| -rw-r--r-- | graphics/MesaLib/patches/patch-cc | 38 |
2 files changed, 40 insertions, 1 deletions
diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo index a0cf22ecfe0..f142fb059b6 100644 --- a/graphics/MesaLib/distinfo +++ b/graphics/MesaLib/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.64 2009/06/10 17:28:07 wiz Exp $ +$NetBSD: distinfo,v 1.65 2009/06/11 13:11:32 tnn Exp $ SHA1 (Mesa-7.4.2/MesaDemos-7.4.2.tar.bz2) = cbba586829c76a5e7a54a906567b4b2174d6e1aa RMD160 (Mesa-7.4.2/MesaDemos-7.4.2.tar.bz2) = c6434d325897540618130e97891f391721b543b5 @@ -32,3 +32,4 @@ SHA1 (patch-bb) = 4fd8a770bd0275c3467447f77f51e957996c93ac SHA1 (patch-bc) = 6b8df3762d666c2e7720183b6d292053bda86f5a SHA1 (patch-bd) = 61cb50ef49e64ecc0f87750d60244f1ff7b44bd4 SHA1 (patch-cb) = 83789d71de41aed2ba81a8239fb035a4cd295477 +SHA1 (patch-cc) = 737d8b474b1c296f3ceb4de515dd385aae072394 diff --git a/graphics/MesaLib/patches/patch-cc b/graphics/MesaLib/patches/patch-cc new file mode 100644 index 00000000000..3286495e59b --- /dev/null +++ b/graphics/MesaLib/patches/patch-cc @@ -0,0 +1,38 @@ +$NetBSD: patch-cc,v 1.1 2009/06/11 13:11:32 tnn Exp $ + +--- src/mesa/drivers/x11/Makefile.orig 2008-08-25 16:46:44.000000000 +0200 ++++ src/mesa/drivers/x11/Makefile +@@ -43,25 +43,24 @@ INCLUDE_DIRS = \ + -I$(TOP)/src/mesa \ + -I$(TOP)/src/mesa/main + +-CORE_MESA = $(TOP)/src/mesa/libmesa.a $(TOP)/src/mesa/libglapi.a ++CORE_MESA = $(TOP)/src/mesa/libmesa.la $(TOP)/src/mesa/libglapi.la + + + + .c.o: +- $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@ ++ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(INCLUDE_DIRS) \ ++ $(CFLAGS) $< -o $(@:.o=.lo) + + + default: $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) + + + $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) $(CORE_MESA) +- @ $(MKLIB) -o $(GL_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \ +- -major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \ +- -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \ +- -id $(INSTALL_LIB_DIR)/lib$(GL_LIB).$(GL_MAJOR).dylib \ +- $(GL_LIB_DEPS) $(OBJECTS) $(CORE_MESA) +- +- ++ $(LIBTOOL) --mode=link $(CC) \ ++ -o $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME:.so=.la) $(LDFLAGS) \ ++ -rpath $(PREFIX)/lib \ ++ -version-info $(GL_MAJOR):$(GL_MINOR):0 \ ++ $(GL_LIB_DEPS) $(OBJECTS:.o=.lo) $(CORE_MESA) + + clean: + -rm -f *.o *~ |