Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/22fd851e1438afba1486f... ...commit http://git.netsurf-browser.org/netsurf.git/commit/22fd851e1438afba1486f3e... ...tree http://git.netsurf-browser.org/netsurf.git/tree/22fd851e1438afba1486f3e7a... The branch, master has been updated via 22fd851e1438afba1486f3e7a48e47435e0171f7 (commit) via c3d3023e4acd8015b3f53c6fb1d55f27417fe8df (commit) from e4537cb37ed5b075c62723c9a49348c76eeb3d5c (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=22fd851e1438afba148... commit 22fd851e1438afba1486f3e7a48e47435e0171f7 Author: Vincent Sanders <vince(a)kyllikki.org&gt; Commit: Vincent Sanders <vince(a)kyllikki.org&gt; Fix compiler version comparison test diff --git a/Makefile b/Makefile index 04f3263..064ae69 100644 --- a/Makefile +++ b/Makefile @@ -323,7 +323,7 @@ CC_VERSION := $(shell $(CC) -dumpversion) CC_MAJOR := $(word 1,$(subst ., ,$(CC_VERSION))) CC_MINOR := $(word 2,$(subst ., ,$(CC_VERSION))) define cc_ver_ge -$(shell expr $(CC_MAJOR) \>= $(1) \& $(CC_MINOR) \>= $(2)) +$(shell expr $(CC_MAJOR) \> $(1) \| \( $(CC_MAJOR) = $(1) \& $(CC_MINOR) \>= $(2) \) ) endef # CCACHE commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=c3d3023e4acd8015b3f... commit c3d3023e4acd8015b3f53c6fb1d55f27417fe8df Author: Vincent Sanders <vince(a)kyllikki.org&gt; Commit: Vincent Sanders <vince(a)kyllikki.org&gt; stop overriding non test warning flags diff --git a/test/Makefile b/test/Makefile index 4f9dd22..85cc7c4 100644 --- a/test/Makefile +++ b/test/Makefile @@ -127,15 +127,15 @@ endef $(eval $(call pkg_cfg_detect_lib,check,Check)) -COMMON_WARNFLAGS = -W -Wall -Wundef -Wpointer-arith -Wcast-align \ +TEST_WARNFLAGS = -W -Wall -Wundef -Wpointer-arith -Wcast-align \ -Wwrite-strings -Wmissing-declarations -Wuninitialized ifneq ($(CC_MAJOR),2) - COMMON_WARNFLAGS += -Wno-unused-parameter + TEST_WARNFLAGS += -Wno-unused-parameter endif BASE_TESTCFLAGS := -std=c99 -g \ - $(COMMON_WARNFLAGS) \ + $(TEST_WARNFLAGS) \ -D_DEFAULT_SOURCE \ -D_POSIX_C_SOURCE=200809L \ -D_XOPEN_SOURCE=600 \ @@ -156,7 +156,7 @@ TESTLDFLAGS := -L$(TESTROOT) \ # malloc faliure injection generator $(TESTROOT)/libmalloc_fig.so:test/malloc_fig.c - $(CC) -shared -fPIC -I. -std=c99 $(COMMON_WARNFLAGS) $^ -o $@ + $(CC) -shared -fPIC -I. -std=c99 $(TEST_WARNFLAGS) $^ -o $@ # Source files for all tests being compiled TESTSOURCES := ----------------------------------------------------------------------- Summary of changes: Makefile | 2 +- test/Makefile | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 04f3263..064ae69 100644 --- a/Makefile +++ b/Makefile @@ -323,7 +323,7 @@ CC_VERSION := $(shell $(CC) -dumpversion) CC_MAJOR := $(word 1,$(subst ., ,$(CC_VERSION))) CC_MINOR := $(word 2,$(subst ., ,$(CC_VERSION))) define cc_ver_ge -$(shell expr $(CC_MAJOR) \>= $(1) \& $(CC_MINOR) \>= $(2)) +$(shell expr $(CC_MAJOR) \> $(1) \| \( $(CC_MAJOR) = $(1) \& $(CC_MINOR) \>= $(2) \) ) endef # CCACHE diff --git a/test/Makefile b/test/Makefile index 4f9dd22..85cc7c4 100644 --- a/test/Makefile +++ b/test/Makefile @@ -127,15 +127,15 @@ endef $(eval $(call pkg_cfg_detect_lib,check,Check)) -COMMON_WARNFLAGS = -W -Wall -Wundef -Wpointer-arith -Wcast-align \ +TEST_WARNFLAGS = -W -Wall -Wundef -Wpointer-arith -Wcast-align \ -Wwrite-strings -Wmissing-declarations -Wuninitialized ifneq ($(CC_MAJOR),2) - COMMON_WARNFLAGS += -Wno-unused-parameter + TEST_WARNFLAGS += -Wno-unused-parameter endif BASE_TESTCFLAGS := -std=c99 -g \ - $(COMMON_WARNFLAGS) \ + $(TEST_WARNFLAGS) \ -D_DEFAULT_SOURCE \ -D_POSIX_C_SOURCE=200809L \ -D_XOPEN_SOURCE=600 \ @@ -156,7 +156,7 @@ TESTLDFLAGS := -L$(TESTROOT) \ # malloc faliure injection generator $(TESTROOT)/libmalloc_fig.so:test/malloc_fig.c - $(CC) -shared -fPIC -I. -std=c99 $(COMMON_WARNFLAGS) $^ -o $@ + $(CC) -shared -fPIC -I. -std=c99 $(TEST_WARNFLAGS) $^ -o $@ # Source files for all tests being compiled TESTSOURCES := -- NetSurf Browser