[Libreoffice-commits] .: 7 commits - dictionaries/ca dictionaries/cs_CZ dictionaries/da_DK dictionaries/de_AT dictionaries/de_CH dictionaries/de_DE dictionaries/en dictionaries/fr_FR dictionaries/hu_HU dictionaries/it_IT dictionaries/ne_NP dictionaries/no dictionaries/pl_PL dictionaries/ro dictionaries/ru_RU dictionaries/sk_SK dictionaries/sl_SI dictionaries/uk_UA gdk-pixbuf/makefile.mk libcroco/makefile.mk libgsf/makefile.mk librsvg/makefile.mk pango/makefile.mk
Tor Lillqvist
tml at kemper.freedesktop.org
Mon Jun 6 14:57:03 PDT 2011
dictionaries/ca/makefile.mk | 2 +-
dictionaries/cs_CZ/makefile.mk | 2 +-
dictionaries/da_DK/makefile.mk | 2 +-
dictionaries/de_AT/makefile.mk | 2 +-
dictionaries/de_CH/makefile.mk | 2 +-
dictionaries/de_DE/makefile.mk | 2 +-
dictionaries/en/makefile.mk | 2 +-
dictionaries/fr_FR/makefile.mk | 2 +-
dictionaries/hu_HU/makefile.mk | 2 +-
dictionaries/it_IT/makefile.mk | 2 +-
dictionaries/ne_NP/makefile.mk | 2 +-
dictionaries/no/makefile.mk | 4 ++--
dictionaries/pl_PL/makefile.mk | 2 +-
dictionaries/ro/makefile.mk | 2 +-
dictionaries/ru_RU/makefile.mk | 2 +-
dictionaries/sk_SK/makefile.mk | 2 +-
dictionaries/sl_SI/makefile.mk | 2 +-
dictionaries/uk_UA/makefile.mk | 2 +-
gdk-pixbuf/makefile.mk | 4 ++++
libcroco/makefile.mk | 4 ++++
libgsf/makefile.mk | 4 ++++
librsvg/makefile.mk | 4 ++++
pango/makefile.mk | 4 ++++
23 files changed, 39 insertions(+), 19 deletions(-)
New commits:
commit e6065f3a1aa985fa9daead03c8082fc7ed0ebf6a
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Jun 7 00:06:36 2011 +0300
Run the build platform's ixdict exectuable
diff --git a/dictionaries/ca/makefile.mk b/dictionaries/ca/makefile.mk
index ede892c..7bdb47b 100644
--- a/dictionaries/ca/makefile.mk
+++ b/dictionaries/ca/makefile.mk
@@ -93,5 +93,5 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
#.INCLUDE : $(PRJ)$/prj$/tests.mk
$(EXTENSIONDIR)$/th_ca_ES_v3.idx : "$(EXTENSIONDIR)$/th_ca_ES_v3.dat"
- $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_ca_ES_v3.idx <$(EXTENSIONDIR)$/th_ca_ES_v3.dat
+ $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_ca_ES_v3.idx <$(EXTENSIONDIR)$/th_ca_ES_v3.dat
diff --git a/dictionaries/cs_CZ/makefile.mk b/dictionaries/cs_CZ/makefile.mk
index 09371e5..427234a 100644
--- a/dictionaries/cs_CZ/makefile.mk
+++ b/dictionaries/cs_CZ/makefile.mk
@@ -77,4 +77,4 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
.INCLUDE : $(PRJ)$/prj$/tests.mk
$(EXTENSIONDIR)$/th_cs_CZ_v2.idx : "$(EXTENSIONDIR)$/th_cs_CZ_v2.dat"
- $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_cs_CZ_v2.idx <$(EXTENSIONDIR)$/th_cs_CZ_v2.dat
+ $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_cs_CZ_v2.idx <$(EXTENSIONDIR)$/th_cs_CZ_v2.dat
diff --git a/dictionaries/da_DK/makefile.mk b/dictionaries/da_DK/makefile.mk
index 9f1d7c6..f2e2f4d 100644
--- a/dictionaries/da_DK/makefile.mk
+++ b/dictionaries/da_DK/makefile.mk
@@ -88,5 +88,5 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
.INCLUDE : $(PRJ)$/prj$/tests.mk
$(EXTENSIONDIR)$/th_da_DK.idx : "$(EXTENSIONDIR)$/th_da_DK.dat"
- $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_da_DK.idx <$(EXTENSIONDIR)$/th_da_DK.dat
+ $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_da_DK.idx <$(EXTENSIONDIR)$/th_da_DK.dat
diff --git a/dictionaries/de_AT/makefile.mk b/dictionaries/de_AT/makefile.mk
index 4e1aa61..d3a7c6f 100644
--- a/dictionaries/de_AT/makefile.mk
+++ b/dictionaries/de_AT/makefile.mk
@@ -91,4 +91,4 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
#.INCLUDE : $(PRJ)$/prj$/tests.mk
$(EXTENSIONDIR)$/th_de_AT_v2.idx : "$(EXTENSIONDIR)$/th_de_AT_v2.dat"
- $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_de_AT_v2.idx <$(EXTENSIONDIR)$/th_de_AT_v2.dat
+ $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_de_AT_v2.idx <$(EXTENSIONDIR)$/th_de_AT_v2.dat
diff --git a/dictionaries/de_CH/makefile.mk b/dictionaries/de_CH/makefile.mk
index dc2580d..2c653b8 100644
--- a/dictionaries/de_CH/makefile.mk
+++ b/dictionaries/de_CH/makefile.mk
@@ -92,4 +92,4 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
#.INCLUDE : $(PRJ)$/prj$/tests.mk
$(EXTENSIONDIR)$/th_de_CH_v2.idx : "$(EXTENSIONDIR)$/th_de_CH_v2.dat"
- $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_de_CH_v2.idx <$(EXTENSIONDIR)$/th_de_CH_v2.dat
+ $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_de_CH_v2.idx <$(EXTENSIONDIR)$/th_de_CH_v2.dat
diff --git a/dictionaries/de_DE/makefile.mk b/dictionaries/de_DE/makefile.mk
index 465bc05..731da2c 100644
--- a/dictionaries/de_DE/makefile.mk
+++ b/dictionaries/de_DE/makefile.mk
@@ -90,4 +90,4 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
#.INCLUDE : $(PRJ)$/prj$/tests.mk
$(EXTENSIONDIR)$/th_de_DE_v2.idx : "$(EXTENSIONDIR)$/th_de_DE_v2.dat"
- $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_de_DE_v2.idx <$(EXTENSIONDIR)$/th_de_DE_v2.dat
+ $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_de_DE_v2.idx <$(EXTENSIONDIR)$/th_de_DE_v2.dat
diff --git a/dictionaries/en/makefile.mk b/dictionaries/en/makefile.mk
index d276dc7..7640185 100644
--- a/dictionaries/en/makefile.mk
+++ b/dictionaries/en/makefile.mk
@@ -101,4 +101,4 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
.INCLUDE : $(PRJ)$/prj$/tests.mk
$(EXTENSIONDIR)$/th_en_US_v2.idx : "$(EXTENSIONDIR)$/th_en_US_v2.dat"
- $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_en_US_v2.idx <$(EXTENSIONDIR)$/th_en_US_v2.dat
+ $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_en_US_v2.idx <$(EXTENSIONDIR)$/th_en_US_v2.dat
diff --git a/dictionaries/fr_FR/makefile.mk b/dictionaries/fr_FR/makefile.mk
index 56dafab..1b3eb46 100644
--- a/dictionaries/fr_FR/makefile.mk
+++ b/dictionaries/fr_FR/makefile.mk
@@ -84,4 +84,4 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
.INCLUDE : $(PRJ)$/prj$/tests.mk
$(EXTENSIONDIR)$/thes_fr.idx : "$(EXTENSIONDIR)$/thes_fr.dat"
- $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT)$/bin$/idxdict -o $(EXTENSIONDIR)$/thes_fr.idx <$(EXTENSIONDIR)$/thes_fr.dat
+ $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/thes_fr.idx <$(EXTENSIONDIR)$/thes_fr.dat
diff --git a/dictionaries/hu_HU/makefile.mk b/dictionaries/hu_HU/makefile.mk
index 26650da..dca137d 100644
--- a/dictionaries/hu_HU/makefile.mk
+++ b/dictionaries/hu_HU/makefile.mk
@@ -86,4 +86,4 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
#.INCLUDE : $(PRJ)$/prj$/tests.mk
$(EXTENSIONDIR)$/th_hu_HU_v2.idx : "$(EXTENSIONDIR)$/th_hu_HU_v2.dat"
- $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_hu_HU_v2.idx <$(EXTENSIONDIR)$/th_hu_HU_v2.dat
+ $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_hu_HU_v2.idx <$(EXTENSIONDIR)$/th_hu_HU_v2.dat
diff --git a/dictionaries/it_IT/makefile.mk b/dictionaries/it_IT/makefile.mk
index 1262e75..d8b2fe1 100644
--- a/dictionaries/it_IT/makefile.mk
+++ b/dictionaries/it_IT/makefile.mk
@@ -84,5 +84,5 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
.INCLUDE : $(PRJ)$/prj$/tests.mk
$(EXTENSIONDIR)$/th_it_IT_v2.idx : "$(EXTENSIONDIR)$/th_it_IT_v2.dat"
- $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_it_IT_v2.idx <$(EXTENSIONDIR)$/th_it_IT_v2.dat
+ $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_it_IT_v2.idx <$(EXTENSIONDIR)$/th_it_IT_v2.dat
diff --git a/dictionaries/ne_NP/makefile.mk b/dictionaries/ne_NP/makefile.mk
index 37aaebd..e673a17 100644
--- a/dictionaries/ne_NP/makefile.mk
+++ b/dictionaries/ne_NP/makefile.mk
@@ -80,4 +80,4 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
#.INCLUDE : $(PRJ)$/prj$/tests.mk
$(EXTENSIONDIR)$/th_ne_NP_v2.idx : "$(EXTENSIONDIR)$/th_ne_NP_v2.dat"
- $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_ne_NP_v2.idx <$(EXTENSIONDIR)$/th_ne_NP_v2.dat
+ $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_ne_NP_v2.idx <$(EXTENSIONDIR)$/th_ne_NP_v2.dat
diff --git a/dictionaries/no/makefile.mk b/dictionaries/no/makefile.mk
index 4befca1..57c5e2d 100644
--- a/dictionaries/no/makefile.mk
+++ b/dictionaries/no/makefile.mk
@@ -86,7 +86,7 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
.INCLUDE : $(PRJ)$/prj$/tests.mk
$(EXTENSIONDIR)$/th_nb_NO_v2.idx : "$(EXTENSIONDIR)$/th_nb_NO_v2.dat"
- $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_nb_NO_v2.idx <$(EXTENSIONDIR)$/th_nb_NO_v2.dat
+ $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_nb_NO_v2.idx <$(EXTENSIONDIR)$/th_nb_NO_v2.dat
$(EXTENSIONDIR)$/th_nn_NO_v2.idx : "$(EXTENSIONDIR)$/th_nn_NO_v2.dat"
- $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_nn_NO_v2.idx <$(EXTENSIONDIR)$/th_nn_NO_v2.dat
+ $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_nn_NO_v2.idx <$(EXTENSIONDIR)$/th_nn_NO_v2.dat
diff --git a/dictionaries/pl_PL/makefile.mk b/dictionaries/pl_PL/makefile.mk
index 60eac32..e85e45e 100644
--- a/dictionaries/pl_PL/makefile.mk
+++ b/dictionaries/pl_PL/makefile.mk
@@ -82,5 +82,5 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
.INCLUDE : $(PRJ)$/prj$/tests.mk
$(EXTENSIONDIR)$/th_pl_PL_v2.idx : "$(EXTENSIONDIR)$/th_pl_PL_v2.dat"
- $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_pl_PL_v2.idx <$(EXTENSIONDIR)$/th_pl_PL_v2.dat
+ $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_pl_PL_v2.idx <$(EXTENSIONDIR)$/th_pl_PL_v2.dat
diff --git a/dictionaries/ro/makefile.mk b/dictionaries/ro/makefile.mk
index cd5416a..73830ca 100644
--- a/dictionaries/ro/makefile.mk
+++ b/dictionaries/ro/makefile.mk
@@ -84,5 +84,5 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
#.INCLUDE : $(PRJ)$/prj$/tests.mk
$(EXTENSIONDIR)$/th_ro_RO_v2.idx : "$(EXTENSIONDIR)$/th_ro_RO_v2.dat"
- $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_ro_RO_v2.idx <$(EXTENSIONDIR)$/th_ro_RO_v2.dat
+ $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_ro_RO_v2.idx <$(EXTENSIONDIR)$/th_ro_RO_v2.dat
diff --git a/dictionaries/ru_RU/makefile.mk b/dictionaries/ru_RU/makefile.mk
index 726ab8e..d245219 100644
--- a/dictionaries/ru_RU/makefile.mk
+++ b/dictionaries/ru_RU/makefile.mk
@@ -81,4 +81,4 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
#.INCLUDE : $(PRJ)$/prj$/tests.mk
$(EXTENSIONDIR)$/th_ru_RU_v2.idx : "$(EXTENSIONDIR)$/th_ru_RU_v2.dat"
- $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_ru_RU_v2.idx <$(EXTENSIONDIR)$/th_ru_RU_v2.dat
+ $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_ru_RU_v2.idx <$(EXTENSIONDIR)$/th_ru_RU_v2.dat
diff --git a/dictionaries/sk_SK/makefile.mk b/dictionaries/sk_SK/makefile.mk
index 4acf9f3..d7ec90e 100644
--- a/dictionaries/sk_SK/makefile.mk
+++ b/dictionaries/sk_SK/makefile.mk
@@ -86,4 +86,4 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
#.INCLUDE : $(PRJ)$/prj$/tests.mk
$(EXTENSIONDIR)$/th_sk_SK_v2.idx : "$(EXTENSIONDIR)$/th_sk_SK_v2.dat"
- $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_sk_SK_v2.idx <$(EXTENSIONDIR)$/th_sk_SK_v2.dat
+ $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_sk_SK_v2.idx <$(EXTENSIONDIR)$/th_sk_SK_v2.dat
diff --git a/dictionaries/sl_SI/makefile.mk b/dictionaries/sl_SI/makefile.mk
index b31bca9..2c5cb7d 100644
--- a/dictionaries/sl_SI/makefile.mk
+++ b/dictionaries/sl_SI/makefile.mk
@@ -84,5 +84,5 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
.INCLUDE : $(PRJ)$/prj$/tests.mk
$(EXTENSIONDIR)$/th_sl_SI_v2.idx : "$(EXTENSIONDIR)$/th_sl_SI_v2.dat"
- $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_sl_SI_v2.idx <$(EXTENSIONDIR)$/th_sl_SI_v2.dat
+ $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_sl_SI_v2.idx <$(EXTENSIONDIR)$/th_sl_SI_v2.dat
diff --git a/dictionaries/uk_UA/makefile.mk b/dictionaries/uk_UA/makefile.mk
index bcdf035..b98c619 100644
--- a/dictionaries/uk_UA/makefile.mk
+++ b/dictionaries/uk_UA/makefile.mk
@@ -80,4 +80,4 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
.INCLUDE : extension_post.mk
$(EXTENSIONDIR)$/th_uk_UA.idx : "$(EXTENSIONDIR)$/th_uk_UA.dat"
- $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_uk_UA.idx <$(EXTENSIONDIR)$/th_uk_UA.dat
+ $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_uk_UA.idx <$(EXTENSIONDIR)$/th_uk_UA.dat
commit 1e4f5844c8aa8201a07b9ca64cbc1e00c57a740b
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Jun 7 00:05:57 2011 +0300
Add cross-compilation support
diff --git a/libcroco/makefile.mk b/libcroco/makefile.mk
index 4888bfa..9e26dde 100644
--- a/libcroco/makefile.mk
+++ b/libcroco/makefile.mk
@@ -62,6 +62,10 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL))
+.IF "$(CROSS_COMPILING)"=="YES"
+CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+.ENDIF
+
BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) \
$(GNUMAKE)
BUILD_DIR=$(CONFIGURE_DIR)
commit 625198305023b4f73f0a8e1820c20011ce83036e
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Jun 7 00:05:47 2011 +0300
Add cross-compilation support
diff --git a/librsvg/makefile.mk b/librsvg/makefile.mk
index 9ddc809..664baf6 100755
--- a/librsvg/makefile.mk
+++ b/librsvg/makefile.mk
@@ -76,6 +76,10 @@ CONFIGURE_FLAGS=--disable-gtk-theme --disable-tools --with-croco --with-svgz \
CONFIGURE_FLAGS+= CPPFLAGS="$(ARCH_FLAGS) $(EXTRA_CDEFS)"
+.IF "$(CROSS_COMPILING)"=="YES"
+CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+.ENDIF
+
BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) \
$(GNUMAKE) $(!eq,$(VERBOSE),$(NULL) V=1) -j$(MAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
commit ecb6aa79e6e30716b629f45753e037d976f25bd4
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Jun 7 00:05:37 2011 +0300
Add cross-compilation support
diff --git a/pango/makefile.mk b/pango/makefile.mk
index a5c2854..44fd080 100644
--- a/pango/makefile.mk
+++ b/pango/makefile.mk
@@ -68,6 +68,10 @@ CONFIGURE_FLAGS=--with-included-modules=yes
CONFIGURE_FLAGS+= CPPFLAGS="$(ARCH_FLAGS) $(EXTRA_CDEFS)"
CONFIGURE_ACTION+="--without-x"
+.IF "$(CROSS_COMPILING)"=="YES"
+CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+.ENDIF
+
.IF "$(VERBOSE)"!=""
VFLAG=V=1
.ENDIF
commit 163aa598c71282c2de5ffeccb258934e87e4fede
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Jun 6 16:40:31 2011 +0300
Cross-compilation support for MacOSX
diff --git a/gdk-pixbuf/makefile.mk b/gdk-pixbuf/makefile.mk
index 1e89deb..201495d 100644
--- a/gdk-pixbuf/makefile.mk
+++ b/gdk-pixbuf/makefile.mk
@@ -64,6 +64,10 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
--with-included-loaders=ani,icns,pcx,ras,tga,png,pnm,wbmp,xbm,xpm,qtif,bmp,gif,ico,jpeg \
--disable-glibtest --without-libtiff --without-libjasper
+.IF "$(CROSS_COMPILING)"=="YES"
+CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no
+.ENDIF
+
BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
BUILD_DIR=$(CONFIGURE_DIR)
commit ee8eee6a57b710211046a62e716287291a4b944b
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Jun 6 10:50:49 2011 +0300
chmod -x
diff --git a/libgsf/makefile.mk b/libgsf/makefile.mk
old mode 100755
new mode 100644
commit 5bab8f941c2341dc2abf3894fb5bcb3759e86e86
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Jun 6 10:50:30 2011 +0300
Pass --build and --host options when cross-compiling
diff --git a/libgsf/makefile.mk b/libgsf/makefile.mk
index 7e4613f..eadbe10 100755
--- a/libgsf/makefile.mk
+++ b/libgsf/makefile.mk
@@ -86,6 +86,10 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL))
+.IF "$(CROSS_COMPILING)"=="YES"
+CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+.ENDIF
+
BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) \
$(GNUMAKE)
BUILD_DIR=$(CONFIGURE_DIR)
More information about the Libreoffice-commits
mailing list