Date: Sat, 23 Aug 2014 23:07:10 +0200 From: Carlos Jacobo Puga Medina <cpm@fbsd.es> To: Carlos Jacobo Puga Medina <cpm@fbsd.es> Cc: freebsd-chromium@freebsd.org Subject: Re: chromium 37 up for testing (and polishing) Message-ID: <20140823230710.b8589229dd2e62817645da4d@fbsd.es> In-Reply-To: <20140823215526.4248b76f3d04bc34d73f70fd@fbsd.es> References: <20140823191817.72221ad837a5bce62f4dfeba@fbsd.es> <CADL2u4h%2B%2Bvp9=S_kOoAafQBF%2Bi5bVhj27uKK1Y64%2BJEtLT5a7A@mail.gmail.com> <20140823215526.4248b76f3d04bc34d73f70fd@fbsd.es>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, 23 Aug 2014 21:55:26 +0200 Carlos Jacobo Puga Medina <cpm@fbsd.es> wrote: > I found this error while build chromium with Clang 3.4.1 which also is present in previous release. > > [5970/14916] CXX obj/gpu/command_buffe...ommand_buffer_service.buffer_manager.o > FAILED: c++ -MMD -MF obj/gpu/command_buffer/service/command_buffer_service.buffer_manager.o.d -DV8_DEPRECATION_WARNINGS -DBLINK_SCALE_FILTERS_AT_RECORD_TIME -D_FILE_OFFSET_BITS=64 -DNO_TCMALLOC -DDISABLE_NACL -DCHROMIUM_BUILD -DCR_CLANG_REVISION=209387 -DTOOLKIT_VIEWS=1 -DUSE_AURA=1 -DUSE_ASH=1 -DUSE_CAIRO=1 -DUSE_GLIB=1 -DUSE_DEFAULT_RENDER_THEME=1 -DUSE_LIBJPEG_TURBO=1 -DUSE_X11=1 -DUSE_CLIPBOARD_AURAX11=1 -DENABLE_ONE_CLICK_SIGNIN -DUSE_XI2_MT=2 -DENABLE_REMOTING=1 -DENABLE_WEBRTC=1 -DUSE_PROPRIETARY_CODECS -DENABLE_CONFIGURATION_POLICY -DENABLE_NOTIFICATIONS -DENABLE_EGLIMAGE=1 -DENABLE_TASK_MANAGER=1 -DENABLE_EXTENSIONS=1 -DENABLE_PLUGINS=1 -DENABLE_SESSION_SERVICE=1 -DENABLE_THEMES=1 -DENABLE_AUTOFILL_DIALOG=1 -DENABLE_BACKGROUND=1 -DENABLE_GOOGLE_NOW=1 -DCLD_VERSION=2 -DENABLE_FULL_PRINTING=1 -DENABLE_PRINTING=1 -DENABLE_SPELLCHECK=1 -DENABLE_CAPTIVE_PORTAL_DETECTION=1 -DENABLE_APP_LIST=1 -DENABLE_SETTINGS_APP=1 -DENABLE_MANAGED_USERS=1 '-DDATA_REDUCTION_FALLBACK_HOST="http: //compress.googlezip.net:80/"' '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' -DGL_GLEXT_PROTOTYPES -DUSE_SYSTEM_PROTOBUF -DGOOGLE_PROTOBUF_NO_RTTI -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DSK_ENABLE_INST_COUNT=0 -DSK_SUPPORT_GPU=1 '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' -DSK_ENABLE_LEGACY_API_ALIASING=1 -DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1 -DGR_GL_IGNORE_ES3_MSAA=0 -DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT -DSK_SUPPORT_LEGACY_GETTOPDEVICE -DSK_SUPPORT_LEGACY_BITMAP_CONFIG -DSK_SUPPORT_LEGACY_DEVICE_VIRTUAL_ISOPAQUE -DSK_SUPPORT_LEGACY_N32_NAME -DSK_SUPPORT_LEGACY_SETCONFIG -DSK_IGNORE_ETC1_SUPPORT -DSK_IGNORE_GPU_DITHER -DSK_SUPPORT_LEGACY_GETTOTALCLIP -DSK_USE_POSIX_THREADS -DSK_DEFERRED_CANVAS_USES_FACTORIES=1 -DU_USING_ICU_NAMESPACE=0 -DUSE_NSS=1 -D __STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_FORTIFY_SOURCE=2 -Igen/shim_headers/libpng/target -Igen/shim_headers/harfbuzz-ng/target -Igen/shim_headers/zlib/target -Igen/shim_headers/icuuc/target -Igen/shim_headers/icui18n/target -Igen/shim_headers/re2/target -Igen/shim_headers/libevent/target -Igen -I../.. -I../../third_party/khronos -I../../gpu -I/usr/local/include -I../../skia/config -Igen/protoc_out -I../../net/third_party/nss/ssl -I../../third_party/skia/src/core -I../../third_party/skia/include/core -I../../third_party/skia/include/effects -I../../third_party/skia/include/pdf -I../../third_party/skia/include/gpu -I../../third_party/skia/include/lazy -I../../third_party/skia/include/pathops -I../../third_party/skia/include/pipe -I../../third_party/skia/include/ports -I../../third_party/skia/include/utils -I../../skia/ext -Igen/ui/gl -I../../third_party/mesa/src/include -fstack-protector --param=ssp-buffer-size=4 -pthread -fno-exceptions -fno-strict-aliasing -Wall -Wno-unused-parameter -Wno-missing-field-initializers -fvisibility=hidden -pipe -fPIC -Wheader-hygiene -Wno-char-subscripts -Wno-unneeded-internal-declaration -Wno-covered-switch-default -Wstring-conversion -Wno-c++11-narrowing -Wno-reserved-user-defined-literal -Wno-deprecated-register -momit-leaf-frame-pointer -fcolor-diagnostics -pthread -I/usr/local/include/glib-2.0 -I/usr/local/include -I/usr/local/include/nss -I/usr/local/include/nss/nss -I/usr/local/include/nspr -Wno-header-guard -I/usr/local/include -D_THREAD_SAFE -pthread -I/usr/local/include -I/usr/local/include -msse2 -mmmx -m32 -O2 -fdata-sections -ffunction-sections -funwind-tables -O2 -pipe -fno-stack-protector -Wno-unknown-warning-option -fno-strict-aliasing -fcxx-exceptions -fno-rtti -fno-threadsafe-statics -fvisibility-inlines-hidden -Wsign-compare -std=gnu++11 -c ../../gpu/command_buffer/service/buffer_manager.cc -o obj/gpu/command_buffer/service/command_buffer_service.b uffer_manager.o > In file included from ../../gpu/command_buffer/service/buffer_manager.cc:10: > In file included from ../../gpu/command_buffer/service/context_state.h:14: > In file included from ../../gpu/command_buffer/service/query_manager.h:16: > In file included from ../../gpu/command_buffer/service/feature_info.h:14: > In file included from ../../gpu/command_buffer/service/gles2_cmd_validation.h:13: > ../../gpu/command_buffer/common/gles2_cmd_format.h:42:26: error: typedef redefinition with different types ('khronos_intptr_t' (aka 'long') vs 'ptrdiff_t' (aka 'int')) > typedef khronos_intptr_t GLintptr; > ^ > /usr/local/include/GL/glext.h:6152:19: note: previous definition is here > typedef ptrdiff_t GLintptr; > ^ > In file included from ../../gpu/command_buffer/service/buffer_manager.cc:10: > In file included from ../../gpu/command_buffer/service/context_state.h:14: > In file included from ../../gpu/command_buffer/service/query_manager.h:16: > In file included from ../../gpu/command_buffer/service/feature_info.h:14: > In file included from ../../gpu/command_buffer/service/gles2_cmd_validation.h:13: > ../../gpu/command_buffer/common/gles2_cmd_format.h:43:26: error: typedef redefinition with different types ('khronos_ssize_t' (aka 'long') vs 'ptrdiff_t' (aka 'int')) > typedef khronos_ssize_t GLsizeiptr; > ^ > /usr/local/include/GL/glext.h:6153:19: note: previous definition is here > typedef ptrdiff_t GLsizeiptr; > ^ > 2 errors generated. > ninja: build stopped: subcommand failed. > ===> Compilation failed unexpectedly. > Try to set MAKE_JOBS_UNSAFE=yes and rebuild before reporting the failure to > the maintainer. > *** Error code 1 > > Stop. > make[1]: stopped in /usr/ports/www/chromium > *** Error code 1 > > Stop. > make: stopped in /usr/ports/www/chromium > > This patch fixed the problem > > --- ./ui/gl/gl_bindings.h.orig 2014-08-23 21:47:05.000000000 +0200 > +++ ./ui/gl/gl_bindings.h 2014-08-23 21:45:17.000000000 +0200 > @@ -10,10 +10,10 @@ > // the X11 headers on linux, which define all kinds of macros that are > // liable to cause conflicts. > > -#include <GL/gl.h> > -#include <GL/glext.h> > -#include <EGL/egl.h> > -#include <EGL/eglext.h> > +#include "third_party/mesa/src/include/GL/gl.h" > +#include "third_party/mesa/src/include/GL/glext.h" > +#include "third_party/mesa/src/include/EGL/egl.h" > +#include "third_party/mesa/src/include/EGL/eglext.h" > > #include "base/logging.h" > #include "base/threading/thread_local.h" > > ref: https://code.google.com/p/chromium/issues/detail?id=47258 Please, forget the previous patch. This couple of new patches are ok --- ./third_party/mesa/src/include/GLES2/gl2.h.orig 2014-08-23 22:52:05.000000000 +0200 +++ ./third_party/mesa/src/include/GLES2/gl2.h 2014-08-23 22:39:29.000000000 +0200 @@ -4,6 +4,7 @@ /* $Revision: 10602 $ on $Date:: 2010-03-04 22:35:34 -0800 #$ */ #include <GLES2/gl2platform.h> +#include <cstddef> #ifdef __cplusplus extern "C" { @@ -35,8 +36,8 @@ typedef khronos_int32_t GLfixed; /* GL types for handling large vertex buffer objects */ -typedef khronos_intptr_t GLintptr; -typedef khronos_ssize_t GLsizeiptr; +typedef ptrdiff_t GLintptr; +typedef ptrdiff_t GLsizeiptr; /* OpenGL ES core versions */ #define GL_ES_VERSION_2_0 1 --- ./third_party/GLES2/gl2.h.orig 2014-08-23 23:00:29.000000000 +0200 +++ ./third_party/GLES2/gl2.h 2014-08-23 22:46:49.000000000 +0200 @@ -67,8 +67,8 @@ typedef unsigned int GLuint; typedef char GLchar; typedef khronos_float_t GLfloat; -typedef khronos_ssize_t GLsizeiptr; -typedef khronos_intptr_t GLintptr; +typedef ptrdiff_t GLsizeiptr; +typedef ptrdiff_t GLintptr; typedef unsigned int GLbitfield; typedef int GLint; typedef unsigned char GLboolean; -- Carlos Jacobo Puga Medina <cpm@fbsd.es>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140823230710.b8589229dd2e62817645da4d>