Gitweb links:
...log
http://git.netsurf-browser.org/buildsystem.git/shortlog/5d95452cbf9d3f876000943bd7a72cd4798f0e0b
...commit
http://git.netsurf-browser.org/buildsystem.git/commit/5d95452cbf9d3f876000943bd7a72cd4798f0e0b
...tree
http://git.netsurf-browser.org/buildsystem.git/tree/5d95452cbf9d3f876000943bd7a72cd4798f0e0b
The branch, ashmew2/kolibri-cross has been updated
discards c8b75df03411df69e8d83fde0c54aaaa8825861a (commit)
via 5d95452cbf9d3f876000943bd7a72cd4798f0e0b (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 (c8b75df03411df69e8d83fde0c54aaaa8825861a)
\
N -- N -- N (5d95452cbf9d3f876000943bd7a72cd4798f0e0b)
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=5d95452cbf9d3f876000943bd7a72cd4798f0e0b
commit 5d95452cbf9d3f876000943bd7a72cd4798f0e0b
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..029dd9d 100644
--- a/makefiles/Makefile.tools
+++ b/makefiles/Makefile.tools
@@ -55,7 +55,16 @@ NSTESTTOOLS := $(NSSHARED)/testtools
# Bootstrap default tooling
###############################################################################
-BUILD_CC ?= cc
+ifeq ($(HOST),kolibrios)
+ BUILD_CC := kos32-gcc
+ CC := kos32-gcc
+ AR := kos32-ar
+ BUILD := Linux
+ PREFIX ?= /opt/netsurf
+else
+ BUILD_CC ?= cc
+endif
+
###############################################################################
# Host/build platform detection
@@ -125,8 +134,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 +150,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 +258,26 @@ else
PREFIX ?= $(GCCSDK_INSTALL_ENV)
endif
+
+ ifeq ($(HOST),kolibrios)
+ KOL_LIBC_MAIN := $(HOME)/kolibrios/contrib/sdk/sources/newlib/libc/include
+ KOL_LIBC_MACHINE :=
$(HOME)/kolibrios/contrib/sdk/sources/newlib/libc/include/machine
+ KOL_LIBC_INCLUDES := -I$(KOL_LIBC_MAIN) -I$(KOL_LIBC_MACHINE)
+
+ KOL_NS_DEP_INCLUDES := -I$(HOME)/kolibrios/contrib/sdk/sources/expat/lib
+
+ KOL_LIB_DIR := $(HOME)/kolibrios/contrib/sdk/lib
+ LIB_LDFLAGS := -L$(KOL_LIB_DIR) -lfreetype
+ OS_LDFLAGS := -static -S -Tstatic.lds --image-base 0
+
+ NS_INCLUDE := $(PREFIX)/include
+ NS_LIB_LDFLAGS := -L$(PREFIX)/lib/ -lnsbmp -lnsutils -lwapcaplet -lsvgtiny
-lnsgif -lutf8proc -lcss -lnsfb -lparserutils -ldom -lhubbub -lz -lexpat
+
+ WARN_SUPPRESS := -Wno-undef -Wno-redundant-decls -Wno-char-subscripts
-Wno-undef -Wno-implicit-function-declaration -Wno-int-conversion
-Wno-nested-externs -Wno-format-extra-args -Wno-format -Wno-pedantic
+ ERROR_SUPPRESS := -Wno-error=pedantic
+ CFLAGS += -c -fno-ident -fomit-frame-pointer -U__WIN32__ -U_Win32 -U_WIN32
-U__MINGW32__ -UWIN32 -U__BSD_VISIBLE $(KOL_LIBC_INCLUDES) -I$(NS_INCLUDE)
$(KOL_NS_DEP_INCLUDES) $(WARN_SUPPRESS) $(ERROR_SUPPRESS)
+ LDFLAGS += $(OS_LDFLAGS) $(NS_LIB_LDFLAGS) $(LIB_LDFLAGS) -lc -lgcc -lc
+ endif
endif
# Default prefix
@@ -415,8 +451,12 @@ else
OPTLDFLAGS ?= $(LDDBG)
endif
-ifeq ($(origin ARFLAGS),default)
- ARFLAGS := $(ARFLG)
+ifneq ($(HOST),kolibrios)
+ ifeq ($(origin ARFLAGS),default)
+ ARFLAGS := $(ARFLG)
+ endif
+else
+ ARFLAGS := crs
endif
# TODO: This assumes that the C compiler can cope with assembler
-----------------------------------------------------------------------
Summary of changes:
makefiles/Makefile.tools | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools
index 03a2319..029dd9d 100644
--- a/makefiles/Makefile.tools
+++ b/makefiles/Makefile.tools
@@ -263,17 +263,19 @@ else
KOL_LIBC_MAIN := $(HOME)/kolibrios/contrib/sdk/sources/newlib/libc/include
KOL_LIBC_MACHINE :=
$(HOME)/kolibrios/contrib/sdk/sources/newlib/libc/include/machine
KOL_LIBC_INCLUDES := -I$(KOL_LIBC_MAIN) -I$(KOL_LIBC_MACHINE)
-
+
+ KOL_NS_DEP_INCLUDES := -I$(HOME)/kolibrios/contrib/sdk/sources/expat/lib
+
KOL_LIB_DIR := $(HOME)/kolibrios/contrib/sdk/lib
LIB_LDFLAGS := -L$(KOL_LIB_DIR) -lfreetype
OS_LDFLAGS := -static -S -Tstatic.lds --image-base 0
-
- NS_INCLUDE := $(PREFIX)/include
- NS_LIB_LDFLAGS := -L$(PREFIX)/lib/ -lnsbmp -lnsutils -lwapcaplet -lsvgtiny
-lnsgif -lutf8proc -lcss -lnsfb -lparserutils -ldom -lhubbub -lz
- WARN_SUPPRESS := -Wno-undef
+ NS_INCLUDE := $(PREFIX)/include
+ NS_LIB_LDFLAGS := -L$(PREFIX)/lib/ -lnsbmp -lnsutils -lwapcaplet -lsvgtiny
-lnsgif -lutf8proc -lcss -lnsfb -lparserutils -ldom -lhubbub -lz -lexpat
- CFLAGS += -c -fno-ident -fomit-frame-pointer -U__WIN32__ -U_Win32 -U_WIN32
-U__MINGW32__ -UWIN32 -U__BSD_VISIBLE $(KOL_LIBC_INCLUDES) -I$(NS_INCLUDE)
$(WARN_SUPPRESS)
+ WARN_SUPPRESS := -Wno-undef -Wno-redundant-decls -Wno-char-subscripts
-Wno-undef -Wno-implicit-function-declaration -Wno-int-conversion
-Wno-nested-externs -Wno-format-extra-args -Wno-format -Wno-pedantic
+ ERROR_SUPPRESS := -Wno-error=pedantic
+ CFLAGS += -c -fno-ident -fomit-frame-pointer -U__WIN32__ -U_Win32 -U_WIN32
-U__MINGW32__ -UWIN32 -U__BSD_VISIBLE $(KOL_LIBC_INCLUDES) -I$(NS_INCLUDE)
$(KOL_NS_DEP_INCLUDES) $(WARN_SUPPRESS) $(ERROR_SUPPRESS)
LDFLAGS += $(OS_LDFLAGS) $(NS_LIB_LDFLAGS) $(LIB_LDFLAGS) -lc -lgcc -lc
endif
endif
@@ -449,8 +451,12 @@ else
OPTLDFLAGS ?= $(LDDBG)
endif
-ifeq ($(origin ARFLAGS),default)
- ARFLAGS := $(ARFLG)
+ifneq ($(HOST),kolibrios)
+ ifeq ($(origin ARFLAGS),default)
+ ARFLAGS := $(ARFLG)
+ endif
+else
+ ARFLAGS := crs
endif
# TODO: This assumes that the C compiler can cope with assembler
--
NetSurf Project build system
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
