r12766 - /desktop/unstable/bug-buddy/debian/patches/02_disable_breakpad.patch
sjoerd at users.alioth.debian.org
sjoerd at users.alioth.debian.org
Sun Sep 23 11:30:59 UTC 2007
Author: sjoerd
Date: Sun Sep 23 11:30:58 2007
New Revision: 12766
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12766
Log:
debian/patches/02_disable_breakpad.patch: Update to not even run configure in google-breakpad if it's not enabled
Modified:
desktop/unstable/bug-buddy/debian/patches/02_disable_breakpad.patch
Modified: desktop/unstable/bug-buddy/debian/patches/02_disable_breakpad.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/bug-buddy/debian/patches/02_disable_breakpad.patch?rev=12766&op=diff
==============================================================================
--- desktop/unstable/bug-buddy/debian/patches/02_disable_breakpad.patch (original)
+++ desktop/unstable/bug-buddy/debian/patches/02_disable_breakpad.patch Sun Sep 23 11:30:58 2007
@@ -1,34 +1,92 @@
---- bug-buddy-2.20.0-vanilla/configure.in 2007-09-17 22:02:09.000000000 +0200
-+++ bug-buddy-2.20.0/configure.in 2007-09-23 12:28:40.000000000 +0200
-@@ -77,24 +77,33 @@
+Index: configure.in
+===================================================================
+--- configure.in (revision 2429)
++++ configure.in (working copy)
+@@ -76,25 +76,32 @@
+ AC_CHECK_HEADERS([libelf.h],[],[AC_MSG_ERROR([libelf.h not found.])])
AC_CHECK_HEADERS([gelf.h],[],[AC_MSG_ERROR([gelf.h not found.])])
- AC_CONFIG_SUBDIRS(google-breakpad)
+-AC_CONFIG_SUBDIRS(google-breakpad)
-GOOGLE_BREAKPAD_SUPPORTED_OS="no"
-case $target_os in
- solaris*) ;;
- linux*)
- GOOGLE_BREAKPAD_SUPPORTED_OS="yes" ;;
-esac
--
++AC_ARG_ENABLE(google-breakpad,
++ AC_HELP_STRING([--disable-google-breakpad],
++ [compile without google breakpad]),
++ enable_google_breakpad=$enableval, enable_google_breakpad=yes)
+
-GOOGLE_BREAKPAD_SUPPORTED_ARCH="no"
-case $target_cpu in
- *86)
- GOOGLE_BREAKPAD_SUPPORTED_ARCH="yes" ;;
-esac
--
++if test x$enable_google_breakpad = xyes; then
++ GOOGLE_BREAKPAD_SUPPORTED_OS="no"
++ case $target_os in
++ solaris*) ;;
++ linux*)
++ GOOGLE_BREAKPAD_SUPPORTED_OS="yes" ;;
++ esac
+
-if test x$GOOGLE_BREAKPAD_SUPPORTED_OS = xyes ; then
- if test x$GOOGLE_BREAKPAD_SUPPORTED_ARCH = xyes ; then
- echo "OS and CPU supported: enabling google-breakpad"
- AC_DEFINE(ENABLE_GOOGLE_BREAKPAD, 1, [define if google-break is enabled])
- use_google_breakpad=yes
++ GOOGLE_BREAKPAD_SUPPORTED_ARCH="no"
++ case $target_cpu in
++ *86)
++ GOOGLE_BREAKPAD_SUPPORTED_ARCH="yes" ;;
++ esac
+
-+
-+AC_ARG_ENABLE(google-breakpad,
-+ AC_HELP_STRING([--disable-google-breakpad],
-+ [compile without google breakpad]),
-+ enable_google_breakpad=$enableval, enable_google_breakpad=yes)
-+
++ if test x$GOOGLE_BREAKPAD_SUPPORTED_OS = xyes ; then
++ if test x$GOOGLE_BREAKPAD_SUPPORTED_ARCH = xyes ; then
++ echo "OS and CPU supported: enabling google-breakpad"
++ AC_DEFINE(ENABLE_GOOGLE_BREAKPAD, 1, [define if google-break is enabled])
++ AC_CONFIG_SUBDIRS(google-breakpad)
++ use_google_breakpad=yes
++ fi
+ fi
+ fi
+
+--- configure 2007-09-17 23:52:25.000000000 +0200
++++ configure 2007-09-23 13:05:26.000000000 +0200
+@@ -1564,6 +1563,8 @@
+ --enable-fast-install[=PKGS]
+ optimize for fast installation [default=yes]
+ --disable-libtool-lock avoid locking (might break parallel builds)
++ --disable-google-breakpad
++ compile without google breakpad
+ --enable-compile-warnings=[no/minimum/yes/maximum/error]
+ Turn on compiler warnings
+ --enable-iso-c Try to warn if code is not ISO C
+@@ -21594,34 +21720,46 @@
+ done
+
+
+-subdirs="$subdirs google-breakpad"
++# Check whether --enable-google-breakpad was given.
++if test "${enable_google_breakpad+set}" = set; then
++ enableval=$enable_google_breakpad; enable_google_breakpad=$enableval
++else
++ enable_google_breakpad=yes
++fi
+
+-GOOGLE_BREAKPAD_SUPPORTED_OS="no"
+-case $target_os in
+- solaris*) ;;
+- linux*)
+- GOOGLE_BREAKPAD_SUPPORTED_OS="yes" ;;
+-esac
+
+-GOOGLE_BREAKPAD_SUPPORTED_ARCH="no"
+-case $target_cpu in
+- *86)
+- GOOGLE_BREAKPAD_SUPPORTED_ARCH="yes" ;;
+-esac
+if test x$enable_google_breakpad = xyes; then
+ GOOGLE_BREAKPAD_SUPPORTED_OS="no"
+ case $target_os in
@@ -42,71 +100,10 @@
+ *86)
+ GOOGLE_BREAKPAD_SUPPORTED_ARCH="yes" ;;
+ esac
-+
-+ if test x$GOOGLE_BREAKPAD_SUPPORTED_OS = xyes ; then
-+ if test x$GOOGLE_BREAKPAD_SUPPORTED_ARCH = xyes ; then
-+ echo "OS and CPU supported: enabling google-breakpad"
-+ AC_DEFINE(ENABLE_GOOGLE_BREAKPAD, 1, [define if google-break is enabled])
-+ use_google_breakpad=yes
-+ fi
- fi
- fi
---- bug-buddy-2.20.0-vanilla/configure 2007-09-17 23:52:25.000000000 +0200
-+++ bug-buddy-2.20.0/configure 2007-09-23 12:32:18.000000000 +0200
-@@ -1564,6 +1563,8 @@
- --enable-fast-install[=PKGS]
- optimize for fast installation [default=yes]
- --disable-libtool-lock avoid locking (might break parallel builds)
-+ --disable-google-breakpad
-+ compile without google breakpad
- --enable-compile-warnings=[no/minimum/yes/maximum/error]
- Turn on compiler warnings
- --enable-iso-c Try to warn if code is not ISO C
-@@ -21596,32 +21722,46 @@
-
- subdirs="$subdirs google-breakpad"
-
--GOOGLE_BREAKPAD_SUPPORTED_OS="no"
--case $target_os in
-- solaris*) ;;
-- linux*)
-- GOOGLE_BREAKPAD_SUPPORTED_OS="yes" ;;
--esac
--
--GOOGLE_BREAKPAD_SUPPORTED_ARCH="no"
--case $target_cpu in
-- *86)
-- GOOGLE_BREAKPAD_SUPPORTED_ARCH="yes" ;;
--esac
--
-if test x$GOOGLE_BREAKPAD_SUPPORTED_OS = xyes ; then
- if test x$GOOGLE_BREAKPAD_SUPPORTED_ARCH = xyes ; then
- echo "OS and CPU supported: enabling google-breakpad"
-+
-+
-+# Check whether --enable-google-breakpad was given.
-+if test "${enable_google_breakpad+set}" = set; then
-+ enableval=$enable_google_breakpad; enable_google_breakpad=$enableval
-+else
-+ enable_google_breakpad=yes
-+fi
-+
-+
-+if test x$enable_google_breakpad = xyes; then
-+ GOOGLE_BREAKPAD_SUPPORTED_OS="no"
-+ case $target_os in
-+ solaris*) ;;
-+ linux*)
-+ GOOGLE_BREAKPAD_SUPPORTED_OS="yes" ;;
-+ esac
-+
-+ GOOGLE_BREAKPAD_SUPPORTED_ARCH="no"
-+ case $target_cpu in
-+ *86)
-+ GOOGLE_BREAKPAD_SUPPORTED_ARCH="yes" ;;
-+ esac
-+
+ if test x$GOOGLE_BREAKPAD_SUPPORTED_OS = xyes ; then
+ if test x$GOOGLE_BREAKPAD_SUPPORTED_ARCH = xyes ; then
+ echo "OS and CPU supported: enabling google-breakpad"
@@ -116,6 +113,8 @@
_ACEOF
- use_google_breakpad=yes
++ subdirs="$subdirs google-breakpad"
++
+ use_google_breakpad=yes
+ fi
fi
More information about the pkg-gnome-commits
mailing list