Mercurial Mercurial > sustaining > oi_151a > sfw-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.
usr/src/cmd/apache2/patches/template/configure.patch
author Cyril Plisko <cyril.plisko@grigale.com>
Fri, 03 Sep 2010 00:29:14 -0700
changeset 44 6135d8b0a676
parent 12 12fc69ddc5a5
permissions -rw-r--r--
Import sfw build 148 Bugs Fixed ---------- 6972023 Upgrade httpd to 2.2.16 (CVE-2010-1452, CVE-2010-2068) 6973415 Wireshark update to version 1.2.10 6977822 huh, what? more package copyright changes? 6978791 6974208 needs an iterim solution
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
44
6135d8b0a676 Import sfw build 148
Cyril Plisko <cyril.plisko@grigale.com>
parents: 12
diff changeset 
     1
 
--- configure.orig
6135d8b0a676 Import sfw build 148
Cyril Plisko <cyril.plisko@grigale.com>
parents: 12
diff changeset 
     2
 
+++ configure
6135d8b0a676 Import sfw build 148
Cyril Plisko <cyril.plisko@grigale.com>
parents: 12
diff changeset 
     3
 
@@ -6704,7 +6704,7 @@
0
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     4
 
   int main() { return 0; }
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     5
 
 EOF
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     6
 
   MKDEP="true"
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     7
 
-  for i in "$CC -MM" "$CC -M" "$CPP -MM" "$CPP -M" "cpp -M"; do
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     8
 
+  for i in "$CC -MM" "$CC -M" "$CC -xM" "$CPP -MM" "$CPP -M" "$CPP -xM" "cpp -M"; do
44
6135d8b0a676 Import sfw build 148
Cyril Plisko <cyril.plisko@grigale.com>
parents: 12
diff changeset 
     9
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $i can create proper make dependencies" >&5
0
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    10
 
 $as_echo_n "checking if $i can create proper make dependencies... " >&6; }
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    11
 
     if $i conftest.c 2>/dev/null | grep 'conftest.o: conftest.c' >/dev/null; then
44
6135d8b0a676 Import sfw build 148
Cyril Plisko <cyril.plisko@grigale.com>
parents: 12
diff changeset 
    12
 
@@ -13391,10 +13391,10 @@
0
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    13
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    14
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    15
 
   if test "x$LDFLAGS" = "x"; then
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    16
 
-    test "x$silent" != "xyes" && echo "  setting LDFLAGS to \"-L$ap_ssltk_base/lib\""
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    17
 
-    LDFLAGS="-L$ap_ssltk_base/lib"
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    18
 
+    test "x$silent" != "xyes" && echo "  setting LDFLAGS to \"-L$ap_ssltk_base/lib::ISAINFO::\""
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    19
 
+    LDFLAGS="-L$ap_ssltk_base/lib::ISAINFO::"
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    20
 
   else
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    21
 
-    apr_addto_bugger="-L$ap_ssltk_base/lib"
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    22
 
+    apr_addto_bugger="-L$ap_ssltk_base/lib::ISAINFO::"
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    23
 
     for i in $apr_addto_bugger; do
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    24
 
       apr_addto_duplicate="0"
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    25
 
       for j in $LDFLAGS; do
44
6135d8b0a676 Import sfw build 148
Cyril Plisko <cyril.plisko@grigale.com>
parents: 12
diff changeset 
    26
 
@@ -13413,10 +13413,10 @@
0
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    27
 
     if test "x$ap_platform_runtime_link_flag" != "x"; then
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    28
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    29
 
   if test "x$LDFLAGS" = "x"; then
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    30
 
-    test "x$silent" != "xyes" && echo "  setting LDFLAGS to \"$ap_platform_runtime_link_flag$ap_ssltk_base/lib\""
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    31
 
-    LDFLAGS="$ap_platform_runtime_link_flag$ap_ssltk_base/lib"
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    32
 
+    test "x$silent" != "xyes" && echo "  setting LDFLAGS to \"$ap_platform_runtime_link_flag$ap_ssltk_base/lib::ISAINFO::\""
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    33
 
+    LDFLAGS="$ap_platform_runtime_link_flag$ap_ssltk_base/lib::ISAINFO::"
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    34
 
   else
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    35
 
-    apr_addto_bugger="$ap_platform_runtime_link_flag$ap_ssltk_base/lib"
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    36
 
+    apr_addto_bugger="$ap_platform_runtime_link_flag$ap_ssltk_base/lib::ISAINFO::"
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    37
 
     for i in $apr_addto_bugger; do
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    38
 
       apr_addto_duplicate="0"
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    39
 
       for j in $LDFLAGS; do
sustaining/oi_151a/sfw-gate