mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always compare CROSS_COMPILING explicitly to "YES"

Browse Source
This commit is contained in:
Tor Lillqvist
2011-06-06 08:57:32 +03:00
parent 5cf5db763f
commit 47ef127cb4
8 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cppunit/makefile.mk
View File

@@ -40,7 +40,7 @@ PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix
# warnings.patch: see <https://sourceforge.net/tracker/?func=detail& # warnings.patch: see <https://sourceforge.net/tracker/?func=detail&
# aid=2912630&group_id=11795&atid=311795> # aid=2912630&group_id=11795&atid=311795>
.IF "$(CROSS_COMPILING)"=="" .IF "$(CROSS_COMPILING)"!="YES"
.IF "$(OS)" == "WNT" .IF "$(OS)" == "WNT"
.IF "$(COM)" == "MSC" .IF "$(COM)" == "MSC"

2
external/gcc3_specific/makefile.mk vendored
View File

@@ -11,7 +11,7 @@ TARGET=gcc3_specific
.IF "$(GUI)" == "WNT" .IF "$(GUI)" == "WNT"
.IF "$(CROSS_COMPILING)" == "" .IF "$(CROSS_COMPILING)" != "YES"
# Don't do any of this weird and presumably obsolete crack when # Don't do any of this weird and presumably obsolete crack when
# cross-compiling # cross-compiling

2
external/mingwheaders/makefile.mk vendored
View File

@@ -33,7 +33,7 @@ TARGET=mingwheaders
.IF "$(OS)$(COM)" == "WNTGCC" .IF "$(OS)$(COM)" == "WNTGCC"
.IF "$(CROSS_COMPILING)" == "" .IF "$(CROSS_COMPILING)" != "YES"
# Don't do any of this weird and presumably obsolete crack when # Don't do any of this weird and presumably obsolete crack when
# cross-compiling # cross-compiling

4
hyphen/makefile.mk
View File

@@ -99,8 +99,8 @@ BUILD_ACTION=dmake
OUT2INC += hyphen.h OUT2INC += hyphen.h
.ENDIF # "$(GUI)"=="WNT" .ENDIF # "$(GUI)"=="WNT"
.IF "$(CROSS_COMPILING)"!="" .IF "$(CROSS_COMPILING)"=="YES"
CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)" CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
.ENDIF .ENDIF
# --- Targets ------------------------------------------------------ # --- Targets ------------------------------------------------------

4
libtextcat/makefile.mk
View File

@@ -67,8 +67,8 @@ CONFIGURE_FLAGS+= CFLAGS=-D_LINUX_SOURCE_COMPAT
.IF "$(OS)"=="IOS" .IF "$(OS)"=="IOS"
CONFIGURE_FLAGS+= --disable-shared CONFIGURE_FLAGS+= --disable-shared
.ENDIF .ENDIF
.IF "$(CROSS_COMPILING)"!="" .IF "$(CROSS_COMPILING)"=="YES"
CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)" CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
.ENDIF .ENDIF
BUILD_ACTION=make BUILD_ACTION=make

4
redland/raptor/makefile.mk
View File

@@ -59,7 +59,7 @@ OOO_PATCH_FILES= \
$(TARFILE_NAME).patch.win32 \ $(TARFILE_NAME).patch.win32 \
raptor-aix.patch raptor-aix.patch
.IF "$(CROSS_COMPILING)"!="" .IF "$(CROSS_COMPILING)"=="YES"
OOO_PATCH_FILES += \ OOO_PATCH_FILES += \
$(TARFILE_NAME).patch.cross $(TARFILE_NAME).patch.cross
.ENDIF .ENDIF
@@ -145,7 +145,7 @@ CONFIGURE_FLAGS=--disable-static
.ENDIF .ENDIF
# do not enable grddl parser (#i93768#) # do not enable grddl parser (#i93768#)
CONFIGURE_FLAGS+= --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml CONFIGURE_FLAGS+= --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
.IF "$(CROSS_COMPILING)"!="" .IF "$(CROSS_COMPILING)"=="YES"
CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
.ENDIF .ENDIF
BUILD_ACTION=$(GNUMAKE) BUILD_ACTION=$(GNUMAKE)

2
redland/rasqal/makefile.mk
View File

@@ -130,7 +130,7 @@ CONFIGURE_FLAGS=--disable-shared
CONFIGURE_FLAGS=--disable-static CONFIGURE_FLAGS=--disable-static
.ENDIF .ENDIF
CONFIGURE_FLAGS+= --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml CONFIGURE_FLAGS+= --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
.IF "$(CROSS_COMPILING)"!="" .IF "$(CROSS_COMPILING)"=="YES"
CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
.ENDIF .ENDIF
BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)

2
redland/redland/makefile.mk
View File

@@ -134,7 +134,7 @@ CONFIGURE_FLAGS=--disable-shared
CONFIGURE_FLAGS=--disable-static CONFIGURE_FLAGS=--disable-static
.ENDIF .ENDIF
CONFIGURE_FLAGS+= --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml CONFIGURE_FLAGS+= --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml
.IF "$(CROSS_COMPILING)"!="" .IF "$(CROSS_COMPILING)"=="YES"
CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
.ENDIF .ENDIF
BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)