Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/55d499c82a24d06994bebfe17c4352c53ed9b035
...commit
http://git.netsurf-browser.org/netsurf.git/commit/55d499c82a24d06994bebfe17c4352c53ed9b035
...tree
http://git.netsurf-browser.org/netsurf.git/tree/55d499c82a24d06994bebfe17c4352c53ed9b035
The branch, ashmew2/netsurf-kolibrios has been updated
via 55d499c82a24d06994bebfe17c4352c53ed9b035 (commit)
from eed97fe87c72b4dfd03db4863a037f255b808156 (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/netsurf.git/commit/?id=55d499c82a24d06994bebfe17c4352c53ed9b035
commit 55d499c82a24d06994bebfe17c4352c53ed9b035
Author: Ashish Gupta <[email protected]>
Commit: Ashish Gupta <[email protected]>
Towards integration with shared build system
diff --git a/Makefile b/Makefile
index eef8ef7..0598c21 100644
--- a/Makefile
+++ b/Makefile
@@ -538,8 +538,9 @@ ifneq ($(TARGET),kolibrios)
$(eval $(call pkg_config_find_and_add,libnsutils,nsutils))
$(eval $(call pkg_config_find_and_add,libutf8proc,utf8proc))
else
- KOL_LIBC := $(HOME)/kolibrios/contrib/sdk/sources/newlib/libc/include/
- KOL_LIB_DIR := $(HOME)/kolibrios/contrib/sdk/lib
+ KOLIBRI_SVN_CHECKOUT := $(HOME)/kolibrios
+ KOL_LIBC := $(KOLIBRI_SVN_CHECKOUT)/contrib/sdk/sources/newlib/libc/include/
+ KOL_LIB_DIR := $(KOLIBRI_SVN_CHECKOUT)/contrib/sdk/lib
LIB_LDFLAGS := -L$(KOL_LIB_DIR) -lfreetype -lpng16 -ljpeg
OS_LDFLAGS := -static -S -Tapp-dynamic.lds --image-base 0 -Map
netsurf-kolibrios.map
@@ -712,7 +713,7 @@ OBJECTS := $(sort $(addprefix $(OBJROOT)/,$(subst
/,_,$(patsubst %.c,%.o,$(patsu
IFLAGS = $(addprefix -I,$(INCLUDE_DIRS))
ifeq ($(TARGET),kolibrios)
- KOLOBJECTS = $(HOME)/kolibrios/programs/fs/unzip60/kolibri/dirent.o
$(HOME)/NETSURFLIBS/netsurf/frontends/kolibrios/asmobj/loadhttp.obj
$(HOME)/kolibrios/programs/develop/libraries/iconv/iconv.o
+ KOLOBJECTS = $(KOLIBRI_SVN_CHECKOUT)/programs/fs/unzip60/kolibri/dirent.o
$(HOME)/NETSURFLIBS/netsurf/frontends/kolibrios/asmobj/loadhttp.obj
$(KOLIBRI_SVN_CHECKOUT)/programs/develop/libraries/iconv/iconv.o
endif
$(EXETARGET): $(OBJECTS) $(RESOURCES) $(MESSAGES)
diff --git a/frontends/kolibrios/Makefile b/frontends/kolibrios/Makefile
index 742011b..f50e79c 100644
--- a/frontends/kolibrios/Makefile
+++ b/frontends/kolibrios/Makefile
@@ -1,7 +1,7 @@
CWARNFLAGS += -Wno-error -Wno-redundant-decls -Wno-char-subscripts -Wno-undef
-Wno-implicit-function-declaration -Wno-int-conversion -Wno-nested-externs
-Wno-format-extra-args -Wno-format
DMACROS := -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700
-D_POSIX_C_SOURCE=200809L -D_NETBSD_SOURCE -D_TARGET_IS_KOLIBRIOS
-DKOLIBRI_USE_FREETYPE -DFB_USE_FREETYPE
-KOL_OTHER_INCLUDES := -I$(HOME)/kolibrios/contrib/sdk/sources/libpng/
-I$(HOME)/kolibrios/contrib/sdk/sources/zlib
-I$(HOME)/kolibrios/contrib/sdk/sources/freetype/include
-I$(HOME)/kolibrios/contrib/sdk/sources/freetype/include
-I$(HOME)/kolibrios/contrib/sdk/sources/libjpeg
+KOL_OTHER_INCLUDES := -I$(KOLIBRI_SVN_CHECKOUT)/contrib/sdk/sources/libpng/
-I$(KOLIBRI_SVN_CHECKOUT)/contrib/sdk/sources/zlib
-I$(KOLIBRI_SVN_CHECKOUT)/contrib/sdk/sources/freetype/include
-I$(KOLIBRI_SVN_CHECKOUT)/contrib/sdk/sources/freetype/include
-I$(KOLIBRI_SVN_CHECKOUT)/contrib/sdk/sources/libjpeg
CFLAGS += $(KOL_OTHER_INCLUDES) $(DMACROS) -std=c99 -g
CFLAGS += '-DNETSURF_USE_KOLIBRI_HTTPLIB'
diff --git a/utils/jenkins-build.sh b/utils/jenkins-build.sh
index b6ca21d..fe405d1 100755
--- a/utils/jenkins-build.sh
+++ b/utils/jenkins-build.sh
@@ -357,6 +357,18 @@ case ${TARGET} in
PKG_SFX=
;;
+ "kolibrios")
+ case ${HOST} in
+ "kos32-gcc")
+ ;;
+
+ *)
+ echo "Target \"${TARGET}\" cannot be built on \"${HOST})\""
+ exit 1
+ ;;
+ esac
+ ;;
+
*)
# TARGET must be in the environment and set correctly
echo "Unkown TARGET \"${TARGET}\""
-----------------------------------------------------------------------
Summary of changes:
Makefile | 7 ++++---
frontends/kolibrios/Makefile | 2 +-
utils/jenkins-build.sh | 12 ++++++++++++
3 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index eef8ef7..0598c21 100644
--- a/Makefile
+++ b/Makefile
@@ -538,8 +538,9 @@ ifneq ($(TARGET),kolibrios)
$(eval $(call pkg_config_find_and_add,libnsutils,nsutils))
$(eval $(call pkg_config_find_and_add,libutf8proc,utf8proc))
else
- KOL_LIBC := $(HOME)/kolibrios/contrib/sdk/sources/newlib/libc/include/
- KOL_LIB_DIR := $(HOME)/kolibrios/contrib/sdk/lib
+ KOLIBRI_SVN_CHECKOUT := $(HOME)/kolibrios
+ KOL_LIBC := $(KOLIBRI_SVN_CHECKOUT)/contrib/sdk/sources/newlib/libc/include/
+ KOL_LIB_DIR := $(KOLIBRI_SVN_CHECKOUT)/contrib/sdk/lib
LIB_LDFLAGS := -L$(KOL_LIB_DIR) -lfreetype -lpng16 -ljpeg
OS_LDFLAGS := -static -S -Tapp-dynamic.lds --image-base 0 -Map
netsurf-kolibrios.map
@@ -712,7 +713,7 @@ OBJECTS := $(sort $(addprefix $(OBJROOT)/,$(subst
/,_,$(patsubst %.c,%.o,$(patsu
IFLAGS = $(addprefix -I,$(INCLUDE_DIRS))
ifeq ($(TARGET),kolibrios)
- KOLOBJECTS = $(HOME)/kolibrios/programs/fs/unzip60/kolibri/dirent.o
$(HOME)/NETSURFLIBS/netsurf/frontends/kolibrios/asmobj/loadhttp.obj
$(HOME)/kolibrios/programs/develop/libraries/iconv/iconv.o
+ KOLOBJECTS = $(KOLIBRI_SVN_CHECKOUT)/programs/fs/unzip60/kolibri/dirent.o
$(HOME)/NETSURFLIBS/netsurf/frontends/kolibrios/asmobj/loadhttp.obj
$(KOLIBRI_SVN_CHECKOUT)/programs/develop/libraries/iconv/iconv.o
endif
$(EXETARGET): $(OBJECTS) $(RESOURCES) $(MESSAGES)
diff --git a/frontends/kolibrios/Makefile b/frontends/kolibrios/Makefile
index 742011b..f50e79c 100644
--- a/frontends/kolibrios/Makefile
+++ b/frontends/kolibrios/Makefile
@@ -1,7 +1,7 @@
CWARNFLAGS += -Wno-error -Wno-redundant-decls -Wno-char-subscripts -Wno-undef
-Wno-implicit-function-declaration -Wno-int-conversion -Wno-nested-externs
-Wno-format-extra-args -Wno-format
DMACROS := -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700
-D_POSIX_C_SOURCE=200809L -D_NETBSD_SOURCE -D_TARGET_IS_KOLIBRIOS
-DKOLIBRI_USE_FREETYPE -DFB_USE_FREETYPE
-KOL_OTHER_INCLUDES := -I$(HOME)/kolibrios/contrib/sdk/sources/libpng/
-I$(HOME)/kolibrios/contrib/sdk/sources/zlib
-I$(HOME)/kolibrios/contrib/sdk/sources/freetype/include
-I$(HOME)/kolibrios/contrib/sdk/sources/freetype/include
-I$(HOME)/kolibrios/contrib/sdk/sources/libjpeg
+KOL_OTHER_INCLUDES := -I$(KOLIBRI_SVN_CHECKOUT)/contrib/sdk/sources/libpng/
-I$(KOLIBRI_SVN_CHECKOUT)/contrib/sdk/sources/zlib
-I$(KOLIBRI_SVN_CHECKOUT)/contrib/sdk/sources/freetype/include
-I$(KOLIBRI_SVN_CHECKOUT)/contrib/sdk/sources/freetype/include
-I$(KOLIBRI_SVN_CHECKOUT)/contrib/sdk/sources/libjpeg
CFLAGS += $(KOL_OTHER_INCLUDES) $(DMACROS) -std=c99 -g
CFLAGS += '-DNETSURF_USE_KOLIBRI_HTTPLIB'
diff --git a/utils/jenkins-build.sh b/utils/jenkins-build.sh
index b6ca21d..fe405d1 100755
--- a/utils/jenkins-build.sh
+++ b/utils/jenkins-build.sh
@@ -357,6 +357,18 @@ case ${TARGET} in
PKG_SFX=
;;
+ "kolibrios")
+ case ${HOST} in
+ "kos32-gcc")
+ ;;
+
+ *)
+ echo "Target \"${TARGET}\" cannot be built on \"${HOST})\""
+ exit 1
+ ;;
+ esac
+ ;;
+
*)
# TARGET must be in the environment and set correctly
echo "Unkown TARGET \"${TARGET}\""
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
