SOURCES: grass-soname.patch, grass-link.patch - merged from DEVEL

[wrobell]

Author: wrobell                      Date: Sat Apr 26 14:00:15 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
SOURCES:
   grass-soname.patch (1.2 -> 1.3) , grass-link.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/grass-soname.patch
diff -u SOURCES/grass-soname.patch:1.2 SOURCES/grass-soname.patch:1.3
--- SOURCES/grass-soname.patch:1.2	Tue Dec 12 23:12:59 2006
+++ SOURCES/grass-soname.patch	Sat Apr 26 16:00:10 2008
@@ -1,11 +1,12 @@
---- grass-6.2.0/include/Make/Shlib.make.orig	2006-02-10 16:31:42.000000000 +0100
-+++ grass-6.2.0/include/Make/Shlib.make	2006-12-12 08:22:03.995794084 +0100
-@@ -15,7 +15,7 @@
+diff -Nur grass-6.3.0RC5.orig/include/Make/Shlib.make grass-6.3.0RC5/include/Make/Shlib.make
+--- grass-6.3.0RC5.orig/include/Make/Shlib.make	2007-10-20 01:39:46.000000000 +0100
++++ grass-6.3.0RC5/include/Make/Shlib.make	2008-02-23 15:30:58.000000000 +0000
+@@ -6,7 +6,7 @@
  LDFLAGS += $(SHLIB_LDFLAGS)
  
  $(SHLIB): $(SHLIB_OBJS)
--	$(SHLIB_LD) -o $@ $(LDFLAGS) $^ $(EXTRA_LIBS) && if [ -z "${MINGW}" ] ; then ln -f -s $(notdir $@) $(patsubst %.$(GRASS_VERSION_NUMBER)$(SHLIB_SUFFIX),%$(SHLIB_SUFFIX),$@); fi
-+	$(SHLIB_LD) -o $@ -Wl,-soname,$(notdir $@) $(LDFLAGS) $^ $(EXTRA_LIBS) && if [ -z "${MINGW}" ] ; then ln -f -s $(notdir $@) $(patsubst %.$(GRASS_VERSION_NUMBER)$(SHLIB_SUFFIX),%$(SHLIB_SUFFIX),$@); fi
+-	$(SHLIB_LD) -o $@ $(LDFLAGS) $^ $(EXTRA_LIBS) && \
++	$(SHLIB_LD) -o $@ -Wl,-soname,$(notdir $@) $(LDFLAGS) $^ $(EXTRA_LIBS) && \
+ 	(cd $(ARCH_LIBDIR); ln -f -s $(notdir $@) $(patsubst %.$(GRASS_VERSION_NUMBER)$(SHLIB_SUFFIX),%$(SHLIB_SUFFIX),$@))
  
  shlib: $(SHLIB)
- 

================================================================
Index: SOURCES/grass-link.patch
diff -u SOURCES/grass-link.patch:1.1 SOURCES/grass-link.patch:1.2
--- SOURCES/grass-link.patch:1.1	Tue Dec 12 23:13:24 2006
+++ SOURCES/grass-link.patch	Sat Apr 26 16:00:10 2008
@@ -1,32 +1,35 @@
---- grass-6.2.0/lib/gis/Makefile.orig	2006-04-18 23:12:22.000000000 +0200
-+++ grass-6.2.0/lib/gis/Makefile	2006-12-12 20:44:00.568648997 +0100
+diff -Nur grass-6.3.0RC5.orig/lib/gis/Makefile grass-6.3.0RC5/lib/gis/Makefile
+--- grass-6.3.0RC5.orig/lib/gis/Makefile	2007-11-23 13:16:02.000000000 +0000
++++ grass-6.3.0RC5/lib/gis/Makefile	2008-02-23 12:57:01.000000000 +0000
 @@ -1,7 +1,7 @@
  MODULE_TOPDIR = ../..
  
  LIB_NAME = $(GIS_LIBNAME)
 -EXTRA_LIBS = $(XDRLIB) $(DATETIMELIB) $(INTLLIB)
-+EXTRA_LIBS = $(XDRLIB) $(DATETIMELIB) $(INTLLIB) -lm
++EXTRA_LIBS = $(XDRLIB) $(DATETIMELIB) $(INTLLIB) $(MATHLIB)
+ DATASRC = ellipse.table datum.table datumtransform.table FIPS.code state27 state83 projections gui.tcl
  
  include $(MODULE_TOPDIR)/include/Make/Lib.make
- include $(MODULE_TOPDIR)/include/Make/Doxygen.make
---- grass-6.2.0/lib/vector/rtree/Makefile.orig	2006-02-09 04:08:58.000000000 +0100
-+++ grass-6.2.0/lib/vector/rtree/Makefile	2006-12-12 20:42:37.435911532 +0100
+diff -Nur grass-6.3.0RC5.orig/lib/vector/diglib/Makefile grass-6.3.0RC5/lib/vector/diglib/Makefile
+--- grass-6.3.0RC5.orig/lib/vector/diglib/Makefile	2007-10-22 20:06:04.000000000 +0100
++++ grass-6.3.0RC5/lib/vector/diglib/Makefile	2008-02-23 12:56:28.000000000 +0000
+@@ -1,6 +1,6 @@
+ MODULE_TOPDIR = ../../..
+ 
+-EXTRA_LIBS=$(GISLIB) $(RTREELIB)
++EXTRA_LIBS=$(GISLIB) $(RTREELIB) $(MATHLIB)
+ 
+ LIB_NAME = $(DIG2_LIBNAME)
+ 
+diff -Nur grass-6.3.0RC5.orig/lib/vector/rtree/Makefile grass-6.3.0RC5/lib/vector/rtree/Makefile
+--- grass-6.3.0RC5.orig/lib/vector/rtree/Makefile	2007-11-18 19:53:18.000000000 +0000
++++ grass-6.3.0RC5/lib/vector/rtree/Makefile	2008-02-23 12:56:28.000000000 +0000
 @@ -9,6 +9,8 @@
  	rect.o \
  	split_q.o 
  
-+EXTRA_LIBS = -lm
++EXTRA_LIBS = $(MATHLIB)
 +
  include $(MODULE_TOPDIR)/include/Make/Lib.make
  
  RTLINC = $(ARCH_INCDIR)/rtree
---- grass-6.2.0/lib/vector/diglib/Makefile.orig	2005-11-10 12:05:03.000000000 +0100
-+++ grass-6.2.0/lib/vector/diglib/Makefile	2006-12-12 20:43:39.687459045 +0100
-@@ -1,6 +1,6 @@
- MODULE_TOPDIR = ../../..
- 
--EXTRA_LIBS=$(GISLIB) $(RTREELIB)
-+EXTRA_LIBS=$(GISLIB) $(RTREELIB) -lm
- 
- LIB_NAME = $(DIG2_LIBNAME)
- 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/grass-soname.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/grass-link.patch?r1=1.1&r2=1.2&f=u