upgrade rscape (#10208)

* upgrade rscape * glib * clean then compile * Update meta.yaml * debug info * relax plot version * simplify test * minor fix * older versions * older test * even older * even older * no clean * orig test * bump version * grep test * working version * bump working version * Create conda_build_config.yaml * clean then build * v0.7.3 * upgrade rscape * glib * clean then compile * Update meta.yaml * debug info * relax plot version * simplify test * minor fix * older versions * older test * even older * even older * no clean * orig test * bump version * grep test * working version * bump working version * Create conda_build_config.yaml * clean then build * v0.7.3 * Update conda_build_config.yaml * fix R2R makefile * gxx config * minor cleanup * skip mac
bioconda · Aug 6, 2018 · 2a19f10 · 2a19f10
1 parent ce9add9
commit 2a19f10
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 8 deletions.
diff --git a/recipes/rscape/R2R_Makefile.in.patch b/recipes/rscape/R2R_Makefile.in.patch
@@ -0,0 +1,13 @@
+--- lib/R2R/src/Makefile.in	2018-07-19 01:19:23.000000000 +0200
++++ lib/R2R/src/Makefile.in.new	2018-08-06 14:06:41.627328421 +0200
+@@ -17,8 +17,8 @@
+ CFSQP_CFLAGS=-I $(CFSQP_PATH)
+ endif
+
+-CC=g++
+-LINK=g++
++CC=$(GXX)
++LINK=$(GXX)
+ CFLAGS_OPT=-O2 -DNDEBUG
+ CFLAGS_WARN=
+ CFLAGS=$(CFLAGS_WARN) -c -I. -I$(CFSQP_PATH) -I$(INFERNAL_PATH)/squid -g $(CFLAGS_OPT) $(CFSQP_CFLAGS) -DDISTRIBUTION $(FONT_CFLAGS)
diff --git a/recipes/rscape/build.sh b/recipes/rscape/build.sh
@@ -1,3 +1,4 @@
 ./configure --disable-avx512 --prefix=$PREFIX
+
 make V=1
 make install
diff --git a/recipes/rscape/conda_build_config.yaml b/recipes/rscape/conda_build_config.yaml
@@ -0,0 +1,6 @@
+c_compiler:
+  - gcc      # [linux]
+  - clang    # [osx]
+cxx_compiler:
+  - gxx      # [linux]
+  - clangxx  # [osx]
diff --git a/recipes/rscape/meta.yaml b/recipes/rscape/meta.yaml
@@ -1,26 +1,33 @@
+{% set version = "0.8.3" %}
 package:
   name: rscape
-  version: 0.6.1
+  version: {{ version }}
 
 source:
-  url: http://eddylab.org/software/rscape/rscape_v0.6.1.tar.gz
-  md5: c4fd21e433c571e483424dd071cc6226
+  url: http://eddylab.org/software/rscape/rscape_v{{ version }}.tar.gz     
+  md5: 24bfb90ad65c83a0fc5b463e59fc6ae0
+
+  patches:
+    - R2R_Makefile.in.patch
 
 build:
-  number: 4
+  number: 0
+  skip: True # [osx]
+
 
 requirements:
   build:
     - {{ compiler('c') }}
-    - gnuplot ==5.0.6
+    - {{ compiler('cxx') }}
 
+  host:
+    - gnuplot
   run:
-    - gnuplot ==5.0.6
+    - gnuplot
 
 test:
   commands:
-    - printf "# STOCKHOLM 1.0\n#=GF SQ 3\nmyseq1 ACGCUUUUGCU\nmyseq2 ACUCUUUUGGU\nmyseq3 UCGCUUUUGCA\n//\n" > tmp.sto; R-scape --cyk --nofigures tmp.sto # >/dev/null
-
+    - printf "# STOCKHOLM 1.0\n#=GF SQ 3\nmyseq1 ACGCUUUUGCU\nmyseq2 ACUCUUUUGGU\nmyseq3 UCGCUUUUGCA\n//\n" > tmp.sto; R-scape --nofigures tmp.sto 
 about:
   home: http://eddylab.org/R-scape/
   license: GPLv3