Fix libkholiday build #41

Συγχωνευμένα
MicheleC συγχώνευσε 1 υποβολές από :master σε master 4 έτη πριν
Francois σχολίασε 4 έτη πριν
Συνεργάτης

sorry wrong description, this fix is for libkholiday build error

sorry wrong description, this fix is for libkholiday build error
Francois άλλαξε το τίτλο από Fix kexi build with libpqxx 7 σε Fix libkholiday build 4 έτη πριν
SlavekB σχολίασε 4 έτη πριν
Ιδιοκτήτης

Please, did you test it on older distributions or just on Fedora 32? Should we do a test on our older distributions?

In any case, there is required to use the Signed-off-by line in the commit message to declare consent to the DCO. Please, can you do an amend commit message and do a push using -f?

By the way, as I mentioned earlier, it is preferred to use the shared collaboration with branches model instead of creating unnecessary forks.

Please, did you test it on older distributions or just on Fedora 32? Should we do a test on our older distributions? In any case, there is required to use the Signed-off-by line in the commit message to declare consent to the DCO. Please, can you do an amend commit message and do a push using -f? By the way, as I mentioned earlier, it is preferred to use the shared collaboration with branches model instead of creating unnecessary forks.
Francois σχολίασε 4 έτη πριν
Συντάκτης
Συνεργάτης

Hello, I tested this patch only on Fedora 32, it is safer to test it on older distributions.
I've added the 'signed-off by' in the comment.
OK next time I will use a branch instead of fork.

Hello, I tested this patch only on Fedora 32, it is safer to test it on older distributions. I've added the 'signed-off by' in the comment. OK next time I will use a branch instead of fork.
MicheleC σχολίασε 4 έτη πριν
Ιδιοκτήτης

Thanks Francois. Let us know after you have tested older Fedora distros, before we proceed with merging this 😄

Thanks Francois. Let us know after you have tested older Fedora distros, before we proceed with merging this :smile:
Francois σχολίασε 4 έτη πριν
Συντάκτης
Συνεργάτης

Tested on centos6, centos7, mageia6, fedora31, no build issue with this patch.

Tested on centos6, centos7, mageia6, fedora31, no build issue with this patch.
MicheleC έκλεισε αυτό το pull request 4 έτη πριν
MicheleC σχολίασε 4 έτη πριν
Ιδιοκτήτης

Thanks Francois!

Thanks Francois!
MicheleC το πρόσθεσε στο R14.0.9 release ορόσημο 4 έτη πριν
MicheleC σχολίασε 4 έτη πριν
Ιδιοκτήτης

This resolves bug 3120

This resolves bug [3120](https://bugs.pearsoncomputing.net/show_bug.cgi?id=3120)
MicheleC σχολίασε 4 έτη πριν
Ιδιοκτήτης

This commit causes a regression as described in bug 3154. Reverting the commit fixed the regression, so I guess we need to find a different solution to bug 3120

This commit causes a regression as described in bug [3154](https://bugs.pearsoncomputing.net/show_bug.cgi?id=3154). Reverting the commit fixed the regression, so I guess we need to find a different solution to bug [3120](https://bugs.pearsoncomputing.net/show_bug.cgi?id=3120)
MicheleC σχολίασε 4 έτη πριν
Ιδιοκτήτης

@Francois, could you check and confirm if reverting your commit still gives you FTBFS? In Debian we don't see the problem, so it is difficult for us to test a fix. In first place we need to make sure the problem is still there.

@Francois, could you check and confirm if reverting your commit still gives you FTBFS? In Debian we don't see the problem, so it is difficult for us to test a fix. In first place we need to make sure the problem is still there.
obache σχολίασε 4 έτη πριν
Συνεργάτης

tdepim/libkholidays/scanholiday.c:
/* this should not be removed /
#define yyin kcalin
/
kcalin should be defined anywhere else */
extern FILE *yyin, yyout;
/
but kcalin is initialized here then defined here */
FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;

tdepim/libkholidays/parseholiday.c:
/* kcalin is here too */
FILE kcalin; / file currently being processed */

this multiple definition should be resolved instead.

tdepim/libkholidays/scanholiday.c: /* this should not be removed */ #define yyin kcalin /* kcalin should be defined anywhere else */ extern FILE *yyin, *yyout; /* but kcalin is initialized here then defined here */ FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0; tdepim/libkholidays/parseholiday.c: /* kcalin is here too */ FILE *kcalin; /* file currently being processed */ this multiple definition should be resolved instead.
SlavekB σχολίασε 4 έτη πριν
Ιδιοκτήτης

Here's one more fact: You can see that scanholiday.lex and parseholiday.y are in the same directory. These are the source files from which scanholiday.c and parseholiday.{c,h} are generated using flex / bison. So here it seems like a good idea to make a modification to cmake rules so that these files are generated during the build, not part of the source code.

Here's one more fact: You can see that `scanholiday.lex` and `parseholiday.y` are in the same directory. These are the source files from which `scanholiday.c` and `parseholiday.{c,h}` are generated using flex / bison. So here it seems like a good idea to make a modification to cmake rules so that these files are generated during the build, not part of the source code.
MicheleC σχολίασε 4 έτη πριν
Ιδιοκτήτης

By generating those files using bison and lex I have been able to reproduce the error reported in bug 3120.

By generating those files using bison and lex I have been able to reproduce the error reported in bug 3120.
MicheleC σχολίασε 4 έτη πριν
Ιδιοκτήτης

PR #46 provides a possible solution. Please help testing it on your system.

PR #46 provides a possible solution. Please help testing it on your system.
Το pull request έχει συγχωνευθεί ως 1e14bf4b2e.
Συνδεθείτε για να συμμετάσχετε σε αυτή τη συνομιλία.
Δεν υπάρχουν εξεταστές
Χωρίς Ορόσημο
Χωρίς Αποδέκτη
4 Συμμετέχοντες
Ειδοποιήσεις
Ημερομηνία Παράδοσης

Δεν ορίστηκε ημερομηνία παράδοσης.

Εξαρτήσεις

Δεν έχουν οριστεί εξαρτήσεις.

Αναφορά: TDE/tdepim#41
Φόρτωση…
Δεν υπάρχει ακόμα περιεχόμενο.