Gitweb links:
...log
http://git.netsurf-browser.org/buildsystem.git/shortlog/853103373f7f5b8a4d4b819ef3986103f9c2bc20
...commit
http://git.netsurf-browser.org/buildsystem.git/commit/853103373f7f5b8a4d4b819ef3986103f9c2bc20
...tree
http://git.netsurf-browser.org/buildsystem.git/tree/853103373f7f5b8a4d4b819ef3986103f9c2bc20
The branch, ashmew2/kolibri-cross has been updated
discards 520dd9740ce60ffd0778d9565f8779c31b8a2acb (commit)
via 853103373f7f5b8a4d4b819ef3986103f9c2bc20 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (520dd9740ce60ffd0778d9565f8779c31b8a2acb)
\
N -- N -- N (853103373f7f5b8a4d4b819ef3986103f9c2bc20)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/buildsystem.git/commit/?id=853103373f7f5b8a4d4b819ef3986103f9c2bc20
commit 853103373f7f5b8a4d4b819ef3986103f9c2bc20
Author: Ashish Gupta <[email protected]>
Commit: Ashish Gupta <[email protected]>
Patch Makefile.tools to support cross compiling from Linux to KolibriOS
diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools
index 86fac4c..7b55826 100644
--- a/makefiles/Makefile.tools
+++ b/makefiles/Makefile.tools
@@ -55,7 +55,14 @@ NSTESTTOOLS := $(NSSHARED)/testtools
# Bootstrap default tooling
###############################################################################
-BUILD_CC ?= cc
+ifeq ($(HOST),kolibrios)
+ BUILD_CC := kos32-gcc
+ CC := kos32-gcc
+ BUILD := Linux
+else
+ BUILD_CC ?= cc
+endif
+
###############################################################################
# Host/build platform detection
@@ -125,8 +132,10 @@ else
CC__ := $(CC)
# Improve our guess at the identity of CC
# (only if CC was not specified by the user)
- ifeq ($(origin CC),default)
- CC__ := $(HOST)-gcc
+ ifneq ($(HOST),kolibrios)
+ ifeq ($(origin CC),default)
+ CC__ := $(HOST)-gcc
+ endif
endif
# Search the path for the compiler
@@ -139,7 +148,12 @@ else
else
CC__ := $(realpath $(toolpath_))
toolpath_ := $(dir $(CC__))
- toolprefix_ := $(subst :,/,$(dir $(subst -,/,$(subst /,:,$(CC__)))))
+ ifneq ($(HOST),kolibrios)
+ toolprefix_ := $(subst :,/,$(dir $(subst -,/,$(subst /,:,$(CC__)))))
+ else
+ toolprefix_ := $(subst kos32/,kos32,$(toolprefix_))
+ endif
+
ifeq ($(origin AR),default)
AR__ := $(toolprefix_)-ar
endif
@@ -242,6 +256,24 @@ else
PREFIX ?= $(GCCSDK_INSTALL_ENV)
endif
+
+ ifeq ($(HOST),kolibrios)
+ #Cross compiling for KolibriOS from Linux
+ #expat was added for libdom.
+ #SDL was added for libnsfb.
+ #Both of them should probably be moved to respective library Makefiles.
+ CFLAGS := $(CFLAGS) -c -Wno-error=undef -Wno-error=char-subscripts
-Wno-error=pedantic -U__STRICT_ANSI__ -I
$(HOME)/kolibrios/contrib/sdk/sources/newlib/libc/include -I
$(HOME)/kolibrios/contrib/sdk/sources/newlib/libc/include/machine -I
$(HOME)/kolibrios/contrib/sdk/sources/SDL-1.2.2/include
-I$(HOME)/kolibrios/contrib/sdk/sources/expat/lib \
+ -std=c99 -g -U_Win32 -U_WIN32 -U__MINGW32__ \
+ -U__BSD_VISIBLE -D_BSD_SOURCE -D_DEFAULT_SOURCE
-D_XOPEN_SOURCE=700 \
+ -D_POSIX_C_SOURCE=200809L -D_NETBSD_SOURCE
+
+ CXXFLAGS := $(CXXFLAGS) -U__STRICT_ANSI__
-I$(GCCSDK_INSTALL_ENV)/newlib/libc/include
+
+ LDFLAGS := $(LDFLAGS) -T$(GCCSDK_INSTALL_ENV)/newlib/libc/static.lds
-nostdlib -static \
+ -image-base 0 -L/home/autobuild/tools/win32/mingw32/lib -lgcc \
+ /home/autobuild/tools/win32/lib/libz.a
/home/autobuild/tools/win32/lib/libdll.a \
+ /home/autobuild/tools/win32/lib/libapp.a
/home/autobuild/tools/win32/lib/libc.dll.a
+ endif
endif
# Default prefix
-----------------------------------------------------------------------
Summary of changes:
makefiles/Makefile.tools | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools
index 6567840..7b55826 100644
--- a/makefiles/Makefile.tools
+++ b/makefiles/Makefile.tools
@@ -29,6 +29,7 @@
###############################################################################
# Sanity checks
###############################################################################
+
ifeq ($(COMPONENT_TYPE),)
$(error COMPONENT_TYPE not set)
endif
@@ -58,9 +59,11 @@ ifeq ($(HOST),kolibrios)
BUILD_CC := kos32-gcc
CC := kos32-gcc
BUILD := Linux
+else
+ BUILD_CC ?= cc
endif
-BUILD_CC ?= cc
+
###############################################################################
# Host/build platform detection
###############################################################################
@@ -145,9 +148,9 @@ else
else
CC__ := $(realpath $(toolpath_))
toolpath_ := $(dir $(CC__))
- toolprefix_ := $(subst :,/,$(dir $(subst -,/,$(subst /,:,$(CC__)))))
-
- ifeq ($(HOST),kolibrios)
+ ifneq ($(HOST),kolibrios)
+ toolprefix_ := $(subst :,/,$(dir $(subst -,/,$(subst /,:,$(CC__)))))
+ else
toolprefix_ := $(subst kos32/,kos32,$(toolprefix_))
endif
--
NetSurf Project build system
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
