[Pkg-cups-devel] r25 - in cupsys/branches/cups-1.2/debian: . patches

[Kenshi Muto]

Author: kmuto
Date: Wed Oct 26 10:27:17 2005
New Revision: 25

Modified:
   cupsys/branches/cups-1.2/debian/changelog
   cupsys/branches/cups-1.2/debian/patches/02_configure.dpatch
Log:
modify 02_configure to remove -pie/-fpie if arch = x86_64.

Modified: cupsys/branches/cups-1.2/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2/debian/changelog	(original)
+++ cupsys/branches/cups-1.2/debian/changelog	Wed Oct 26 10:27:17 2005
@@ -1,3 +1,11 @@
+cupsys (1.1.99.b1.r4748-2) experimental; urgency=medium
+
+  * EXPERIMENTAL
+  * 02_configure.dpatch: Modified to remove -pie/-fpie if arch = x86_64.
+    (closes: #335199)
+
+ -- Kenshi Muto <kmuto at debian.org>  Mon, 24 Oct 2005 11:42:59 +0000
+
 cupsys (1.1.99.b1.r4748-1) experimental; urgency=low
 
   * EXPERIMENTAL

Modified: cupsys/branches/cups-1.2/debian/patches/02_configure.dpatch
==============================================================================
--- cupsys/branches/cups-1.2/debian/patches/02_configure.dpatch	(original)
+++ cupsys/branches/cups-1.2/debian/patches/02_configure.dpatch	Wed Oct 26 10:27:17 2005
@@ -6,8 +6,8 @@
 
 @DPATCH@
 diff -urNad cupsys-1.1.99.b1.r4748~/configure cupsys-1.1.99.b1.r4748/configure
---- cupsys-1.1.99.b1.r4748~/configure	2005-10-05 12:02:18.000000000 +0000
-+++ cupsys-1.1.99.b1.r4748/configure	2005-10-05 12:05:30.874716161 +0000
+--- cupsys-1.1.99.b1.r4748~/configure	2005-10-26 09:49:23.000000000 +0000
++++ cupsys-1.1.99.b1.r4748/configure	2005-10-26 09:51:46.934834106 +0000
 @@ -7363,9 +7363,9 @@
                          ;;
                  Linux | GNU)
@@ -21,3 +21,20 @@
                          ;;
  	esac
  else
+@@ -7446,6 +7446,8 @@
+ 
+ 	case $uname in
+ 		Linux*)
++			arch=`arch`
++			if [ "$arch" != "x86_64" ]; then
+ 			echo "$as_me:$LINENO: checking if GCC supports -fpie" >&5
+ echo $ECHO_N "checking if GCC supports -fpie... $ECHO_C" >&6
+ 
+@@ -7500,6 +7502,7 @@
+ echo "${ECHO_T}no" >&6
+ fi
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++			fi
+ 			;;
+ 	esac
+