Changeset 2195 in MondoRescue

Timestamp:

May 11, 2009, 3:08:02 AM (16 years ago)

Author:

Bruno Cornec

Message:

• -Werror=format-security option used only for gcc >= 4.2
• fix compiler issue and one warning

Location:

branches/2.2.9/mondo

Files:

• configure.in (modified) (1 diff)
• src/common/libmondo-tools.c (modified) (1 diff)
• src/mondorestore/mondo-rstr-tools.c (modified) (1 diff)

branches/2.2.9/mondo/configure.in

@@ -72 +72 @@
         AC_CHECK_LIB(pthread, pthread_create, true, [echo "*** Cannot find -lpthread."; echo "*** Please make sure you have the linuxthreads glibc add-on installed."; exit 1])
         PTHREAD="-lpthread"
-        CFLAGS="$CFLAGS -Wall -Wno-return-type -Werror=format-security -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_REENTRANT"
+        GCC_MAJ="`gcc -dumpversion 2>&1 | cut -d. -f1`"
+        GCC_MIN="`gcc -dumpversion 2>&1 | cut -d. -f2`"
+        CFLAGS="$CFLAGS -Wall -Wno-return-type -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_REENTRANT"
+        if test "$GCC_MAJ" -ge "4" && test "$GCC_MIN" -ge "2"; then
+            CFLAGS="$CFLAGS -Werror=format-security"
+        fi
         ;;
     *)

branches/2.2.9/mondo/src/common/libmondo-tools.c

@@ -958 +958 @@
         ("grep ramdisk /proc/devices", FALSE)) {
         /* Some SuSE have ramdisk as modules, so insert it first, then test again */
-        run_program_and_log_output("modprobe brd 2> /dev/null > /dev/null");
+        run_program_and_log_output("modprobe brd 2> /dev/null > /dev/null",FALSE);
         if (run_program_and_log_output
             ("grep ramdisk /proc/devices", FALSE)) {

branches/2.2.9/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -2 +2 @@
 $Id$
 
-/***************************************************************************
+***************************************************************************
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *