diff options
Diffstat (limited to 'graphics/MesaLib/patches/patch-ad')
| -rw-r--r-- | graphics/MesaLib/patches/patch-ad | 48 |
1 files changed, 28 insertions, 20 deletions
diff --git a/graphics/MesaLib/patches/patch-ad b/graphics/MesaLib/patches/patch-ad index e4263a04ed6..c0d5b338fed 100644 --- a/graphics/MesaLib/patches/patch-ad +++ b/graphics/MesaLib/patches/patch-ad @@ -1,9 +1,9 @@ -$NetBSD: patch-ad,v 1.4 2004/04/09 13:06:06 adam Exp $ +$NetBSD: patch-ad,v 1.5 2004/10/26 13:55:37 adam Exp $ ---- src/mesa/Makefile.X11.orig 2004-03-24 19:27:19.000000000 +0000 -+++ src/mesa/Makefile.X11 -@@ -53,10 +53,10 @@ OBJECTS = \ - ##### RULES ##### +--- src/mesa/Makefile.orig 2004-08-16 17:11:10.000000000 +0000 ++++ src/mesa/Makefile +@@ -12,10 +12,10 @@ GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$ + .c.o: - $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@ @@ -14,27 +14,35 @@ $NetBSD: patch-ad,v 1.4 2004/04/09 13:06:06 adam Exp $ + ${LIBTOOL} --mode=compile $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@ - # need some special rules here, unfortunately -@@ -95,18 +95,16 @@ targets: $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$ + # Figure out what to make here +@@ -112,22 +112,20 @@ subdirs: # Make the GL library - $(LIBDIR)/$(GL_LIB): $(OBJECTS) -- $(TOP)/bin/mklib -o $(GL_LIB_NAME) -major $(GL_MAJOR) \ -- -minor $(GL_MINOR) -patch $(GL_TINY) -install $(LIBDIR) \ -- $(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(OBJECTS) -+ ${LIBTOOL} --mode=link ${CC} -o ${GL_LIB:.so=.la} ${OBJECTS:.o=.lo} \ + $(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS) +- CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(GL_LIB) -major $(GL_MAJOR) \ +- -minor $(GL_MINOR) -patch $(GL_TINY) -install $(LIB_DIR) \ +- $(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(STAND_ALONE_OBJECTS) ++ ${LIBTOOL} --mode=link ${CC} -o ${GL_LIB_NAME:.so=.la} \ ++ ${STAND_ALONE_OBJECTS:.o=.lo} \ + -rpath ${PREFIX}/lib -version-info ${GL_MAJOR}:${GL_MINOR} - # Make the OSMesa library - $(LIBDIR)/$(OSMESA_LIB): $(OSMESA_OBJECTS) - if [ ${OSMESA_LIB} ] ; then \ -- $(TOP)/bin/mklib -o $(OSMESA_LIB_NAME) -major $(MESA_MAJOR) \ + $(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECTS) + if [ "${DRIVER_DIRS}" = "osmesa" ] ; then \ +- CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(OSMESA_LIB) -major $(MESA_MAJOR) \ +- -minor $(MESA_MINOR) -patch $(MESA_TINY) \ +- -install $(LIB_DIR) $(MKLIB_OPTIONS) \ +- $(OSMESA_LIB_DEPS) $(OSMESA16_OBJECTS) ; \ ++ ${LIBTOOL} --mode=link ${CC} -o ${OSMESA_LIB_NAME:.so=.la} \ ++ ${OSMESA16_OBJECTS:.o=.lo} -rpath ${PREFIX}/lib \ ++ -version-info ${MESA_MAJOR}:${MESA_MINOR} ; \ + else \ +- CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(OSMESA_LIB) -major $(MESA_MAJOR) \ - -minor $(MESA_MINOR) -patch $(GL_TINY) \ -- $(MKLIB_OPTIONS) -install $(LIBDIR) \ -- $(OSMESA_LIB_DEPS) $(OSMESA_OBJECTS) ; \ -+ ${LIBTOOL} --mode=link ${CC} -o ${OSMESA_LIB:.so=.la} \ -+ ${OSMESA_OBJECTS:.o=.lo} -rpath ${PREFIX}/lib \ +- -install $(LIB_DIR) $(MKLIB_OPTIONS) \ +- $(OSMESA_LIB_DEPS) $(OSMESA_DRIVER_OBJECTS) ; \ ++ ${LIBTOOL} --mode=link ${CC} -o ${OSMESA_LIB_NAME:.so=.la} \ ++ ${OSMESA_DRIVER_OBJECTS:.o=.lo} -rpath ${PREFIX}/lib \ + -version-info ${MESA_MAJOR}:${MESA_MINOR} ; \ fi |