ooo-build r12171 - in trunk: . patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Tue Apr 15 18:04:45 2008
New Revision: 12171
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12171&view=rev

Log:
2008-04-15  Rene Engelhard  <rene debian org>

        *  patches/dev300/configures-explicit-arch.diff: dev300 version


Added:
   trunk/patches/dev300/configures-explicit-arch.diff
      - copied, changed from r12168, /trunk/patches/src680/configures-explicit-arch.diff
Modified:
   trunk/ChangeLog

Copied: trunk/patches/dev300/configures-explicit-arch.diff (from r12168, /trunk/patches/src680/configures-explicit-arch.diff)
==============================================================================
--- /trunk/patches/src680/configures-explicit-arch.diff	(original)
+++ trunk/patches/dev300/configures-explicit-arch.diff	Tue Apr 15 18:04:45 2008
@@ -164,8 +164,8 @@
  
  CONFIGURE_DIR=
  CONFIGURE_ACTION=.$/configure
--CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=no --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS)" CFLAGS="$(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)"
-+CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=no --with-sax1=yes --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) ADDCFLAGS="$(xml2_CFLAGS)" CFLAGS="$(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)"
+-CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=no --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS) $(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)"
++CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=no --with-sax1=yes --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) ADDCFLAGS="$(xml2_CFLAGS) $(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)"
  BUILD_ACTION=$(GNUMAKE)
  BUILD_FLAGS+= -j$(EXTMAXPROCESS)
  BUILD_DIR=$(CONFIGURE_DIR)
@@ -201,22 +201,6 @@
  BUILD_ACTION=$(GNUMAKE)
  BUILD_FLAGS+= -j$(EXTMAXPROCESS)
  BUILD_DIR=$(CONFIGURE_DIR)
-Index: portaudio/makefile.mk
-===================================================================
-RCS file: /cvs/external/portaudio/Attic/makefile.mk,v
-retrieving revision 1.5
-diff -u -u -r1.5 makefile.mk
---- portaudio/makefile.mk	8 Sep 2005 16:30:55 -0000	1.5
-+++ portaudio/makefile.mk	11 Apr 2008 07:54:08 -0000
-@@ -53,7 +53,7 @@
- CONFIGURE_DIR=
- 
- CONFIGURE_ACTION=./configure
--CONFIGURE_FLAGS=
-+CONFIGURE_FLAGS= --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
- BUILD_DIR=$(CONFIGURE_DIR)
- BUILD_ACTION=$(GNUMAKE)
- 
 Index: python/makefile.mk
 ===================================================================
 RCS file: /cvs/external/python/makefile.mk,v
@@ -233,19 +217,3 @@
  .IF "$(OS)$(CPU)" == "SOLARISI"
  CONFIGURE_ACTION += --disable-ipv6
  .ENDIF
-Index: sndfile/makefile.mk
-===================================================================
-RCS file: /cvs/external/sndfile/Attic/makefile.mk,v
-retrieving revision 1.9
-diff -u -u -r1.9 makefile.mk
---- sndfile/makefile.mk	26 Mar 2007 12:22:58 -0000	1.9
-+++ sndfile/makefile.mk	11 Apr 2008 07:54:08 -0000
-@@ -63,7 +63,7 @@
- .EXPORT: LDFLAGS
- .ENDIF
- 
--CONFIGURE_ACTION=./configure --with-pic
-+CONFIGURE_ACTION=./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --with-pic
- 
- BUILD_DIR=$(CONFIGURE_DIR)
- BUILD_ACTION=$(GNUMAKE)