riscv
/
alliance
mirror of https://gitlab.lip6.fr/vlsi-eda/alliance.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes to build under Fedora 21. 

* Bug: In autostuff, some text files are now recognized as binary ones,
    so force grep to process them as text ones (-a).
* Bug: In Nero, in UOpts.cpp, refer to the system getopt as '::getopt()'
    to avoid namespace resolution problems.
This commit is contained in:
Jean-Paul Chaput 2015-03-05 11:02:33 +01:00
parent c9b9589269
commit b8bb16f124
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
alliance/src/autostuff
View File

@ -291,28 +291,28 @@ find $ordered_dirs -name configure.in | while read config; do
echo "" >> configure.in
echo "dnl Infos extracted from $config" >> configure.in
for version_line in `grep -h _CUR= $config`; do
for version_line in `grep -ah _CUR= $config`; do
echo "$version_line" >> configure.in
version_name=`echo $version_line | sed 's,=.*,,'`
echo "AC_SUBST($version_name)" >> configure.in
done
for version_line in `grep -h _REV= $config`; do
for version_line in `grep -ah _REV= $config`; do
echo "$version_line" >> configure.in
version_name=`echo $version_line | sed 's,=.*,,'`
echo "AC_SUBST($version_name)" >> configure.in
done
for version_line in `grep -h _REL= $config`; do
for version_line in `grep -ah _REL= $config`; do
echo "$version_line" >> configure.in
version_name=`echo $version_line | sed 's,=.*,,'`
echo "AC_SUBST($version_name)" >> configure.in
done
for dll_line in `grep -h _DLL_VERSION= $config`; do
for dll_line in `grep -ah _DLL_VERSION= $config`; do
echo "$dll_line" >> configure.in
dll_name=`echo $dll_line | sed 's,=.*,,'`
echo "AC_SUBST($dll_name)" >> configure.in
done
for version_line in `grep -h _VERSION= $config | grep -v DLL`; do
for version_line in `grep -ah _VERSION= $config | grep -v DLL`; do
echo "$version_line" >> configure.in
version_name=`echo $version_line | sed 's,=.*,,'`
echo "AC_SUBST($version_name)" >> configure.in

10
alliance/src/nero/src/UOpts.cpp
View File

@ -16,13 +16,9 @@
//# include "unistd.h"
# include <unistd.h>
# include "UDefs.h"
extern "C" {
int getopt(int argc, char* const *argv, const char *sf);
}
// +----------------------------------------------------------------+
// | Methods Definitions |
@ -121,7 +117,7 @@ void COpts::getopts (int argc, char *argv[]) throw (except_done)
extern char *optarg;
int key;
long key_index;
string key_string;
string key_string;
const char *short_format;
@ -131,7 +127,7 @@ void COpts::getopts (int argc, char *argv[]) throw (except_done)
// Loop over getopt.
while (true) {
key = getopt (argc, argv, short_format);
key = ::getopt (argc, argv, short_format);
if (key == -1) break;