[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - icu/arm-assembler.patch icu/makefile.mk Repository.mk svx/Executable_gengal.bin.mk

[René Engelhard]

 Repository.mk                |    1 +
 icu/arm-assembler.patch      |   24 ++++++++++++++++++++++++
 icu/makefile.mk              |    3 ++-
 svx/Executable_gengal.bin.mk |   23 +++++++++++++++--------
 4 files changed, 42 insertions(+), 9 deletions(-)

New commits:
commit fdfaf2cd8488d0d527993672db9407307eab39aa
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Feb 19 15:51:34 2012 +0000

    fix windows build, gengal.bin should be gengal.exe there according to scp2

diff --git a/Repository.mk b/Repository.mk
index 5df6c87..daa6d2d 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -52,6 +52,7 @@ ifeq ($(OS),WNT)
 
 $(eval $(call gb_Helper_register_executables,OOO,\
 	crashrep_com \
+	gengal \
 	guiloader \
 	guistdio \
 	odbcconfig \
diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk
index 36f7752..3143e5f 100644
--- a/svx/Executable_gengal.bin.mk
+++ b/svx/Executable_gengal.bin.mk
@@ -25,9 +25,16 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_Executable_Executable,gengal.bin))
+ifeq ($(OS),WNT)
+gengalbin := gengal
+else
+gengalbin := gengal.bin
+endif
+
+
+$(eval $(call gb_Executable_Executable,$(gengalbin)))
 
-$(eval $(call gb_Executable_set_include,gengal.bin,\
+$(eval $(call gb_Executable_set_include,$(gengalbin),\
     $$(INCLUDE) \
     -I$(SRCDIR)/svx/inc/ \
     -I$(SRCDIR)/svx/inc/pch \
@@ -36,11 +43,11 @@ $(eval $(call gb_Executable_set_include,gengal.bin,\
     -I$(OUTDIR)/inc/offapi \
 ))
 
-$(eval $(call gb_Executable_add_cxxflags,gengal.bin,\
+$(eval $(call gb_Executable_add_cxxflags,$(gengalbin),\
     $$(CXXFLAGS) \
 ))
 
-$(eval $(call gb_Executable_add_linked_libs,gengal.bin,\
+$(eval $(call gb_Executable_add_linked_libs,$(gengalbin),\
     sal \
     tl \
     svl \
@@ -52,16 +59,16 @@ $(eval $(call gb_Executable_add_linked_libs,gengal.bin,\
     svxcore \
 ))
 
-$(eval $(call gb_Executable_add_exception_objects,gengal.bin,\
+$(eval $(call gb_Executable_add_exception_objects,$(gengalbin),\
     svx/source/gengal/gengal \
 ))
 
-$(eval $(call gb_Executable_add_linked_static_libs,gengal.bin,\
+$(eval $(call gb_Executable_add_linked_static_libs,$(gengalbin),\
     vclmain \
 ))
 
 ifeq ($(OS),WNT)
-$(eval $(call gb_Executable_add_linked_libs,gengal.bin,\
+$(eval $(call gb_Executable_add_linked_libs,$(gengalbin),\
     kernel32 \
     msvcrt \
     oldnames \
@@ -71,7 +78,7 @@ $(eval $(call gb_Executable_add_linked_libs,gengal.bin,\
 endif
 
 ifeq ($(OS),LINUX)
-$(eval $(call gb_Executable_add_linked_libs,gengal.bin,\
+$(eval $(call gb_Executable_add_linked_libs,$(gengalbin),\
     dl \
     pthread \
 ))
commit 30d5fa85a2fadd473d82fe76445840393ac6bf8d
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Feb 17 15:37:20 2012 +0100

    fix icu build on arm
    
    (from http://patch-tracker.debian.org/patch/series/view/icu/4.4.1-7/arm-assembler.patch)

diff --git a/icu/arm-assembler.patch b/icu/arm-assembler.patch
new file mode 100644
index 0000000..752f9ad
--- /dev/null
+++ b/icu/arm-assembler.patch
@@ -0,0 +1,24 @@
+Index: icu-4.4.1/source/tools/toolutil/pkg_genc.c
+===================================================================
+--- misc/icu/source/tools/toolutil/pkg_genc.c	2010-04-28 11:27:46.000000000 -0400
++++ misc/build/icu/source/tools/toolutil/pkg_genc.c	2010-07-17 07:31:54.408752610 -0400
+@@ -1,5 +1,5 @@
+ /******************************************************************************
+- *   Copyright (C) 2009, International Business Machines
++ *   Copyright (C) 2009-2010, International Business Machines
+  *   Corporation and others.  All Rights Reserved.
+  *******************************************************************************
+  */
+@@ -118,10 +118,10 @@
+ } assemblyHeader[] = {
+     {"gcc",
+         ".globl %s\n"
+-        "\t.section .note.GNU-stack,\"\", at progbits\n"
++        "\t.section .note.GNU-stack,\"\",%%progbits\n"
+         "\t.section .rodata\n"
+         "\t.align 8\n" /* Either align 8 bytes or 2^8 (256) bytes. 8 bytes is needed. */
+-        "\t.type %s, at object\n"
++        "\t.type %s,%%object\n"
+         "%s:\n\n",
+ 
+         ".long ","",HEX_0X
diff --git a/icu/makefile.mk b/icu/makefile.mk
index cb02475..338333c 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -53,7 +53,8 @@ PATCH_FILES=\
     icu4c-warnings.patch \
     icu4c-escapespace.patch \
     icu4c-strict-c.patch \
-    CVE-2011-4599.patch
+    CVE-2011-4599.patch \
+    arm-assembler.patch
 
 .IF "$(OS)"=="ANDROID"
 PATCH_FILES+=\