Date: Sun, 14 Apr 2019 08:32:40 +0800 From: Po-Chuan Hsieh <sunpoet@freebsd.org> To: Jan Beich <jbeich@freebsd.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r498851 - in head/devel: boost-all boost-libs Message-ID: <CAMHz58Ryf2cpUmrtY94ZKBd%2BtF3LUuFScjpFG-iYbKXBvaG28w@mail.gmail.com> In-Reply-To: <sgul-cugu-wny@FreeBSD.org> References: <201904132344.x3DNipkS044552@repo.freebsd.org> <sgul-cugu-wny@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, Apr 14, 2019 at 8:16 AM Jan Beich <jbeich@freebsd.org> wrote:
> Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> writes:
>
> > Modified: head/devel/boost-all/compiled.mk
> >
> ==============================================================================
> > --- head/devel/boost-all/compiled.mk Sat Apr 13 23:44:45 2019
> (r498850)
> > +++ head/devel/boost-all/compiled.mk Sat Apr 13 23:44:51 2019
> (r498851)
> > @@ -7,7 +7,9 @@ ALL_TARGET= stage
> > USES+= compiler:c++17-lang
> > USE_CXXSTD= gnu++17
> >
> > -PLIST_SUB+= BOOST_SHARED_LIB_VER=${PORTVERSION}
> > +PLIST_SUB+= MAJOR_VER=${PORTVERSION:R:R} \
> > + MINOR_VER=${PORTVERSION:R:E} \
> > + BOOST_SHARED_LIB_VER=${PORTVERSION}
> [...]
> > Modified: head/devel/boost-libs/pkg-plist
> >
> ==============================================================================
> > --- head/devel/boost-libs/pkg-plist Sat Apr 13 23:44:45 2019
> (r498850)
> > +++ head/devel/boost-libs/pkg-plist Sat Apr 13 23:44:51 2019
> (r498851)
> > @@ -14023,108 +14023,178 @@
> lib/cmake/boost_wserialization-%%BOOST_SHARED_LIB_VER%
> >
> lib/cmake/boost_wserialization-%%BOOST_SHARED_LIB_VER%%/libboost_wserialization-variant-static.cmake
> > lib/libboost_atomic.a
> > lib/libboost_atomic.so
> > +lib/libboost_atomic.so.%%MAJOR_VER%%
> > +lib/libboost_atomic.so.%%MAJOR_VER%%.%%MINOR_VER%%
> > lib/libboost_atomic.so.%%BOOST_SHARED_LIB_VER%%
>
> Does makeplist work for you or are you suggesting manual fixup on each
> update?
>
You cannot fully rely on makeplist result.
If I committed the following version (hardcoded .so.1 and .so.1.70), it
would really have more unnecessary changes on each update.
>
> $ make -V PLIST_SUB:M\*VER\*
> MAJOR_VER=1 MINOR_VER=70 BOOST_SHARED_LIB_VER=1.70.0
> $ make makeplist | sed 1d >pkg-plist
> $ svn diff
> Index: pkg-plist
> ===================================================================
> --- pkg-plist (revision 498863)
> +++ pkg-plist (working copy)
> @@ -14023,178 +14023,178 @@
> lib/cmake/boost_wserialization-%%BOOST_SHARED_LIB_
>
> lib/cmake/boost_wserialization-%%BOOST_SHARED_LIB_VER%%/libboost_wserialization-variant-static.cmake
> lib/libboost_atomic.a
> lib/libboost_atomic.so
> -lib/libboost_atomic.so.%%MAJOR_VER%%
> -lib/libboost_atomic.so.%%MAJOR_VER%%.%%MINOR_VER%%
> +lib/libboost_atomic.so.1
> +lib/libboost_atomic.so.1.70
> lib/libboost_atomic.so.%%BOOST_SHARED_LIB_VER%%
> lib/libboost_chrono.a
> lib/libboost_chrono.so
> -lib/libboost_chrono.so.%%MAJOR_VER%%
> -lib/libboost_chrono.so.%%MAJOR_VER%%.%%MINOR_VER%%
> +lib/libboost_chrono.so.1
> +lib/libboost_chrono.so.1.70
> lib/libboost_chrono.so.%%BOOST_SHARED_LIB_VER%%
> lib/libboost_container.a
> lib/libboost_container.so
> -lib/libboost_container.so.%%MAJOR_VER%%
> -lib/libboost_container.so.%%MAJOR_VER%%.%%MINOR_VER%%
> +lib/libboost_container.so.1
> +lib/libboost_container.so.1.70
> lib/libboost_container.so.%%BOOST_SHARED_LIB_VER%%
> lib/libboost_context.a
> lib/libboost_context.so
> -lib/libboost_context.so.%%MAJOR_VER%%
> -lib/libboost_context.so.%%MAJOR_VER%%.%%MINOR_VER%%
> +lib/libboost_context.so.1
> +lib/libboost_context.so.1.70
> lib/libboost_context.so.%%BOOST_SHARED_LIB_VER%%
> lib/libboost_contract.a
> lib/libboost_contract.so
> -lib/libboost_contract.so.%%MAJOR_VER%%
> -lib/libboost_contract.so.%%MAJOR_VER%%.%%MINOR_VER%%
> +lib/libboost_contract.so.1
> +lib/libboost_contract.so.1.70
> lib/libboost_contract.so.%%BOOST_SHARED_LIB_VER%%
> lib/libboost_coroutine.a
> lib/libboost_coroutine.so
> -lib/libboost_coroutine.so.%%MAJOR_VER%%
> -lib/libboost_coroutine.so.%%MAJOR_VER%%.%%MINOR_VER%%
> +lib/libboost_coroutine.so.1
> +lib/libboost_coroutine.so.1.70
> lib/libboost_coroutine.so.%%BOOST_SHARED_LIB_VER%%
> lib/libboost_date_time.a
> lib/libboost_date_time.so
> -lib/libboost_date_time.so.%%MAJOR_VER%%
> -lib/libboost_date_time.so.%%MAJOR_VER%%.%%MINOR_VER%%
> +lib/libboost_date_time.so.1
> +lib/libboost_date_time.so.1.70
> lib/libboost_date_time.so.%%BOOST_SHARED_LIB_VER%%
> lib/libboost_exception.a
> lib/libboost_fiber.a
> lib/libboost_fiber.so
> -lib/libboost_fiber.so.%%MAJOR_VER%%
> -lib/libboost_fiber.so.%%MAJOR_VER%%.%%MINOR_VER%%
> +lib/libboost_fiber.so.1
> +lib/libboost_fiber.so.1.70
> lib/libboost_fiber.so.%%BOOST_SHARED_LIB_VER%%
> lib/libboost_filesystem.a
> lib/libboost_filesystem.so
> -lib/libboost_filesystem.so.%%MAJOR_VER%%
> -lib/libboost_filesystem.so.%%MAJOR_VER%%.%%MINOR_VER%%
> +lib/libboost_filesystem.so.1
> +lib/libboost_filesystem.so.1.70
> lib/libboost_filesystem.so.%%BOOST_SHARED_LIB_VER%%
> lib/libboost_graph.a
> lib/libboost_graph.so
> -lib/libboost_graph.so.%%MAJOR_VER%%
> -lib/libboost_graph.so.%%MAJOR_VER%%.%%MINOR_VER%%
> +lib/libboost_graph.so.1
> +lib/libboost_graph.so.1.70
> lib/libboost_graph.so.%%BOOST_SHARED_LIB_VER%%
> lib/libboost_iostreams.a
> lib/libboost_iostreams.so
> -lib/libboost_iostreams.so.%%MAJOR_VER%%
> -lib/libboost_iostreams.so.%%MAJOR_VER%%.%%MINOR_VER%%
> +lib/libboost_iostreams.so.1
> +lib/libboost_iostreams.so.1.70
> lib/libboost_iostreams.so.%%BOOST_SHARED_LIB_VER%%
> lib/libboost_locale.a
> lib/libboost_locale.so
> -lib/libboost_locale.so.%%MAJOR_VER%%
> -lib/libboost_locale.so.%%MAJOR_VER%%.%%MINOR_VER%%
> +lib/libboost_locale.so.1
> +lib/libboost_locale.so.1.70
> lib/libboost_locale.so.%%BOOST_SHARED_LIB_VER%%
> lib/libboost_log.a
> lib/libboost_log.so
> -lib/libboost_log.so.%%MAJOR_VER%%
> -lib/libboost_log.so.%%MAJOR_VER%%.%%MINOR_VER%%
> +lib/libboost_log.so.1
> +lib/libboost_log.so.1.70
> lib/libboost_log.so.%%BOOST_SHARED_LIB_VER%%
> lib/libboost_log_setup.a
> lib/libboost_log_setup.so
> -lib/libboost_log_setup.so.%%MAJOR_VER%%
> -lib/libboost_log_setup.so.%%MAJOR_VER%%.%%MINOR_VER%%
> +lib/libboost_log_setup.so.1
> +lib/libboost_log_setup.so.1.70
> lib/libboost_log_setup.so.%%BOOST_SHARED_LIB_VER%%
> lib/libboost_math_c99.a
> lib/libboost_math_c99.so
> -lib/libboost_math_c99.so.%%MAJOR_VER%%
> -lib/libboost_math_c99.so.%%MAJOR_VER%%.%%MINOR_VER%%
> +lib/libboost_math_c99.so.1
> +lib/libboost_math_c99.so.1.70
> lib/libboost_math_c99.so.%%BOOST_SHARED_LIB_VER%%
> lib/libboost_math_c99f.a
> lib/libboost_math_c99f.so
> -lib/libboost_math_c99f.so.%%MAJOR_VER%%
> -lib/libboost_math_c99f.so.%%MAJOR_VER%%.%%MINOR_VER%%
> +lib/libboost_math_c99f.so.1
> +lib/libboost_math_c99f.so.1.70
> lib/libboost_math_c99f.so.%%BOOST_SHARED_LIB_VER%%
> lib/libboost_math_c99l.a
> lib/libboost_math_c99l.so
> -lib/libboost_math_c99l.so.%%MAJOR_VER%%
> -lib/libboost_math_c99l.so.%%MAJOR_VER%%.%%MINOR_VER%%
> +lib/libboost_math_c99l.so.1
> +lib/libboost_math_c99l.so.1.70
> lib/libboost_math_c99l.so.%%BOOST_SHARED_LIB_VER%%
> lib/libboost_math_tr1.a
> lib/libboost_math_tr1.so
> -lib/libboost_math_tr1.so.%%MAJOR_VER%%
> -lib/libboost_math_tr1.so.%%MAJOR_VER%%.%%MINOR_VER%%
> +lib/libboost_math_tr1.so.1
> +lib/libboost_math_tr1.so.1.70
> lib/libboost_math_tr1.so.%%BOOST_SHARED_LIB_VER%%
> lib/libboost_math_tr1f.a
> lib/libboost_math_tr1f.so
> -lib/libboost_math_tr1f.so.%%MAJOR_VER%%
> -lib/libboost_math_tr1f.so.%%MAJOR_VER%%.%%MINOR_VER%%
> +lib/libboost_math_tr1f.so.1
> +lib/libboost_math_tr1f.so.1.70
> lib/libboost_math_tr1f.so.%%BOOST_SHARED_LIB_VER%%
> lib/libboost_math_tr1l.a
> lib/libboost_math_tr1l.so
> -lib/libboost_math_tr1l.so.%%MAJOR_VER%%
> -lib/libboost_math_tr1l.so.%%MAJOR_VER%%.%%MINOR_VER%%
> +lib/libboost_math_tr1l.so.1
> +lib/libboost_math_tr1l.so.1.70
> lib/libboost_math_tr1l.so.%%BOOST_SHARED_LIB_VER%%
> lib/libboost_prg_exec_monitor.a
> lib/libboost_prg_exec_monitor.so
> -lib/libboost_prg_exec_monitor.so.%%MAJOR_VER%%
> -lib/libboost_prg_exec_monitor.so.%%MAJOR_VER%%.%%MINOR_VER%%
> +lib/libboost_prg_exec_monitor.so.1
> +lib/libboost_prg_exec_monitor.so.1.70
> lib/libboost_prg_exec_monitor.so.%%BOOST_SHARED_LIB_VER%%
> lib/libboost_program_options.a
> lib/libboost_program_options.so
> -lib/libboost_program_options.so.%%MAJOR_VER%%
> -lib/libboost_program_options.so.%%MAJOR_VER%%.%%MINOR_VER%%
> +lib/libboost_program_options.so.1
> +lib/libboost_program_options.so.1.70
> lib/libboost_program_options.so.%%BOOST_SHARED_LIB_VER%%
> lib/libboost_random.a
> lib/libboost_random.so
> -lib/libboost_random.so.%%MAJOR_VER%%
> -lib/libboost_random.so.%%MAJOR_VER%%.%%MINOR_VER%%
> +lib/libboost_random.so.1
> +lib/libboost_random.so.1.70
> lib/libboost_random.so.%%BOOST_SHARED_LIB_VER%%
> lib/libboost_regex.a
> lib/libboost_regex.so
> -lib/libboost_regex.so.%%MAJOR_VER%%
> -lib/libboost_regex.so.%%MAJOR_VER%%.%%MINOR_VER%%
> +lib/libboost_regex.so.1
> +lib/libboost_regex.so.1.70
> lib/libboost_regex.so.%%BOOST_SHARED_LIB_VER%%
> lib/libboost_serialization.a
> lib/libboost_serialization.so
> -lib/libboost_serialization.so.%%MAJOR_VER%%
> -lib/libboost_serialization.so.%%MAJOR_VER%%.%%MINOR_VER%%
> +lib/libboost_serialization.so.1
> +lib/libboost_serialization.so.1.70
> lib/libboost_serialization.so.%%BOOST_SHARED_LIB_VER%%
> lib/libboost_stacktrace_addr2line.a
> lib/libboost_stacktrace_addr2line.so
> -lib/libboost_stacktrace_addr2line.so.%%MAJOR_VER%%
> -lib/libboost_stacktrace_addr2line.so.%%MAJOR_VER%%.%%MINOR_VER%%
> +lib/libboost_stacktrace_addr2line.so.1
> +lib/libboost_stacktrace_addr2line.so.1.70
> lib/libboost_stacktrace_addr2line.so.%%BOOST_SHARED_LIB_VER%%
> lib/libboost_stacktrace_basic.a
> lib/libboost_stacktrace_basic.so
> -lib/libboost_stacktrace_basic.so.%%MAJOR_VER%%
> -lib/libboost_stacktrace_basic.so.%%MAJOR_VER%%.%%MINOR_VER%%
> +lib/libboost_stacktrace_basic.so.1
> +lib/libboost_stacktrace_basic.so.1.70
> lib/libboost_stacktrace_basic.so.%%BOOST_SHARED_LIB_VER%%
> lib/libboost_stacktrace_noop.a
> lib/libboost_stacktrace_noop.so
> -lib/libboost_stacktrace_noop.so.%%MAJOR_VER%%
> -lib/libboost_stacktrace_noop.so.%%MAJOR_VER%%.%%MINOR_VER%%
> +lib/libboost_stacktrace_noop.so.1
> +lib/libboost_stacktrace_noop.so.1.70
> lib/libboost_stacktrace_noop.so.%%BOOST_SHARED_LIB_VER%%
> lib/libboost_system.a
> lib/libboost_system.so
> -lib/libboost_system.so.%%MAJOR_VER%%
> -lib/libboost_system.so.%%MAJOR_VER%%.%%MINOR_VER%%
> +lib/libboost_system.so.1
> +lib/libboost_system.so.1.70
> lib/libboost_system.so.%%BOOST_SHARED_LIB_VER%%
> lib/libboost_test_exec_monitor.a
> lib/libboost_thread.a
> lib/libboost_thread.so
> -lib/libboost_thread.so.%%MAJOR_VER%%
> -lib/libboost_thread.so.%%MAJOR_VER%%.%%MINOR_VER%%
> +lib/libboost_thread.so.1
> +lib/libboost_thread.so.1.70
> lib/libboost_thread.so.%%BOOST_SHARED_LIB_VER%%
> lib/libboost_timer.a
> lib/libboost_timer.so
> -lib/libboost_timer.so.%%MAJOR_VER%%
> -lib/libboost_timer.so.%%MAJOR_VER%%.%%MINOR_VER%%
> +lib/libboost_timer.so.1
> +lib/libboost_timer.so.1.70
> lib/libboost_timer.so.%%BOOST_SHARED_LIB_VER%%
> lib/libboost_type_erasure.a
> lib/libboost_type_erasure.so
> -lib/libboost_type_erasure.so.%%MAJOR_VER%%
> -lib/libboost_type_erasure.so.%%MAJOR_VER%%.%%MINOR_VER%%
> +lib/libboost_type_erasure.so.1
> +lib/libboost_type_erasure.so.1.70
> lib/libboost_type_erasure.so.%%BOOST_SHARED_LIB_VER%%
> lib/libboost_unit_test_framework.a
> lib/libboost_unit_test_framework.so
> -lib/libboost_unit_test_framework.so.%%MAJOR_VER%%
> -lib/libboost_unit_test_framework.so.%%MAJOR_VER%%.%%MINOR_VER%%
> +lib/libboost_unit_test_framework.so.1
> +lib/libboost_unit_test_framework.so.1.70
> lib/libboost_unit_test_framework.so.%%BOOST_SHARED_LIB_VER%%
> lib/libboost_wave.a
> lib/libboost_wave.so
> -lib/libboost_wave.so.%%MAJOR_VER%%
> -lib/libboost_wave.so.%%MAJOR_VER%%.%%MINOR_VER%%
> +lib/libboost_wave.so.1
> +lib/libboost_wave.so.1.70
> lib/libboost_wave.so.%%BOOST_SHARED_LIB_VER%%
> lib/libboost_wserialization.a
> lib/libboost_wserialization.so
> -lib/libboost_wserialization.so.%%MAJOR_VER%%
> -lib/libboost_wserialization.so.%%MAJOR_VER%%.%%MINOR_VER%%
> +lib/libboost_wserialization.so.1
> +lib/libboost_wserialization.so.1.70
> lib/libboost_wserialization.so.%%BOOST_SHARED_LIB_VER%%
>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAMHz58Ryf2cpUmrtY94ZKBd%2BtF3LUuFScjpFG-iYbKXBvaG28w>