[ooo-build-commit] .: 2 commits - patches/dev300

[René Engelhard]

 patches/dev300/cws-kfreebsdport01v2.diff |   12 ------------
 patches/dev300/icu-arm.diff              |   18 ++++++++++++------
 2 files changed, 12 insertions(+), 18 deletions(-)

New commits:
commit c8691a228fce32ebdcb87d893f1c48cffa2163ba
Author: Rene Engelhard <rene at debian.org>
Date:   Fri May 21 00:49:51 2010 +0200

    remove obsolete hunk in cws-kfreebsdport01v2.diff
    
    * patches/dev300/cws-kfreebsdport01v2.diff: cwscheckapi is gone

diff --git a/patches/dev300/cws-kfreebsdport01v2.diff b/patches/dev300/cws-kfreebsdport01v2.diff
index 70f7f67..de602de 100644
--- a/patches/dev300/cws-kfreebsdport01v2.diff
+++ b/patches/dev300/cws-kfreebsdport01v2.diff
@@ -8234,18 +8234,6 @@ diff --git a/set_soenv.in b/set_soenv.in
  elsif ( $platform =~ m/freebsd/ ) 
  {     $BIG_SVX        = "TRUE";
        $COM            = "GCC";
-diff --git a/solenv/bin/cwscheckapi b/solenv/bin/cwscheckapi
---- solenv/bin/cwscheckapi
-+++ solenv/bin/cwscheckapi
-@@ -55,7 +55,7 @@
-         elif [ "$OSTYPE" == "solaris" ]; then
-             CWSENV=SolarisX86
-         else
--            CWSENV=Unknown
-+            CWSENV=linux
-         fi
-         perl $SOLARENV/bin/cwstestresult.pl -c $CWS_WORK_STAMP -n CWSCheckAPI -p $CWSENV $PT_STATUS
-     else
 diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
 --- solenv/bin/modules/installer/globals.pm
 +++ solenv/bin/modules/installer/globals.pm
commit 62c54116692d69d094e4cdabba0fe6df064f8b02
Author: Rene Engelhard <rene at debian.org>
Date:   Fri May 21 00:49:07 2010 +0200

    update icu-arm.diff for m77
    
    * patches/dev300/icu-arm.diff: update for m77, add .IF directly here
      instead of relying on an invented ICU_ARCH_FLAGS

diff --git a/patches/dev300/icu-arm.diff b/patches/dev300/icu-arm.diff
index 67c7d0d..95cdb9b 100644
--- a/patches/dev300/icu-arm.diff
+++ b/patches/dev300/icu-arm.diff
@@ -1,14 +1,20 @@
 --- icu/makefile.mk~	2009-09-12 12:57:47.000000000 +0200
 +++ icu/makefile.mk	2009-09-12 13:13:18.000000000 +0200
-@@ -85,9 +85,9 @@
- icu_LDFLAGS+=-Wl,-z,noexecstack
+@@ -84,8 +84,16 @@
  .ENDIF
  
--icu_CFLAGS+=-O $(ARCH_FLAGS) $(EXTRA_CDEFS)
-+icu_CFLAGS+=-O $(ARCH_FLAGS) $(ICU_ARCH_FLAGS) $(EXTRA_CDEFS)
+ icu_CFLAGS+=-O $(ARCH_FLAGS) $(EXTRA_CDEFS)
++.IF "$(CPUNAME)" == "ARM" && "$(OS)" == "LINUX"
++icu_CFLAGS+=-Os
++.ENDIF
++icu_CFLAGS+=$(EXTRA_CDEFS)
  icu_LDFLAGS+=$(EXTRA_LINKFLAGS)
 -icu_CXXFLAGS+=-O $(ARCH_FLAGS) $(EXTRA_CDEFS)
-+icu_CXXFLAGS+=-O $(ARCH_FLAGS) $(ICU_ARCH_FLAGS) $(EXTRA_CDEFS)
++icu_CXXFLAGS+=-O $(ARCH_FLAGS)
++.IF "$(CPUNAME)" == "ARM" && "$(OS)" == "LINUX"
++icu_CXXFLAGS+=-Os
++.ENDIF
++icu_CXXFLAGS+=$(EXTRA_CDEFS)
  
- BUILD_ACTION_SEP=;
  # remove conversion and transliteration data to reduce binary size.
+ CONFIGURE_ACTION=rm data/mappings/ucm*.mk data/translit/trn*.mk ;