Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/nmap/patches/nbase.configure.patch
author Alex Chiu <Alex.Chiu@Oracle.COM>
Thu, 14 Jun 2012 11:34:02 -0700
changeset 869 ab908b713ec5
parent 605 8dca74ad1a27
permissions -rw-r--r--
7176714 ibv_devices man page needs to be updated to show PF or VF
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
605
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 146
diff changeset 
     1
 
--- nmap-5.21/nbase/configure.~1~	2011-01-21 13:00:04.000000000 -0800
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 146
diff changeset 
     2
 
+++ nmap-5.21/nbase/configure	2011-11-28 14:25:47.655764658 -0800
146
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     3
 
@@ -1,4 +1,4 @@
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     4
 
-#! /bin/sh
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     5
 
+#! /bin/bash
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     6
 
 # Guess values for system-dependent variables and create Makefiles.
605
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 146
diff changeset 
     7
 
 # Generated by GNU Autoconf 2.66.
146
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     8
 
 #
605
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 146
diff changeset 
     9
 
@@ -237,7 +237,7 @@
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 146
diff changeset 
    10
 
 fi
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 146
diff changeset 
    11
 
 fi
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 146
diff changeset 
    12
 
 fi
146
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    13
 
-SHELL=${CONFIG_SHELL-/bin/sh}
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    14
 
+SHELL=${CONFIG_SHELL-/bin/bash}
605
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 146
diff changeset 
    15
 
 export SHELL
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 146
diff changeset 
    16
 
 # Unset more variables known to interfere with behavior of common tools.
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 146
diff changeset 
    17
 
 CLICOLOR_FORCE= GREP_OPTIONS=
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 146
diff changeset 
    18
 
@@ -613,7 +613,9 @@
146
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    19
 
 CPPFLAGS
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    20
 
 LDFLAGS
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    21
 
 CFLAGS
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    22
 
+CXXFLAGS
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    23
 
 CC
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    24
 
+CXX
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    25
 
 target_alias
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    26
 
 host_alias
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    27
 
 build_alias
605
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 146
diff changeset 
    28
 
@@ -663,7 +665,9 @@
146
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    29
 
 host_alias
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    30
 
 target_alias
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    31
 
 CC
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    32
 
+CXX
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    33
 
 CFLAGS
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    34
 
+CXXFLAGS
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    35
 
 LDFLAGS
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    36
 
 LIBS
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    37
 
 CPPFLAGS
605
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 146
diff changeset 
    38
 
@@ -705,7 +709,7 @@
146
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    39
 
 datadir='${datarootdir}'
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    40
 
 sysconfdir='${prefix}/etc'
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    41
 
 sharedstatedir='${prefix}/com'
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    42
 
-localstatedir='${prefix}/var'
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    43
 
+localstatedir=
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    44
 
 includedir='${prefix}/include'
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    45
 
 oldincludedir='/usr/include'
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    46
 
 docdir='${datarootdir}/doc/${PACKAGE}'
605
8dca74ad1a27 7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents: 146
diff changeset 
    47
 
@@ -3773,6 +3777,10 @@
146
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    48
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    49
 
 	#include <stdlib.h>
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    50
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    51
 
+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC)
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    52
 
+#error "GNU __attribute__ extension not suported "
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    53
 
+#endif
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    54
 
+
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    55
 
 	static void foo(void) __attribute__ ((noreturn));
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    56
8e22ba234817 7027466 Move nmap to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    57
 
 	static void
upstream/oracle/userland-gate