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

[Kenshi Muto]

Author: kmuto
Date: Wed Nov 16 12:43:50 2005
New Revision: 35

Removed:
   cupsys/branches/cups-1.2/debian/patches/00_r4815.dpatch
   cupsys/branches/cups-1.2/debian/patches/00_r4835.dpatch
Modified:
   cupsys/branches/cups-1.2/debian/changelog
   cupsys/branches/cups-1.2/debian/patches/00list
   cupsys/branches/cups-1.2/debian/patches/02_configure.dpatch
Log:
upgraded base svn to r4841. remove -pie/-fpie from compiler option.

Modified: cupsys/branches/cups-1.2/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2/debian/changelog	(original)
+++ cupsys/branches/cups-1.2/debian/changelog	Wed Nov 16 12:43:50 2005
@@ -1,3 +1,13 @@
+cupsys (1.1.99.b1.r4841-1) experimental; urgency=low
+
+  * EXPERIMENTAL
+  * New SVN release taken from r4841.
+  * Remove -pie and -fpie from compiler option. pie option causes
+    a problem with Debian binutils.
+    I hope this change avoids FTBFS on sparc and others. (closes: #339120)
+
+ -- Kenshi Muto <kmuto at debian.org>  Wed, 16 Nov 2005 12:27:27 +0000
+
 cupsys (1.1.99.b1.r4748-4) experimental; urgency=low
 
   * EXPERIMENTAL

Modified: cupsys/branches/cups-1.2/debian/patches/00list
==============================================================================
--- cupsys/branches/cups-1.2/debian/patches/00list	(original)
+++ cupsys/branches/cups-1.2/debian/patches/00list	Wed Nov 16 12:43:50 2005
@@ -1,5 +1,3 @@
-#00_r4815.dpatch
-00_r4835.dpatch
 02_configure.dpatch
 03_manext.dpatch
 04_freebsd.dpatch

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 Nov 16 12:43:50 2005
@@ -5,10 +5,10 @@
 ## DP: No description.
 
 @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-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 @@
+diff -urNad cupsys-1.1.99.b1.r4841~/configure cupsys-1.1.99.b1.r4841/configure
+--- cupsys-1.1.99.b1.r4841~/configure	2005-11-16 12:26:04.000000000 +0000
++++ cupsys-1.1.99.b1.r4841/configure	2005-11-16 12:31:18.548920363 +0000
+@@ -7280,9 +7280,9 @@
                          ;;
                  Linux | GNU)
                          # Linux and HURD
@@ -21,20 +21,69 @@
                          ;;
  	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
+@@ -7357,65 +7357,6 @@
+     		OPTIM="-fPIC $OPTIM"
+ 	fi
  
+-	case $uname in
+-		Linux*)
+-			echo "$as_me:$LINENO: checking if GCC supports -fpie" >&5
+-echo $ECHO_N "checking if GCC supports -fpie... $ECHO_C" >&6
+-
+-			OLDCFLAGS="$CFLAGS"
+-			CFLAGS="$CFLAGS -fpie"
+-			cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  OPTIM="$OPTIM -fpie"
+-				LDFLAGS="$LDFLAGS -pie"
+-				echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-CFLAGS="$OLDCFLAGS"
+-				echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-			;;
+-	esac
+-
+ 	if test "x$with_optim" = x; then
+ 		# Add useful warning options for tracking down problems...
+ 		OPTIM="-Wall -Wno-format-y2k $OPTIM"