On Sun, Feb 11, 2018 at 02:05:59AM -0700, Rafael Sadowski wrote:
> CVSROOT: /cvs
> Module name: ports
> Changes by: rsadow...@cvs.openbsd.org 2018/02/11 02:05:59
>
> Modified files:
> devel/jsoncpp : Makefile distinfo
> devel/jsoncpp/patches: patch-include_json_value_h
> patch-meson_build
> patch-src_lib_json_json_value_cpp
> Removed files:
> devel/jsoncpp/patches: patch-src_lib_json_json_reader_cpp
>
> Log message:
> Update jsoncpp to 1.8.4
>
> ok dcoppa@
This keeps failing on mips64 as well although perhaps it is just broken
there.
Bryan
>>> Building on localhost under devel/jsoncpp
BDEPENDS = [devel/meson]
DIST = [devel/jsoncpp:jsoncpp-1.8.4.tar.gz]
FULLPKGNAME = jsoncpp-1.8.4
>>> Running clean in devel/jsoncpp at 1518478920
===> devel/jsoncpp
===> Cleaning for jsoncpp-1.8.4
(Junk lock obtained for localhost at 1518478921)
>>> Running depends in devel/jsoncpp at 1518478921
/usr/sbin/pkg_add -aI -Dunsigned -Drepair meson-0.44.0
was: /usr/sbin/pkg_add -aI -Dunsigned -Drepair meson-0.44.0
/usr/sbin/pkg_add -aI -Dunsigned -Drepair meson-0.44.0
>>> Running show-prepare-results in devel/jsoncpp at 1518478955
===> devel/jsoncpp
===> jsoncpp-1.8.4 depends on: meson->=0.44.0 -> meson-0.44.0
===> Verifying specs: m stdc++ pthread
===> found m.10.0 stdc++.57.0 pthread.25.1
meson-0.44.0
(Junk lock released for localhost at 1518478956)
distfiles size=200226
>>> Running patch in devel/jsoncpp at 1518478956
===> devel/jsoncpp
===> Checking files for jsoncpp-1.8.4
`/usr/ports/distfiles/jsoncpp-1.8.4.tar.gz' is up to date.
>> (SHA256) jsoncpp-1.8.4.tar.gz: OK
===> Extracting for jsoncpp-1.8.4
===> Patching for jsoncpp-1.8.4
===> Applying OpenBSD patch patch-include_json_value_h
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$OpenBSD: patch-include_json_value_h,v 1.2 2018/02/11 09:05:59 rsadowski Exp $
|
|XXX Revert commit 23c44d9f9eed8a7ff95daca9bd44526067c144c0 to avoid
|undefined references when linking cmake.
|
|commit 23c44d9f9eed8a7ff95daca9bd44526067c144c0
|Author: Dhruv Paranjape <lord.dh...@gmail.com>
|Date: Sat Jul 8 12:00:47 2017
|
|overload append function for R value references.
|
|Index: include/json/value.h
|--- include/json/value.h.orig
|+++ include/json/value.h
--------------------------
Patching file include/json/value.h using Plan A...
Hunk #1 succeeded at 322.
Hunk #2 succeeded at 447.
done
===> Applying OpenBSD patch patch-meson_build
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$OpenBSD: patch-meson_build,v 1.5 2018/02/11 09:05:59 rsadowski Exp $
|
|Index: meson.build
|--- meson.build.orig
|+++ meson.build
--------------------------
Patching file meson.build using Plan A...
Hunk #1 succeeded at 25.
Hunk #2 succeeded at 43.
Hunk #3 succeeded at 58.
Hunk #4 succeeded at 74.
Hunk #5 succeeded at 89.
Hunk #6 succeeded at 100.
done
===> Applying OpenBSD patch patch-src_lib_json_json_value_cpp
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$OpenBSD: patch-src_lib_json_json_value_cpp,v 1.2 2018/02/11 09:05:59
rsadowski Exp $
|
|XXX Revert commit 23c44d9f9eed8a7ff95daca9bd44526067c144c0 to avoid
|undefined references when linking cmake.
|
|commit 23c44d9f9eed8a7ff95daca9bd44526067c144c0
|Author: Dhruv Paranjape <lord.dh...@gmail.com>
|Date: Sat Jul 8 12:00:47 2017
|
|overload append function for R value references.
|
|Index: src/lib_json/json_value.cpp
|--- src/lib_json/json_value.cpp.orig
|+++ src/lib_json/json_value.cpp
--------------------------
Patching file src/lib_json/json_value.cpp using Plan A...
Hunk #1 succeeded at 485.
Hunk #2 succeeded at 1138.
done
===> Compiler link: cc -> /usr/bin/cc
===> Compiler link: c++ -> /usr/bin/c++
>>> Running configure in devel/jsoncpp at 1518478957
===> devel/jsoncpp
===> Configuring for jsoncpp-1.8.4
The Meson build system
Version: 0.44.0
Source dir: /usr/ports/pobj/jsoncpp-1.8.4/jsoncpp-1.8.4
Build dir: /usr/ports/pobj/jsoncpp-1.8.4/build-mips64
Build type: native build
Project name: jsoncpp
Native C++ compiler: c++ (gcc 4.2.1)
Appending CXXFLAGS from environment: '-O2 -pipe '
Build machine cpu family: octeon
Build machine cpu: octeon
Configuring version.h using configuration
Dependency threads found: YES
Build targets in project: 3
Found ninja-1.8.2 at /usr/local/bin/ninja
>>> Running build in devel/jsoncpp at 1518478962
===> devel/jsoncpp
===> Building for jsoncpp-1.8.4
exec /usr/bin/env -i LC_CTYPE="en_US.UTF-8" PORTSDIR="/usr/ports"
LIBTOOL="/usr/bin/libtool" LIBjsoncpp_LTVERSION='-version-info 4:0:0'
libjsoncpp_ltversion=4.0
PATH='/usr/ports/pobj/jsoncpp-1.8.4/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11R6/bin'
PREFIX='/usr/local' LOCALBASE='/usr/local' X11BASE='/usr/X11R6' CFLAGS='-O2
-pipe' TRUEPREFIX='/usr/local' DESTDIR=''
HOME='/jsoncpp-1.8.4_writes_to_HOME' COMPILER_VERSION=gcc4 PICFLAG="-fpic"
BINGRP=bin BINOWN=root BINMODE=755 NONBINMODE=644 DIRMODE=755 INSTALL_COPY=-c
INSTALL_STRIP=-s MANGRP=bin MANOWN=root MANMODE=644
BSD_INSTALL_PROGRAM="/usr/ports/pobj/jsoncpp-1.8.4/bin/install -c -s -m 755"
BSD_INSTALL_SCRIPT="/usr/ports/pobj/jsoncpp-1.8.4/bin/install -c -m 755"
BSD_INSTALL_DATA="/usr/ports/pobj/jsoncpp-1.8.4/bin/install -c -m 644"
BSD_INSTALL_MAN="/usr/ports/pobj/jsoncpp-1.8.4/bin/install -c -m 644"
BSD_INSTALL_PROGRAM_DIR="/usr/ports/pobj/jsoncpp-1.8.4/bin/install -d -m 755"
BSD_INSTALL_SCRIPT_DIR="/usr/ports/pobj/jsoncpp-1.8.4/bin/install -d -m 755"
BSD_INSTALL_DATA_DIR="/usr/ports/pobj/jsoncpp-1.8.4/bin/install -d -m 755"
BSD_INSTALL_MAN_DIR="/usr/ports/pobj/jsoncpp-1.8.4/bin/install -d -m 755"
/usr/local/bin/ninja -C /usr/ports/pobj/jsoncpp-1.8.4/build-mips64 -v -j 1
ninja: Entering directory `/usr/ports/pobj/jsoncpp-1.8.4/build-mips64'
[1/10] c++ -Ijsoncpp@sha -I. -I../jsoncpp-1.8.4 -I../jsoncpp-1.8.4/include
-pipe -D_FILE_OFFSET_BITS=64 -O2 -fPIC -pthread -MMD -MQ
'jsoncpp@sha/src_lib_json_json_writer.cpp.o' -MF
'jsoncpp@sha/src_lib_json_json_writer.cpp.o.d' -o
'jsoncpp@sha/src_lib_json_json_writer.cpp.o' -c
../jsoncpp-1.8.4/src/lib_json/json_writer.cpp
FAILED: jsoncpp@sha/src_lib_json_json_writer.cpp.o
c++ -Ijsoncpp@sha -I. -I../jsoncpp-1.8.4 -I../jsoncpp-1.8.4/include -pipe
-D_FILE_OFFSET_BITS=64 -O2 -fPIC -pthread -MMD -MQ
'jsoncpp@sha/src_lib_json_json_writer.cpp.o' -MF
'jsoncpp@sha/src_lib_json_json_writer.cpp.o.d' -o
'jsoncpp@sha/src_lib_json_json_writer.cpp.o' -c
../jsoncpp-1.8.4/src/lib_json/json_writer.cpp
In file included from ../jsoncpp-1.8.4/include/json/writer.h:10,
from ../jsoncpp-1.8.4/src/lib_json/json_writer.cpp:7:
../jsoncpp-1.8.4/include/json/value.h:400: error: only declarations of
constructors can be 'explicit'
ninja: build stopped: subcommand failed.
*** Error 1 in devel/jsoncpp (/usr/ports/devel/meson/meson.port.mk:51
'do-build')
*** Error 1 in devel/jsoncpp (/usr/ports/infrastructure/mk/bsd.port.mk:2738
'/usr/ports/pobj/jsoncpp-1.8.4/build-mips64/.build_done')
*** Error 1 in devel/jsoncpp (/usr/ports/infrastructure/mk/bsd.port.mk:2419
'build')
===> Exiting devel/jsoncpp with an error
*** Error 1 in /usr/ports (infrastructure/mk/bsd.port.subdir.mk:147 'build')
Error: job failed with 256 on localhost
