[Libreoffice-commits] .: berkeleydb/makefile.mk cairo/cairo cairo/pixman curl/makefile.mk expat/makefile.mk gettext/makefile.mk glib/makefile.mk hunspell/makefile.mk icu/makefile.mk libxml2/makefile.mk libxslt/makefile.mk
Tor Lillqvist
tml at kemper.freedesktop.org
Sun Jun 5 23:08:54 PDT 2011
berkeleydb/makefile.mk | 2 +-
cairo/cairo/makefile.mk | 4 ++--
cairo/pixman/makefile.mk | 4 ++--
curl/makefile.mk | 2 +-
expat/makefile.mk | 2 +-
gettext/makefile.mk | 2 +-
glib/makefile.mk | 2 +-
hunspell/makefile.mk | 2 +-
icu/makefile.mk | 2 +-
libxml2/makefile.mk | 2 +-
libxslt/makefile.mk | 2 +-
11 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 39ff0c2d9bd90e727da86833de7b4345da2218ac
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Jun 6 09:07:30 2011 +0300
Always compare CROSS_COMPILING explicitly to "YES"
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk
index f755075..20c5340 100644
--- a/berkeleydb/makefile.mk
+++ b/berkeleydb/makefile.mk
@@ -103,7 +103,7 @@ CONFIGURE_FLAGS+= --enable-shared
.IF "$(OS)"=="MACOSX"
CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)"
.ENDIF
-.IF "$(CROSS_COMPILING)"!=""
+.IF "$(CROSS_COMPILING)"=="YES"
CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
.ENDIF
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index abe850d..754ceba 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -109,7 +109,7 @@ cairo_CPPFLAGS+=$(EXTRA_CFLAGS) $(EXTRA_CDEFS)
CONFIGURE_DIR=
CONFIGURE_ACTION=cp $(SRC_ROOT)$/$(PRJNAME)$/cairo$/dummy_pkg_config . && .$/configure
CONFIGURE_FLAGS=--enable-static=no --disable-xlib --disable-ft --disable-svg --enable-quartz --enable-quartz-font --enable-gtk-doc=no --enable-test-surfaces=no PKG_CONFIG=./dummy_pkg_config ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS)
-.IF "$(CROSS_COMPILING)"!=""
+.IF "$(CROSS_COMPILING)"=="YES"
CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
.ENDIF
cairo_CPPFLAGS+=$(EXTRA_CDEFS)
@@ -154,7 +154,7 @@ CONFIGURE_FLAGS=--disable-shared
CONFIGURE_FLAGS=--disable-static --enable-xlib
.ENDIF
CONFIGURE_FLAGS+=--enable-ft --disable-svg --enable-gtk-doc=no --enable-test-surfaces=no ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS)
-.IF "$(CROSS_COMPILING)"!=""
+.IF "$(CROSS_COMPILING)"=="YES"
CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
.ENDIF
BUILD_ACTION=$(GNUMAKE)
diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk
index b344520..0a1d443 100644
--- a/cairo/pixman/makefile.mk
+++ b/cairo/pixman/makefile.mk
@@ -85,7 +85,7 @@ CONFIGURE_FLAGS=--enable-static=yes --enable-shared=no CPPFLAGS="$(EXTRA_CDEFS)"
CONFIGURE_FLAGS+=CFLAGS="$(EXTRA_CFLAGS) $(EXTRA_CDEFS)"
.ENDIF # "$(EXTRA_CDEFS)"!=""
.ENDIF # "$(SYSBASE)"!=""
-.IF "$(CROSS_COMPILING)"!=""
+.IF "$(CROSS_COMPILING)"=="YES"
CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
.ENDIF
BUILD_ACTION=$(GNUMAKE)
@@ -129,7 +129,7 @@ CONFIGURE_FLAGS=--disable-shared
CONFIGURE_FLAGS=--disable-static
.ENDIF
CONFIGURE_FLAGS+=CFLAGS="$(pixman_CFLAGS)"
-.IF "$(CROSS_COMPILING)"!=""
+.IF "$(CROSS_COMPILING)"=="YES"
CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
.ENDIF
BUILD_ACTION=$(GNUMAKE)
diff --git a/curl/makefile.mk b/curl/makefile.mk
index c3a36b2..dc9d74d 100644
--- a/curl/makefile.mk
+++ b/curl/makefile.mk
@@ -86,7 +86,7 @@ CONFIGURE_FLAGS=--disable-static
.ENDIF
CONFIGURE_FLAGS+= --without-ssl --without-libidn --enable-ftp --enable-ipv6 --enable-http --disable-gopher --disable-file --disable-ldap --disable-telnet --disable-dict CPPFLAGS="$(curl_CFLAGS)" LDFLAGS="$(curl_LDFLAGS)"
-.IF "$(CROSS_COMPILING)"!=""
+.IF "$(CROSS_COMPILING)"=="YES"
CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
.ENDIF
diff --git a/expat/makefile.mk b/expat/makefile.mk
index efcd822..857468e 100644
--- a/expat/makefile.mk
+++ b/expat/makefile.mk
@@ -55,7 +55,7 @@ CONFIGURE_ACTION=
CONFIGURE_ACTION=.$/configure
.ENDIF
-.IF "$(CROSS_COMPILING)"!=""
+.IF "$(CROSS_COMPILING)"=="YES"
CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
.ENDIF
diff --git a/gettext/makefile.mk b/gettext/makefile.mk
index 5b82a3c..b6443f5 100644
--- a/gettext/makefile.mk
+++ b/gettext/makefile.mk
@@ -57,7 +57,7 @@ CONFIGURE_ACTION=./configure --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) $(eq,$(VERB
CONFIGURE_FLAGS=--disable-dependeny-tracking --disable-acl --disable-curses --without-emacs --without-git --disable-java
CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)" CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" CXXFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)"
-.IF "$(CROSS_COMPILING)"!=""
+.IF "$(CROSS_COMPILING)"=="YES"
CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
.ENDIF
diff --git a/glib/makefile.mk b/glib/makefile.mk
index 280b1a2..c1bb069 100644
--- a/glib/makefile.mk
+++ b/glib/makefile.mk
@@ -79,7 +79,7 @@ CONFIGURE_FLAGS+=CPPFLAGS="$(ARCH_FLAGS) $(EXTRA_CDEFS) -DBUILD_OS_APPLEOSX"
CONFIGURE_FLAGS+=CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external"
CONFIGURE_FLAGS+=LDFLAGS="-L$(SOLARLIBDIR) $(EXTRA_LINKFLAGS) $(FRAMEWORK)"
-.IF "$(CROSS_COMPILING)"!=""
+.IF "$(CROSS_COMPILING)"=="YES"
CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
.ENDIF
diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk
index d1498cd..5a6ea0c 100644
--- a/hunspell/makefile.mk
+++ b/hunspell/makefile.mk
@@ -66,7 +66,7 @@ CONFIGURE_FLAGS+= CFLAGS="$(EXTRA_CFLAGS)" CXXFLAGS="$(EXTRA_CFLAGS)"
CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)"
.ENDIF
-.IF "$(CROSS_COMPILING)"!=""
+.IF "$(CROSS_COMPILING)"=="YES"
CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
.ENDIF
diff --git a/icu/makefile.mk b/icu/makefile.mk
index 7cc1487..fca782f 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -110,7 +110,7 @@ STATIC_OR_SHARED=--enable-static --disable-shared
STATIC_OR_SHARED=--disable-static --enable-shared
.ENDIF
-.IF "$(CROSS_COMPILING)"!=""
+.IF "$(CROSS_COMPILING)"=="YES"
# We require that the cross-build-toolset target from the top Makefile(.in) has bee built
BUILD_AND_HOST=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-cross-build=$(posix_PWD)/$(INPATH_FOR_BUILD)/misc/build/icu/source
.ENDIF
diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk
old mode 100755
new mode 100644
index ca0bee5..5091360
--- a/libxml2/makefile.mk
+++ b/libxml2/makefile.mk
@@ -110,7 +110,7 @@ BUILD_DIR=$(CONFIGURE_DIR)
.IF "$(debug)"!=""
CONFIGURE_FLAGS+=--with-mem-debug --with-run-debug
.ENDIF
-.IF "$(CROSS_COMPILING)"!=""
+.IF "$(CROSS_COMPILING)"=="YES"
CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
.ENDIF
.ENDIF
diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk
index f9ca451..7167adf 100644
--- a/libxslt/makefile.mk
+++ b/libxslt/makefile.mk
@@ -123,7 +123,7 @@ CONFIGURE_FLAGS=--disable-shared
CONFIGURE_FLAGS=--disable-static
.ENDIF
CONFIGURE_FLAGS+=--enable-ipv6=no --without-crypto --without-python --with-sax1=yes
-.IF "$(CROSS_COMPILING)"!=""
+.IF "$(CROSS_COMPILING)"=="YES"
CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
.ENDIF
BUILD_ACTION=chmod 777 xslt-config && $(GNUMAKE)
More information about the Libreoffice-commits
mailing list