[wireshark/f15] Rediff patches.

Jan Šafránek jsafrane at fedoraproject.org
Wed May 23 10:07:46 UTC 2012


commit f01b95bca3eb7a37db0c39a16827e2734b5a1bcf
Author: Jan Safranek <jsafrane at redhat.com>
Date:   Wed May 23 12:07:34 2012 +0200

    Rediff patches.

 wireshark-libtool-pie.patch |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/wireshark-libtool-pie.patch b/wireshark-libtool-pie.patch
index 01b7f41..95cc088 100644
--- a/wireshark-libtool-pie.patch
+++ b/wireshark-libtool-pie.patch
@@ -1,11 +1,11 @@
-diff -up wireshark-1.2.6/ltmain.sh.libpie wireshark-1.2.6/ltmain.sh
---- wireshark-1.2.6/ltmain.sh.libpie	2010-01-27 17:13:14.000000000 +0100
-+++ wireshark-1.2.6/ltmain.sh	2010-03-23 17:39:43.000000000 +0100
-@@ -2499,7 +2499,6 @@ static const void *lt_preloaded_setup() 
+diff -up wireshark-1.6.8/ltmain.sh.pie wireshark-1.6.8/ltmain.sh
+--- wireshark-1.6.8/ltmain.sh.pie	2012-05-23 10:05:07.900326513 +0200
++++ wireshark-1.6.8/ltmain.sh	2012-05-23 10:05:11.786312666 +0200
+@@ -3488,7 +3488,6 @@ static const void *lt_preloaded_setup()
  	symtab_cflags=
  	for arg in $LTCFLAGS; do
  	  case $arg in
 -	  -pie | -fpie | -fPIE) ;;
- 	  *) symtab_cflags="$symtab_cflags $arg" ;;
+ 	  *) func_append symtab_cflags " $arg" ;;
  	  esac
  	done


More information about the scm-commits mailing list