[rkward-cvs] SF.net SVN: rkward: [1957] trunk/rkward

[tfry at users.sourceforge.net]

Revision: 1957
          http://rkward.svn.sourceforge.net/rkward/?rev=1957&view=rev
Author:   tfry
Date:     2007-09-14 05:30:59 -0700 (Fri, 14 Sep 2007)

Log Message:
-----------
Prepare debian package fixed for R 2.6

Modified Paths:
--------------
    trunk/rkward/debian/changelog
    trunk/rkward/debian/rules
    trunk/rkward/rkward/rbackend/rembedinternal.cpp

Modified: trunk/rkward/debian/changelog
===================================================================
--- trunk/rkward/debian/changelog	2007-09-13 16:52:43 UTC (rev 1956)
+++ trunk/rkward/debian/changelog	2007-09-14 12:30:59 UTC (rev 1957)
@@ -1,10 +1,11 @@
-rkward (0.4.8-pre1) unstable; urgency=low
+rkward (0.4.7a-2) unstable; urgency=low
 
-  * new upstream release
-    closes: #417519
-TODO: another test run with GCC 4.3
+  * force gcc 4.2 to match r-base-core
+    closes: #432377
+  * merge upstream fix for R 2.6
+    closes: #442059
 
- -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Xxx, XX XXX 2007 15:30:00 +0200
+ -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Fri, 14 Sep 2007 13:30:00 +0200
 
 rkward (0.4.7a-1) unstable; urgency=low
 

Modified: trunk/rkward/debian/rules
===================================================================
--- trunk/rkward/debian/rules	2007-09-13 16:52:43 UTC (rev 1956)
+++ trunk/rkward/debian/rules	2007-09-14 12:30:59 UTC (rev 1957)
@@ -21,11 +21,22 @@
 	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
-	# Add here commands to configure the package.
-	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/
 
+	# 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
 
 build: build-stamp
 

Modified: trunk/rkward/rkward/rbackend/rembedinternal.cpp
===================================================================
--- trunk/rkward/rkward/rbackend/rembedinternal.cpp	2007-09-13 16:52:43 UTC (rev 1956)
+++ trunk/rkward/rkward/rbackend/rembedinternal.cpp	2007-09-14 12:30:59 UTC (rev 1957)
@@ -88,7 +88,7 @@
 #endif
 
 #ifdef R_2_6
-// hidden in Rinternals.h is USE_RINTERNALS is defined
+// hidden in Rinternals.h if USE_RINTERNALS is defined
 extern Rboolean (Rf_isNull)(SEXP s);
 extern Rboolean (Rf_isObject)(SEXP s);
 SEXP R_LastvalueSymbol;
@@ -316,6 +316,7 @@
 int REditFile (char *buf) {
 	RK_TRACE (RBACKEND);
 
+// REditFiles (below) is takes non-const char** parameters, although it actually treats them as consts. TODO: fix this up, one day
 	char *editor = (char *) "none";
 	char *title = (char *) "";
 


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