diff --git a/devel/jsoncpp/Makefile b/devel/jsoncpp/Makefile index 02819aa9b..a48bb5e79 100644 --- a/devel/jsoncpp/Makefile +++ b/devel/jsoncpp/Makefile @@ -15,7 +15,7 @@ HOMEPAGE = https://github.com/open-source-parsers/jsoncpp/wiki # Public Domain / MIT PERMIT_PACKAGE = Yes -WANTLIB = m ${COMPILER_LIBCXX} +WANTLIB = c m ${COMPILER_LIBCXX} COMPILER = base-clang ports-gcc base-gcc @@ -28,6 +28,11 @@ MODPY_RUNDEP = No TEST_ENV += LD_PRELOAD=${WRKBUILD}/libjsoncpp.so.${LIBjsoncpp_VERSION} +CXXFLAGS += -I${LOCALBASE}/lib +LDFLAGS += -L${LOCALBASE}/lib -lc + +CONFIGURE_ARGS +=-Dcpp_args="${CXXFLAGS}" -Dcpp_link_args="${LDFLAGS}" + post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/jsoncpp ${INSTALL_DATA} ${WRKSRC}/{AUTHORS,LICENSE,README.md} \ diff --git a/devel/jsoncpp/patches/patch-pkg-config_jsoncpp_pc_in b/devel/jsoncpp/patches/patch-pkg-config_jsoncpp_pc_in new file mode 100644 index 000000000..bb9d7e139 --- /dev/null +++ b/devel/jsoncpp/patches/patch-pkg-config_jsoncpp_pc_in @@ -0,0 +1,15 @@ +Index: pkg-config/jsoncpp.pc.in +--- pkg-config/jsoncpp.pc.in.orig ++++ pkg-config/jsoncpp.pc.in +@@ -1,7 +1,7 @@ +-prefix=@CMAKE_INSTALL_PREFIX@ +-exec_prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=@libdir_for_pc_file@ +-includedir=@includedir_for_pc_file@ ++prefix=${TRUEPREFIX} ++exec_prefix=${TRUEPREFIX} ++libdir=${TRUEPREFIX}/lib ++includedir=${TRUEPREFIX}/include/jsoncpp + + Name: jsoncpp + Description: A C++ library for interacting with JSON