Gitweb links:
...log
http://git.netsurf-browser.org/buildsystem.git/shortlog/808f17e02fca0edfff0037759053ef25578833b5
...commit
http://git.netsurf-browser.org/buildsystem.git/commit/808f17e02fca0edfff0037759053ef25578833b5
...tree
http://git.netsurf-browser.org/buildsystem.git/tree/808f17e02fca0edfff0037759053ef25578833b5
The branch, ashmew2/kolibri-cross has been updated
via 808f17e02fca0edfff0037759053ef25578833b5 (commit)
from 121eac04430b85ce557fb1762204b1b43257f996 (commit)
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=808f17e02fca0edfff0037759053ef25578833b5
commit 808f17e02fca0edfff0037759053ef25578833b5
Author: Ashish Gupta <[email protected]>
Commit: Ashish Gupta <[email protected]>
use cross and env for kolibrios
diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools
index 6eb48a8..654889d 100644
--- a/makefiles/Makefile.tools
+++ b/makefiles/Makefile.tools
@@ -56,11 +56,14 @@ NSTESTTOOLS := $(NSSHARED)/testtools
###############################################################################
ifeq ($(HOST),kolibrios)
- BUILD_CC := kos32-gcc
- CC := kos32-gcc
- AR := kos32-ar
+ CROSSDIR := /opt/netsurf/kos32-gcc/cross/autobuild/tools/win32/bin
+ ENVDIR := /opt/netsurf/kos32-gcc/env/
+ BUILD_CC := $(CROSSDIR)/kos32-gcc
+ CC := $(CROSSDIR)/kos32-gcc
+ AR := $(CROSSDIR)/kos32-ar
BUILD := Linux
- PREFIX ?= /opt/netsurf
+ PREFIX := /opt/netsurf/kos32-gcc/env
+ KOLIBRI_SVN_CHECKOUT ?= /opt/netsurf/kos32-gcc/env/kolibrios
else
BUILD_CC ?= cc
endif
@@ -260,18 +263,17 @@ else
endif
ifeq ($(HOST),kolibrios)
- KOLIBRI_SVN_CHECKOUT := $(HOME)/kolibrios
KOL_LIBC_MAIN :=
$(KOLIBRI_SVN_CHECKOUT)/contrib/sdk/sources/newlib/libc/include
KOL_LIBC_MACHINE :=
$(KOLIBRI_SVN_CHECKOUT)/contrib/sdk/sources/newlib/libc/include/machine
KOL_LIBC_INCLUDES := -I$(KOL_LIBC_MAIN) -I$(KOL_LIBC_MACHINE)
- KOL_NS_DEP_INCLUDES :=
-I$(KOLIBRI_SVN_CHECKOUT/contrib/sdk/sources/expat/lib
+ KOL_NS_DEP_INCLUDES :=
-I$(KOLIBRI_SVN_CHECKOUT)/contrib/sdk/sources/expat/lib
KOL_LIB_DIR := $(KOLIBRI_SVN_CHECKOUT)/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
+ NS_INCLUDE := $(ENVDIR)/include
+ NS_LIB_LDFLAGS := -L$(ENVDIR)/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
-----------------------------------------------------------------------
Summary of changes:
makefiles/Makefile.tools | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools
index 6eb48a8..654889d 100644
--- a/makefiles/Makefile.tools
+++ b/makefiles/Makefile.tools
@@ -56,11 +56,14 @@ NSTESTTOOLS := $(NSSHARED)/testtools
###############################################################################
ifeq ($(HOST),kolibrios)
- BUILD_CC := kos32-gcc
- CC := kos32-gcc
- AR := kos32-ar
+ CROSSDIR := /opt/netsurf/kos32-gcc/cross/autobuild/tools/win32/bin
+ ENVDIR := /opt/netsurf/kos32-gcc/env/
+ BUILD_CC := $(CROSSDIR)/kos32-gcc
+ CC := $(CROSSDIR)/kos32-gcc
+ AR := $(CROSSDIR)/kos32-ar
BUILD := Linux
- PREFIX ?= /opt/netsurf
+ PREFIX := /opt/netsurf/kos32-gcc/env
+ KOLIBRI_SVN_CHECKOUT ?= /opt/netsurf/kos32-gcc/env/kolibrios
else
BUILD_CC ?= cc
endif
@@ -260,18 +263,17 @@ else
endif
ifeq ($(HOST),kolibrios)
- KOLIBRI_SVN_CHECKOUT := $(HOME)/kolibrios
KOL_LIBC_MAIN :=
$(KOLIBRI_SVN_CHECKOUT)/contrib/sdk/sources/newlib/libc/include
KOL_LIBC_MACHINE :=
$(KOLIBRI_SVN_CHECKOUT)/contrib/sdk/sources/newlib/libc/include/machine
KOL_LIBC_INCLUDES := -I$(KOL_LIBC_MAIN) -I$(KOL_LIBC_MACHINE)
- KOL_NS_DEP_INCLUDES :=
-I$(KOLIBRI_SVN_CHECKOUT/contrib/sdk/sources/expat/lib
+ KOL_NS_DEP_INCLUDES :=
-I$(KOLIBRI_SVN_CHECKOUT)/contrib/sdk/sources/expat/lib
KOL_LIB_DIR := $(KOLIBRI_SVN_CHECKOUT)/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
+ NS_INCLUDE := $(ENVDIR)/include
+ NS_LIB_LDFLAGS := -L$(ENVDIR)/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
--
NetSurf Project build system
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
