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

[rengelhard svn gnome org]

Author: rengelhard
Date: Wed Dec 10 16:48:41 2008
New Revision: 14816
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14816&view=rev

Log:
        * patches/dev300/configures-explicit-arch.diff: update for m36
        * patches/dev300/apply: reenable onfigures-explicit-arch.diff


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/configures-explicit-arch.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Dec 10 16:48:41 2008
@@ -2325,7 +2325,7 @@
 palette-enhanced-hatch.diff
 
 [ DebianBaseOnly ]
-#FIXME#configures-explicit-arch.diff
+configures-explicit-arch.diff
 
 
 [ Fixes ]

Modified: trunk/patches/dev300/configures-explicit-arch.diff
==============================================================================
--- trunk/patches/dev300/configures-explicit-arch.diff	(original)
+++ trunk/patches/dev300/configures-explicit-arch.diff	Wed Dec 10 16:48:41 2008
@@ -121,12 +121,12 @@
 diff -u -u -r1.37.16.1 makefile.mk
 --- icu/makefile.mk	2 Jan 2008 17:31:44 -0000	1.37.16.1
 +++ icu/makefile.mk	11 Apr 2008 07:54:08 -0000
-@@ -96,7 +96,7 @@
+@@ -100,7 +100,7 @@
  
  CONFIGURE_DIR=source
  
--CONFIGURE_ACTION=sh -c 'CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS)" ./configure --enable-layout --enable-static --enable-shared=yes $(DISABLE_64BIT)'
-+CONFIGURE_ACTION=sh -c 'CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --enable-layout --enable-static --enable-shared=yes $(DISABLE_64BIT)'
+-CONFIGURE_ACTION+=sh -c 'CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS)" ./configure --enable-layout --enable-static --enable-shared=yes $(DISABLE_64BIT)'
++CONFIGURE_ACTION+=sh -c 'CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --enable-layout --enable-static --enable-shared=yes $(DISABLE_64BIT)'
  
  #CONFIGURE_FLAGS=--enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no
  CONFIGURE_FLAGS=
@@ -169,12 +169,12 @@
 diff -u -u -r1.15.6.1 makefile.mk
 --- libxmlsec/makefile.mk	2 Jan 2008 17:29:48 -0000	1.15.6.1
 +++ libxmlsec/makefile.mk	11 Apr 2008 07:54:08 -0000
-@@ -139,7 +139,7 @@
+@@ -131,7 +131,7 @@
+ .ENDIF
  CONFIGURE_DIR=
- #CONFIGURE_ACTION=chmod 777 libxml2-config && .$/configure CFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS="$(xmlsec_CPPFLAGS)" LDFLAGS="$(xmlsec_LDFLAGS)"
  CONFIGURE_ACTION=chmod 777 libxml2-config && .$/configure ADDCFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS="$(xmlsec_CPPFLAGS)"
--CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no LIBXML2LIB="$(LIBXML2LIB)" ZLIB3RDLIB=$(ZLIB3RDLIB)
-+CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) LIBXML2LIB="$(LIBXML2LIB)" ZLIB3RDLIB=$(ZLIB3RDLIB)
+-CONFIGURE_FLAGS=--with-pic --disable-shared --with-libxslt=no --with-openssl=no --with-gnutls=no LIBXML2LIB="$(LIBXML2LIB)" ZLIB3RDLIB=$(ZLIB3RDLIB)
++CONFIGURE_FLAGS=--with-pic --disable-shared --with-libxslt=no --with-openssl=no --with-gnutls=no --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) LIBXML2LIB="$(LIBXML2LIB)" ZLIB3RDLIB=$(ZLIB3RDLIB)
  # system-mozilla needs pkgconfig to get the information about nss
  # FIXME: This also will enable pkg-config usage for libxml2. It *seems*
  # that the internal headers still are used when they are there but....