sci-biology/embassy-vienna: remove `append-cflags -std=gnu89`

Signed-off-by: David Seifert <soap@gentoo.org>
This commit is contained in:
David Seifert 2021-08-02 11:50:38 +02:00
parent b70fc3041b
commit 5365c04973
No known key found for this signature in database
GPG Key ID: CE36E117202E3842
2 changed files with 37 additions and 7 deletions

View File

@ -7,14 +7,12 @@ EBO_DESCRIPTION="Vienna RNA package - RNA folding"
EBO_EAUTORECONF=1
inherit emboss-r2 flag-o-matic
inherit emboss-r2
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
S="${WORKDIR}/VIENNA-1.7.2.650"
PATCHES=( "${FILESDIR}"/${PN}-1.7.2.650_fix-build-system.patch )
src_configure() {
append-cflags -std=gnu89
emboss-r2_src_configure
}
PATCHES=(
"${FILESDIR}"/${PN}-1.7.2.650_fix-build-system.patch
"${FILESDIR}"/${PN}-1.7.2.650-C99-inline.patch
)

View File

@ -0,0 +1,32 @@
--- a/src/fold.c
+++ b/src/fold.c
@@ -65,9 +65,9 @@
PRIVATE int fill_arrays(const char *sequence);
/*@unused@*/
INLINE PRIVATE int oldLoopEnergy(int i, int j, int p, int q, int type, int type_2);
-INLINE int LoopEnergy(int n1, int n2, int type, int type_2,
+int LoopEnergy(int n1, int n2, int type, int type_2,
int si1, int sj1, int sp1, int sq1);
-INLINE int HairpinE(int size, int type, int si1, int sj1, const char *string);
+int HairpinE(int size, int type, int si1, int sj1, const char *string);
int loop_energy(short * ptable, short *s, short *s1, int i);
char *backtrack_fold_from_pair(char *sequence, int i, int j);
void export_circfold_arrays(int *Fc_p, int *FcH_p, int *FcI_p, int *FcM_p, int **fM2_p,
@@ -831,7 +831,7 @@
}
/*---------------------------------------------------------------------------*/
-INLINE int HairpinE(int size, int type, int si1, int sj1, const char *string) {
+int HairpinE(int size, int type, int si1, int sj1, const char *string) {
int energy;
energy = (size <= 30) ? P->hairpin[size] :
P->hairpin[30]+(int)(P->lxc*log((size)/30.));
@@ -901,7 +901,7 @@
/*--------------------------------------------------------------------------*/
-INLINE int LoopEnergy(int n1, int n2, int type, int type_2,
+int LoopEnergy(int n1, int n2, int type, int type_2,
int si1, int sj1, int sp1, int sq1) {
/* compute energy of degree 2 loop (stack bulge or interior) */
int nl, ns, energy;