diff options
| author | rene <rene@FreeBSD.org> | 2014-09-01 23:18:18 +0800 |
|---|---|---|
| committer | rene <rene@FreeBSD.org> | 2014-09-01 23:18:18 +0800 |
| commit | 3699c2362e9a8a43daadfcdd35347f76a6e0627c (patch) | |
| tree | 8989b35925f208b058db09ea95147aeb9521153c /www/chromium | |
| parent | d278d67f1afe935318e982e173a06b82970e9de6 (diff) | |
| download | freebsd-ports-graphics-3699c2362e9a8a43daadfcdd35347f76a6e0627c.tar.gz freebsd-ports-graphics-3699c2362e9a8a43daadfcdd35347f76a6e0627c.tar.zst freebsd-ports-graphics-3699c2362e9a8a43daadfcdd35347f76a6e0627c.zip | |
www/chromium: fix on i386
files/patch-manual-build is intended to fix some build errors when building
chromium outside of poudriere, but it confuses the package builders for i386.
So rename it only apply it on amd64.
While here clean up some protobuf lines.
Submitted by: pkg-fallout
Diffstat (limited to 'www/chromium')
| -rw-r--r-- | www/chromium/Makefile | 7 | ||||
| -rw-r--r-- | www/chromium/files/extra-patch-manual-amd64 (renamed from www/chromium/files/patch-manual-build) | 0 |
2 files changed, 5 insertions, 2 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 4a43d18d51a..849a5cf4237 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -207,6 +207,11 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang CONFIGURE_ENV+= AR=/usr/bin/ar .endif +# fix for non-poudriere builds, but it confuses pkg-builder on i386 +.if ${ARCH} == amd64 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-manual-amd64 +.endif + # according to portlint the below is passed via bsd.port.mk, # but 'make -V CONFIGURE_ENV' does not show it: CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \ @@ -243,10 +248,8 @@ post-patch: pre-configure: # phajdan-jr: list of things *not* to remove, so maybe the script # should be called "keep_bundled_libraries.py" - # keep third_party/protobuf to ease debugging cd ${WRKSRC} && ${PYTHON_CMD} \ ./build/linux/unbundle/remove_bundled_libraries.py \ - 'third_party/protobuf' \ 'base/third_party/dmg_fp' \ 'base/third_party/dynamic_annotations' \ 'base/third_party/icu' \ diff --git a/www/chromium/files/patch-manual-build b/www/chromium/files/extra-patch-manual-amd64 index fa2df019ef2..fa2df019ef2 100644 --- a/www/chromium/files/patch-manual-build +++ b/www/chromium/files/extra-patch-manual-amd64 |