head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.2
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2013Q1:1.1.0.32
	pkgsrc-2013Q1-base:1.1
	pkgsrc-2012Q4:1.1.0.30
	pkgsrc-2012Q4-base:1.1
	pkgsrc-2012Q3:1.1.0.28
	pkgsrc-2012Q3-base:1.1
	pkgsrc-2012Q2:1.1.0.26
	pkgsrc-2012Q2-base:1.1
	pkgsrc-2012Q1:1.1.0.24
	pkgsrc-2012Q1-base:1.1
	pkgsrc-2011Q4:1.1.0.22
	pkgsrc-2011Q4-base:1.1
	pkgsrc-2011Q3:1.1.0.20
	pkgsrc-2011Q3-base:1.1
	pkgsrc-2011Q2:1.1.0.18
	pkgsrc-2011Q2-base:1.1
	pkgsrc-2011Q1:1.1.0.16
	pkgsrc-2011Q1-base:1.1
	pkgsrc-2010Q4:1.1.0.14
	pkgsrc-2010Q4-base:1.1
	pkgsrc-2010Q3:1.1.0.12
	pkgsrc-2010Q3-base:1.1
	pkgsrc-2010Q2:1.1.0.10
	pkgsrc-2010Q2-base:1.1
	pkgsrc-2010Q1:1.1.0.8
	pkgsrc-2010Q1-base:1.1
	pkgsrc-2009Q4:1.1.0.6
	pkgsrc-2009Q4-base:1.1
	pkgsrc-2009Q3:1.1.0.4
	pkgsrc-2009Q3-base:1.1
	pkgsrc-2009Q2:1.1.0.2
	pkgsrc-2009Q2-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2013.05.16.05.22.02;	author richard;	state dead;
branches;
next	1.1;
commitid	zN883Sx1YLZWAOPw;

1.1
date	2009.06.11.13.11.32;	author tnn;	state Exp;
branches;
next	;


desc
@@


1.2
log
@upgrade to MesaLib-7.11.2
@
text
@$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 *~
@


1.1
log
@patch-cc: libtoolize src/mesa/drivers/x11/Makefile.
Should fix build with PKG_OPTION dri disabled. (PR pkg/41572)
@
text
@d1 1
a1 1
$NetBSD$
@