diff options
Diffstat (limited to 'graphics/MesaLib/patches/patch-ab')
| -rw-r--r-- | graphics/MesaLib/patches/patch-ab | 63 |
1 files changed, 44 insertions, 19 deletions
diff --git a/graphics/MesaLib/patches/patch-ab b/graphics/MesaLib/patches/patch-ab index 10e168ae5a3..e06088ac656 100644 --- a/graphics/MesaLib/patches/patch-ab +++ b/graphics/MesaLib/patches/patch-ab @@ -1,22 +1,47 @@ -$NetBSD: patch-ab,v 1.15 2008/04/24 07:40:24 bjs Exp $ +$NetBSD: patch-ab,v 1.16 2008/07/27 00:03:42 bjs Exp $ ---- src/glu/Makefile.orig 2007-09-12 12:03:23.000000000 -0400 -+++ src/glu/Makefile -@@ -22,10 +22,13 @@ glu.pc: glu.pc.in - $(pcedit) $< > $@ - - install: glu.pc -- $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR) -- $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)/pkgconfig -- $(INSTALL) $(TOP)/$(LIB_DIR)/libGLU.* $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR) -- $(INSTALL) -m 644 glu.pc $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)/pkgconfig -+ $(BSD_INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR) -+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)/pkgconfig -+ $(LIBTOOL) --mode=install \ -+ $(BSD_INSTALL_LIB) $(TOP)/$(LIB_DIR)/libGLU.la \ -+ $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR) -+ $(BSD_INSTALL_DATA) glu.pc \ -+ $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)/pkgconfig +--- src/glu/sgi/Makefile.orig 2008-07-18 10:39:12.000000000 -0400 ++++ src/glu/sgi/Makefile +@@ -8,7 +8,8 @@ include $(TOP)/configs/current + + GLU_MAJOR = 1 + GLU_MINOR = 3 +-GLU_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY) ++GLU_TINY= 0 # What is the point of having such a strange versioning scheme? ++ # It breaks libtool, but I hate to say it: libtool is right! + + INCDIRS = -I$(TOP)/include -Iinclude -Iinternals -Ilibnurbs/internals -Ilibnurbs/interface -Ilibnurbs/nurbtess + +@@ -115,10 +116,12 @@ OBJECTS = $(C_OBJECTS) $(CC_OBJECTS) + ##### RULES ##### + + .c.o: +- $(CC) -c $(INCDIRS) $(CFLAGS) -DNDEBUG -DLIBRARYBUILD $< -o $@ ++ $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(INCDIRS) \ ++ $(CFLAGS) $(COPTS) -DNDEBUG -DLIBRARYBUILD $< -o $(@:.o=.lo) + + .cc.o: +- $(CXX) -c $(INCDIRS) $(CXXFLAGS) -DNDEBUG -DLIBRARYBUILD $< -o $@ ++ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) -c $(INCDIRS) \ ++ $(CXXFLAGS) -DNDEBUG -DLIBRARYBUILD $< -o $(@:.o=.lo) + + + ##### TARGETS ##### +@@ -136,11 +139,12 @@ $(TOP)/$(LIB_DIR): + + # Make the library: + $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS) +- $(TOP)/bin/mklib -o $(GLU_LIB) -linker '$(CXX)' -ldflags '$(LDFLAGS)' \ +- -major $(GLU_MAJOR) -minor $(GLU_MINOR) -patch $(GLU_TINY) \ +- -cplusplus $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \ +- -exports glu.exports \ +- $(GLU_LIB_DEPS) $(OBJECTS) ++ $(LIBTOOL) --mode=link $(CXX) \ ++ -o $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME:.so=.la) $(LDFLAGS) \ ++ -rpath $(PREFIX)/lib $(GLU_LIB_DEPS) $(OBJECTS:.o=.lo) \ ++ -version-info $(GLU_MAJOR):$(GLU_MINOR):$(GLU_TINY) \ ++ -export-symbols glu.sym ++ + clean: - @for dir in $(SUBDIRS) ; do \ |