[rkward-cvs] SF.net SVN: rkward: [2199] branches/KDE4_port/debian

[tfry at users.sourceforge.net]

Revision: 2199
          http://rkward.svn.sourceforge.net/rkward/?rev=2199&view=rev
Author:   tfry
Date:     2007-11-11 10:20:46 -0800 (Sun, 11 Nov 2007)

Log Message:
-----------
Merge the debian release changes from trunk

Modified Paths:
--------------
    branches/KDE4_port/debian/changelog
    branches/KDE4_port/debian/rules

Modified: branches/KDE4_port/debian/changelog
===================================================================
--- branches/KDE4_port/debian/changelog	2007-11-11 18:18:48 UTC (rev 2198)
+++ branches/KDE4_port/debian/changelog	2007-11-11 18:20:46 UTC (rev 2199)
@@ -1,10 +1,11 @@
-rkward (0.4.9-1) unstable; urgency=low
+rkward (0.4.8a-1) unstable; urgency=low
 
   * new upstream release
   * document --disable-stack-check and --debugger options in the manual page
-	TODO!
+  * use the compilers specified by R CMD config
+    closes: #450618
 
- -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Xxx, XX Xxx 2007 13:30:00 +0200
+ -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Sun, 11 Nov 2007 13:30:00 +0200
 
 rkward (0.4.8-1) unstable; urgency=low
 

Modified: branches/KDE4_port/debian/rules
===================================================================
--- branches/KDE4_port/debian/rules	2007-11-11 18:18:48 UTC (rev 2198)
+++ branches/KDE4_port/debian/rules	2007-11-11 18:20:46 UTC (rev 2199)
@@ -21,22 +21,15 @@
 	CFLAGS += -O2
 endif
 
-# Add here commands to configure the package.
-CONFCOMMAND = ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-rpath --with-r-home=/usr/lib/R --with-r-libdir=/usr/lib/R/site-library/
-
 config.status: configure
 	dh_testdir
 
-	# r-base > 2.5.1 forces gcc 4.2, so we need to follow suite to make sure, everything is all
-	# all right. the appropriate build-deps are fetched by r-base-dev, automatically.
-	if [ "$(RVERS)" '>' "2.5.1" ] ; then \
-		export F77=gfortran-4.2 ; \
-		export CC=gcc-4.2 ; \
-		export CXX=g++-4.2 ; \
-		CFLAGS="$(CFLAGS)" $(CONFCOMMAND) ; \
-	else \
-		CFLAGS="$(CFLAGS)" $(CONFCOMMAND) ; \
-	fi
+	# Some installations of R need a specific version of the compiler(s)
+	# R CMD config provides info on which compiler to use
+	export F77=`/usr/bin/R CMD config F77` ; \
+	export CC=`/usr/bin/R CMD config CC` ; \
+	export CXX=`/usr/bin/R CMD config CXX` ; \
+	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-rpath --with-r-home=/usr/lib/R --with-r-libdir=/usr/lib/R/site-library/
 
 build: build-stamp
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.