On Sun Dec 30, 2018 at 05:32:22PM +0300, Ivan Krylov wrote:
> Hi Rafael,
>
> On Fri, 28 Dec 2018 21:02:44 +0100
> Rafael Sadowski <rafael@sizeofvoid.org> wrote:
>
> > package fine for me. OK?
>
> b2 builds my projects fine, too. One small problem I have with it is
> that it requires me to pass BOOST_BUILD_PATH or BOOST_ROOT environment
> variable. I'm suggesting the patch below that should provide a default
> path for b2 to find its files in after the package is installed. Tell
> me if I should arrange it differently.
>
> --- boost_1_66_0/tools/build/src/engine/Jambase.orig Sun Dec 30 17:23:23 2018
> +++ boost_1_66_0/tools/build/src/engine/Jambase Sun Dec 30 17:24:37 2018
> @@ -51,7 +51,7 @@
> # Policy.
> if ! $(BOOST_BUILD_PATH) && $(UNIX)
> {
> - BOOST_BUILD_PATH = /usr/share/boost-build ;
> + BOOST_BUILD_PATH = /usr/local/share/boost-build/kernel ;
> }
>
> Thank you for your work and happy holidays!
>
> --
> Best regards,
> Ivan
>
Thanks for your feedback. New diff below which fix BOOST_BUILD_PATH in
Jambase.
Rafael Sadowski
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/boost/Makefile,v
retrieving revision 1.79
diff -u -p -u -p -r1.79 Makefile
--- Makefile 24 Dec 2018 23:34:27 -0000 1.79
+++ Makefile 30 Dec 2018 18:04:24 -0000
@@ -9,7 +9,7 @@ VERSION= 1.66.0
DISTNAME= boost_${VERSION:S/./_/g}
PKGNAME-main= boost-${VERSION}
PKGNAME-md= boost-md-${VERSION}
-REVISION-main= 1
+REVISION-main= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=boost/}
EXTRACT_SUFX= .tar.bz2
@@ -145,6 +145,9 @@ NO_TEST= Yes
SUBST_VARS+= SO_VERSION
+pre-configure:
+ ${SUBST_CMD} ${WRKSRC}/tools/build/src/engine/Jambase
+
do-configure:
echo "using ${TOOLSET} : : ${CXX} ;" >>${WRKSRC}/tools/build/user-config.jam
@${SUBST_CMD} ${WRKSRC}/Jamroot
@@ -167,12 +170,23 @@ do-build:
./b2 ${BJAM_CONFIG} python=${MODPY_DEFAULT_VERSION_3}\
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/tools/build/src/engine/bin.*/{b2,bjam} \
- ${PREFIX}/bin
+ # Libs and includes:
${INSTALL_DATA} ${WRKSRC}/stage/lib/lib!(*.so) ${PREFIX}/lib
@cd ${WRKSRC} && \
find boost -type d -exec ${INSTALL_DATA_DIR} ${PREFIX}/include/{} \;
@cd ${WRKSRC} && \
find boost ! -name \*.orig -type f -exec ${INSTALL_DATA} {} ${PREFIX}/include/{} \;
+ # boost-build:
+ ${INSTALL_PROGRAM} ${WRKSRC}/tools/build/src/engine/bin.*/{b2,bjam} \
+ ${PREFIX}/bin
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/boost-build
+ @cd ${WRKSRC}/tools/build/src && \
+ pax -r -w -p pm -s ':^./engine.*$$::' \
+ -s ':^.*\.orig$$::' . ${PREFIX}/share/boost-build
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/boost-build
+ ${INSTALL_DATA} ${WRKSRC}/tools/build/example/site-config.jam \
+ ${PREFIX}/share/examples/boost-build
+ ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
+ ${PREFIX}/share/boost-build/
.include <bsd.port.mk>
Index: patches/patch-tools_build_src_engine_Jambase
===================================================================
RCS file: patches/patch-tools_build_src_engine_Jambase
diff -N patches/patch-tools_build_src_engine_Jambase
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-tools_build_src_engine_Jambase 30 Dec 2018 18:04:24 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: tools/build/src/engine/Jambase
+--- tools/build/src/engine/Jambase.orig
++++ tools/build/src/engine/Jambase
+@@ -51,7 +51,7 @@ BOOST_BUILD_PATH.user-value = $(BOOST_BUILD_PATH) ;
+ # Policy.
+ if ! $(BOOST_BUILD_PATH) && $(UNIX)
+ {
+- BOOST_BUILD_PATH = /usr/share/boost-build ;
++ BOOST_BUILD_PATH = ${LOCALBASE}/share/boost-build ;
+ }
+
+
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/devel/boost/pkg/PLIST-main,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST-main
--- pkg/PLIST-main 13 Dec 2018 19:52:46 -0000 1.6
+++ pkg/PLIST-main 30 Dec 2018 18:04:25 -0000
@@ -14160,3 +14160,362 @@ lib/libboost_wserialization-mt.a
@lib lib/libboost_wserialization-mt.so.${LIBboost_wserialization-mt_VERSION}
lib/libboost_wserialization.a
@lib lib/libboost_wserialization.so.${LIBboost_wserialization_VERSION}
+share/boost-build/
+share/boost-build/__init__.py
+share/boost-build/__init__.pyc
+share/boost-build/bootstrap.jam
+share/boost-build/build/
+share/boost-build/build-system.jam
+share/boost-build/build/__init__.py
+share/boost-build/build/__init__.pyc
+share/boost-build/build/ac.jam
+share/boost-build/build/alias.jam
+share/boost-build/build/alias.py
+share/boost-build/build/alias.pyc
+share/boost-build/build/build-request.jam
+share/boost-build/build/build_request.py
+share/boost-build/build/build_request.pyc
+share/boost-build/build/config-cache.jam
+share/boost-build/build/configure.jam
+share/boost-build/build/configure.py
+share/boost-build/build/configure.pyc
+share/boost-build/build/engine.py
+share/boost-build/build/engine.pyc
+share/boost-build/build/errors.py
+share/boost-build/build/errors.pyc
+share/boost-build/build/feature.jam
+share/boost-build/build/feature.py
+share/boost-build/build/feature.pyc
+share/boost-build/build/generators.jam
+share/boost-build/build/generators.py
+share/boost-build/build/generators.pyc
+share/boost-build/build/project.jam
+share/boost-build/build/project.py
+share/boost-build/build/project.pyc
+share/boost-build/build/property-set.jam
+share/boost-build/build/property.jam
+share/boost-build/build/property.py
+share/boost-build/build/property.pyc
+share/boost-build/build/property_set.py
+share/boost-build/build/property_set.pyc
+share/boost-build/build/readme.txt
+share/boost-build/build/scanner.jam
+share/boost-build/build/scanner.py
+share/boost-build/build/scanner.pyc
+share/boost-build/build/targets.jam
+share/boost-build/build/targets.py
+share/boost-build/build/targets.pyc
+share/boost-build/build/toolset.jam
+share/boost-build/build/toolset.py
+share/boost-build/build/toolset.pyc
+share/boost-build/build/type.jam
+share/boost-build/build/type.py
+share/boost-build/build/type.pyc
+share/boost-build/build/version.jam
+share/boost-build/build/version.py
+share/boost-build/build/version.pyc
+share/boost-build/build/virtual-target.jam
+share/boost-build/build/virtual_target.py
+share/boost-build/build/virtual_target.pyc
+share/boost-build/build_system.py
+share/boost-build/build_system.pyc
+share/boost-build/contrib/
+share/boost-build/contrib/__init__.py
+share/boost-build/contrib/__init__.pyc
+share/boost-build/contrib/boost.jam
+share/boost-build/contrib/boost.py
+share/boost-build/contrib/boost.pyc
+share/boost-build/contrib/modular.jam
+share/boost-build/contrib/tntnet.jam
+share/boost-build/contrib/wxFormBuilder.jam
+share/boost-build/exceptions.py
+share/boost-build/exceptions.pyc
+share/boost-build/kernel/
+share/boost-build/kernel/boost-build.jam
+share/boost-build/kernel/bootstrap.jam
+share/boost-build/kernel/bootstrap.py
+share/boost-build/kernel/bootstrap.pyc
+share/boost-build/kernel/class.jam
+share/boost-build/kernel/errors.jam
+share/boost-build/kernel/modules.jam
+share/boost-build/manager.py
+share/boost-build/manager.pyc
+share/boost-build/options/
+share/boost-build/options/help.jam
+share/boost-build/tools/
+share/boost-build/tools/__init__.py
+share/boost-build/tools/__init__.pyc
+share/boost-build/tools/acc.jam
+share/boost-build/tools/asciidoctor.jam
+share/boost-build/tools/auto-index.jam
+share/boost-build/tools/bison.jam
+share/boost-build/tools/boostbook-config.jam
+share/boost-build/tools/boostbook.jam
+share/boost-build/tools/borland.jam
+share/boost-build/tools/builtin.jam
+share/boost-build/tools/builtin.py
+share/boost-build/tools/builtin.pyc
+share/boost-build/tools/bzip2.jam
+share/boost-build/tools/cast.jam
+share/boost-build/tools/cast.py
+share/boost-build/tools/cast.pyc
+share/boost-build/tools/clang-darwin.jam
+share/boost-build/tools/clang-linux.jam
+share/boost-build/tools/clang-vxworks.jam
+share/boost-build/tools/clang-win.jam
+share/boost-build/tools/clang.jam
+share/boost-build/tools/common.jam
+share/boost-build/tools/common.py
+share/boost-build/tools/common.pyc
+share/boost-build/tools/common_clang_vc.jam
+share/boost-build/tools/como-linux.jam
+share/boost-build/tools/como-win.jam
+share/boost-build/tools/como.jam
+share/boost-build/tools/convert.jam
+share/boost-build/tools/cray.jam
+share/boost-build/tools/cw-config.jam
+share/boost-build/tools/cw.jam
+share/boost-build/tools/cygwin.jam
+share/boost-build/tools/darwin.jam
+share/boost-build/tools/darwin.py
+share/boost-build/tools/darwin.pyc
+share/boost-build/tools/diab.jam
+share/boost-build/tools/dmc.jam
+share/boost-build/tools/docutils.jam
+share/boost-build/tools/doxproc.py
+share/boost-build/tools/doxproc.pyc
+share/boost-build/tools/doxygen/
+share/boost-build/tools/doxygen-config.jam
+share/boost-build/tools/doxygen.jam
+share/boost-build/tools/doxygen/windows-paths-check.doxyfile
+share/boost-build/tools/doxygen/windows-paths-check.hpp
+share/boost-build/tools/emscripten.jam
+share/boost-build/tools/features/
+share/boost-build/tools/features/__init_features__.jam
+share/boost-build/tools/features/address-model-feature.jam
+share/boost-build/tools/features/allow-feature.jam
+share/boost-build/tools/features/architecture-feature.jam
+share/boost-build/tools/features/archiveflags-feature.jam
+share/boost-build/tools/features/asmflags-feature.jam
+share/boost-build/tools/features/build-feature.jam
+share/boost-build/tools/features/cflags-feature.jam
+share/boost-build/tools/features/conditional-feature.jam
+share/boost-build/tools/features/cxx-template-depth-feature.jam
+share/boost-build/tools/features/cxxabi-feature.jam
+share/boost-build/tools/features/cxxflags-feature.jam
+share/boost-build/tools/features/cxxstd-feature.jam
+share/boost-build/tools/features/debug-feature.jam
+share/boost-build/tools/features/define-feature.jam
+share/boost-build/tools/features/dependency-feature.jam
+share/boost-build/tools/features/dll-feature.jam
+share/boost-build/tools/features/exception-feature.jam
+share/boost-build/tools/features/fflags-feature.jam
+share/boost-build/tools/features/file-feature.jam
+share/boost-build/tools/features/find-lib-feature.jam
+share/boost-build/tools/features/flags-feature.jam
+share/boost-build/tools/features/include-feature.jam
+share/boost-build/tools/features/instruction-set-feature.jam
+share/boost-build/tools/features/internal-feature.jam
+share/boost-build/tools/features/library-feature.jam
+share/boost-build/tools/features/link-feature.jam
+share/boost-build/tools/features/linkflags-feature.jam
+share/boost-build/tools/features/location-feature.jam
+share/boost-build/tools/features/location-prefix-feature.jam
+share/boost-build/tools/features/name-feature.jam
+share/boost-build/tools/features/objcflags-feature.jam
+share/boost-build/tools/features/optimization-feature.jam
+share/boost-build/tools/features/os-feature.jam
+share/boost-build/tools/features/rtti-feature.jam
+share/boost-build/tools/features/runtime-feature.jam
+share/boost-build/tools/features/search-feature.jam
+share/boost-build/tools/features/source-feature.jam
+share/boost-build/tools/features/stdlib-feature.jam
+share/boost-build/tools/features/strip-feature.jam
+share/boost-build/tools/features/tag-feature.jam
+share/boost-build/tools/features/threadapi-feature.jam
+share/boost-build/tools/features/threading-feature.jam
+share/boost-build/tools/features/toolset-feature.jam
+share/boost-build/tools/features/user-interface-feature.jam
+share/boost-build/tools/features/variant-feature.jam
+share/boost-build/tools/features/version-feature.jam
+share/boost-build/tools/features/warnings-feature.jam
+share/boost-build/tools/fop.jam
+share/boost-build/tools/fortran.jam
+share/boost-build/tools/gcc.jam
+share/boost-build/tools/gcc.py
+share/boost-build/tools/gcc.pyc
+share/boost-build/tools/generate.jam
+share/boost-build/tools/generators/
+share/boost-build/tools/generators/__init_generators__.jam
+share/boost-build/tools/generators/archive-generator.jam
+share/boost-build/tools/generators/c-compiling-generator.jam
+share/boost-build/tools/generators/dummy-generator.jam
+share/boost-build/tools/generators/lib-generator.jam
+share/boost-build/tools/generators/linking-generator.jam
+share/boost-build/tools/generators/prebuilt-lib-generator.jam
+share/boost-build/tools/generators/searched-lib-generator.jam
+share/boost-build/tools/gettext.jam
+share/boost-build/tools/gfortran.jam
+share/boost-build/tools/hp_cxx.jam
+share/boost-build/tools/hpfortran.jam
+share/boost-build/tools/ifort.jam
+share/boost-build/tools/intel-darwin.jam
+share/boost-build/tools/intel-linux.jam
+share/boost-build/tools/intel-vxworks.jam
+share/boost-build/tools/intel-win.jam
+share/boost-build/tools/intel.jam
+share/boost-build/tools/lex.jam
+share/boost-build/tools/libjpeg.jam
+share/boost-build/tools/libpng.jam
+share/boost-build/tools/libtiff.jam
+share/boost-build/tools/link.jam
+share/boost-build/tools/lzma.jam
+share/boost-build/tools/make.jam
+share/boost-build/tools/make.py
+share/boost-build/tools/make.pyc
+share/boost-build/tools/mc.jam
+share/boost-build/tools/mc.py
+share/boost-build/tools/mc.pyc
+share/boost-build/tools/message.jam
+share/boost-build/tools/message.py
+share/boost-build/tools/message.pyc
+share/boost-build/tools/midl.jam
+share/boost-build/tools/midl.py
+share/boost-build/tools/midl.pyc
+share/boost-build/tools/mipspro.jam
+share/boost-build/tools/mpi.jam
+share/boost-build/tools/msvc-config.jam
+share/boost-build/tools/msvc.jam
+share/boost-build/tools/msvc.py
+share/boost-build/tools/msvc.pyc
+share/boost-build/tools/notfile.jam
+share/boost-build/tools/notfile.py
+share/boost-build/tools/notfile.pyc
+share/boost-build/tools/package.jam
+share/boost-build/tools/package.py
+share/boost-build/tools/package.pyc
+share/boost-build/tools/pathscale.jam
+share/boost-build/tools/pch.jam
+share/boost-build/tools/pch.py
+share/boost-build/tools/pch.pyc
+share/boost-build/tools/pgi.jam
+share/boost-build/tools/python-config.jam
+share/boost-build/tools/python.jam
+share/boost-build/tools/qcc.jam
+share/boost-build/tools/qt.jam
+share/boost-build/tools/qt3.jam
+share/boost-build/tools/qt4.jam
+share/boost-build/tools/qt5.jam
+share/boost-build/tools/quickbook-config.jam
+share/boost-build/tools/quickbook.jam
+share/boost-build/tools/rc.jam
+share/boost-build/tools/rc.py
+share/boost-build/tools/rc.pyc
+share/boost-build/tools/sass.jam
+share/boost-build/tools/stage.jam
+share/boost-build/tools/stage.py
+share/boost-build/tools/stage.pyc
+share/boost-build/tools/stlport.jam
+share/boost-build/tools/sun.jam
+share/boost-build/tools/symlink.jam
+share/boost-build/tools/symlink.py
+share/boost-build/tools/symlink.pyc
+share/boost-build/tools/testing-aux.jam
+share/boost-build/tools/testing.jam
+share/boost-build/tools/testing.py
+share/boost-build/tools/testing.pyc
+share/boost-build/tools/types/
+share/boost-build/tools/types/__init__.py
+share/boost-build/tools/types/__init__.pyc
+share/boost-build/tools/types/adoc.jam
+share/boost-build/tools/types/asm.jam
+share/boost-build/tools/types/asm.py
+share/boost-build/tools/types/asm.pyc
+share/boost-build/tools/types/cpp.jam
+share/boost-build/tools/types/cpp.py
+share/boost-build/tools/types/cpp.pyc
+share/boost-build/tools/types/css.jam
+share/boost-build/tools/types/docbook.jam
+share/boost-build/tools/types/exe.jam
+share/boost-build/tools/types/exe.py
+share/boost-build/tools/types/exe.pyc
+share/boost-build/tools/types/html.jam
+share/boost-build/tools/types/html.py
+share/boost-build/tools/types/html.pyc
+share/boost-build/tools/types/lib.jam
+share/boost-build/tools/types/lib.py
+share/boost-build/tools/types/lib.pyc
+share/boost-build/tools/types/man.jam
+share/boost-build/tools/types/markdown.jam
+share/boost-build/tools/types/markdown.py
+share/boost-build/tools/types/markdown.pyc
+share/boost-build/tools/types/obj.jam
+share/boost-build/tools/types/obj.py
+share/boost-build/tools/types/obj.pyc
+share/boost-build/tools/types/objc.jam
+share/boost-build/tools/types/pdf.jam
+share/boost-build/tools/types/preprocessed.jam
+share/boost-build/tools/types/preprocessed.py
+share/boost-build/tools/types/preprocessed.pyc
+share/boost-build/tools/types/qt.jam
+share/boost-build/tools/types/register.jam
+share/boost-build/tools/types/rsp.jam
+share/boost-build/tools/types/rsp.py
+share/boost-build/tools/types/rsp.pyc
+share/boost-build/tools/types/sass-type.jam
+share/boost-build/tools/types/xml.jam
+share/boost-build/tools/unix.jam
+share/boost-build/tools/unix.py
+share/boost-build/tools/unix.pyc
+share/boost-build/tools/vacpp.jam
+share/boost-build/tools/vmsdecc.jam
+share/boost-build/tools/whale.jam
+share/boost-build/tools/xlcpp.jam
+share/boost-build/tools/xlf.jam
+share/boost-build/tools/xsltproc/
+share/boost-build/tools/xsltproc-config.jam
+share/boost-build/tools/xsltproc.jam
+share/boost-build/tools/xsltproc/included.xsl
+share/boost-build/tools/xsltproc/test.xml
+share/boost-build/tools/xsltproc/test.xsl
+share/boost-build/tools/zlib.jam
+share/boost-build/util/
+share/boost-build/util/__init__.py
+share/boost-build/util/__init__.pyc
+share/boost-build/util/assert.jam
+share/boost-build/util/container.jam
+share/boost-build/util/doc.jam
+share/boost-build/util/indirect.jam
+share/boost-build/util/indirect.py
+share/boost-build/util/indirect.pyc
+share/boost-build/util/logger.py
+share/boost-build/util/logger.pyc
+share/boost-build/util/numbers.jam
+share/boost-build/util/option.jam
+share/boost-build/util/option.py
+share/boost-build/util/option.pyc
+share/boost-build/util/order.jam
+share/boost-build/util/order.py
+share/boost-build/util/order.pyc
+share/boost-build/util/os.jam
+share/boost-build/util/os_j.py
+share/boost-build/util/os_j.pyc
+share/boost-build/util/path.jam
+share/boost-build/util/path.py
+share/boost-build/util/path.pyc
+share/boost-build/util/print.jam
+share/boost-build/util/regex.jam
+share/boost-build/util/regex.py
+share/boost-build/util/regex.pyc
+share/boost-build/util/sequence.jam
+share/boost-build/util/sequence.py
+share/boost-build/util/sequence.pyc
+share/boost-build/util/set.jam
+share/boost-build/util/set.py
+share/boost-build/util/set.pyc
+share/boost-build/util/string.jam
+share/boost-build/util/utility.jam
+share/boost-build/util/utility.py
+share/boost-build/util/utility.pyc
+share/examples/boost-build/
+share/examples/boost-build/site-config.jam
No comments:
Post a Comment