From owner-svn-ports-head@freebsd.org Sat May 5 22:03:36 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 27678FBBFEF; Sat, 5 May 2018 22:03:36 +0000 (UTC) (envelope-from cmt@burggraben.net) Received: from smtp.burggraben.net (smtp.burggraben.net [IPv6:2a01:4f8:140:50a2::3:1]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "ns.exwg.net", Issuer "Christoph Moench-Tegeder" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 9E4BD70A06; Sat, 5 May 2018 22:03:35 +0000 (UTC) (envelope-from cmt@burggraben.net) Received: from localhost (localhost [127.0.0.1]) by smtp.burggraben.net (Postfix) with ESMTP id 7E2966002F3; Sun, 6 May 2018 00:03:33 +0200 (CEST) X-Spam-Scanned: by amavisd-new at exwg.net Received: from smtp.burggraben.net ([127.0.0.1]) by localhost (ns.burggraben.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ECNljDMiyoH9; Sun, 6 May 2018 00:03:22 +0200 (CEST) Received: from elch.exwg.net (elch.exwg.net [IPv6:2001:470:7120:1:127b:44ff:fe4f:148d]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "elch.exwg.net", Issuer "Christoph Moench-Tegeder" (verified OK)) by smtp.burggraben.net (Postfix) with ESMTPS; Sun, 6 May 2018 00:03:22 +0200 (CEST) Received: by elch.exwg.net (Postfix, from userid 1000) id 8ECDD2730D; Sun, 6 May 2018 00:03:22 +0200 (CEST) Date: Sun, 6 May 2018 00:03:22 +0200 From: Christoph Moench-Tegeder To: "Montgomery-Smith, Stephen" Cc: Antoine Brodin , "ports-committers@freebsd.org" , "svn-ports-all@freebsd.org" , "svn-ports-head@freebsd.org" Subject: Re: svn commit: r469168 - head/math/octave Message-ID: <20180505220322.GA55299@elch.exwg.net> References: <201805052145.w45LjWJf094546@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="k+w/mQv8wyuph6w0" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.9.5 (2018-04-13) X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 May 2018 22:03:36 -0000 --k+w/mQv8wyuph6w0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline ## Montgomery-Smith, Stephen (stephen@missouri.edu): > In this case, I have some suggestions on how to fix this, but I need > some email exchanges with someone using FreeBSD 11 so that I can figure > out if I am correct. Funny thing is, I just solved it (as in "works for me") on 11.1. Two things: - I added "help" and "help-tools" to USE_QT4 (qcollectiongenerator is from qt4-help-tools and I'm not that sure about qt4-help anymore) - configure need some patching: it calls qcollectiongenerator with "-qt4" (for working with the qtchooser), but the correct argument to qtchooser would be "-qt4=qt4" - that needs to be fixed for QCOLLECTIONGENERATORFLAGS and QHELPGENERATORFLAGS. I didn't get around to cleaning up the patch (there's a lot of line number changes in files/patch-configure) - attached should apply to the ports tree. Perhaps this is close enough for checking your hunch? Regards, Christoph -- Spare Space --k+w/mQv8wyuph6w0 Content-Type: text/x-diff; charset=utf-8 Content-Disposition: attachment; filename="math_octave_qt4.diff" Index: math/octave/Makefile =================================================================== --- math/octave/Makefile (revision 469072) +++ math/octave/Makefile (working copy) @@ -47,7 +47,7 @@ GNU_CONFIGURE= yes USE_JAVA= yes JAVA_VERSION= 1.7+ -USE_QT4= corelib gui network opengl moc_build qmake_build rcc_build uic_build linguist_build +USE_QT4= corelib gui help help-tools network opengl moc_build qmake_build rcc_build uic_build linguist_build USE_XORG= x11 xext xfixes xft USE_GL= gl glu Index: math/octave/files/patch-configure =================================================================== --- math/octave/files/patch-configure (revision 469072) +++ math/octave/files/patch-configure (working copy) @@ -1,6 +1,6 @@ ---- configure.orig 2018-04-30 17:03:56 UTC -+++ configure -@@ -17720,7 +17720,7 @@ $as_echo_n "checking whether the $compil +--- configure.orig 2018-04-30 19:03:56.000000000 +0200 ++++ configure 2018-05-04 14:24:29.000733000 +0200 +@@ -17720,7 +17720,7 @@ hardcode_minus_L=no hardcode_shlibpath_var=unsupported inherit_rpath=no @@ -9,7 +9,7 @@ module_cmds= module_expsym_cmds= old_archive_from_new_cmds= -@@ -18022,7 +18022,7 @@ _LT_EOF +@@ -18022,7 +18022,7 @@ wlarc= else archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' @@ -18,7 +18,7 @@ fi ;; -@@ -18041,7 +18041,7 @@ _LT_EOF +@@ -18041,7 +18041,7 @@ _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' @@ -27,7 +27,7 @@ else ld_shlibs=no fi -@@ -18070,7 +18070,7 @@ _LT_EOF +@@ -18070,7 +18070,7 @@ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' @@ -36,7 +36,7 @@ else ld_shlibs=no fi -@@ -18088,7 +18088,7 @@ _LT_EOF +@@ -18088,7 +18088,7 @@ *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' @@ -45,7 +45,7 @@ else ld_shlibs=no fi -@@ -18737,7 +18737,7 @@ $as_echo "$lt_cv_irix_exported_symbol" > +@@ -18737,7 +18737,7 @@ hardcode_direct_absolute=yes if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' @@ -54,7 +54,7 @@ hardcode_libdir_flag_spec='$wl-rpath,$libdir' export_dynamic_flag_spec='$wl-E' else -@@ -19586,7 +19586,7 @@ freebsd* | dragonfly*) +@@ -19586,7 +19586,7 @@ version_type=freebsd-$objformat case $version_type in freebsd-elf*) @@ -63,7 +63,7 @@ soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no -@@ -20730,7 +20730,7 @@ striplib= +@@ -20730,7 +20730,7 @@ old_striplib= { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 $as_echo_n "checking whether stripping libraries is possible... " >&6; } @@ -72,7 +72,7 @@ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -@@ -20982,7 +20982,7 @@ hardcode_automatic_CXX=no +@@ -20982,7 +20982,7 @@ inherit_rpath_CXX=no module_cmds_CXX= module_expsym_cmds_CXX= @@ -81,7 +81,7 @@ old_archive_cmds_CXX=$old_archive_cmds reload_flag_CXX=$reload_flag reload_cmds_CXX=$reload_cmds -@@ -21193,7 +21193,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld +@@ -21193,7 +21193,7 @@ # archiving commands below assume that GNU ld is being used. if test yes = "$with_gnu_ld"; then archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' @@ -90,7 +90,7 @@ hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' export_dynamic_flag_spec_CXX='$wl--export-dynamic' -@@ -21885,7 +21885,7 @@ fi +@@ -21885,7 +21885,7 @@ case `$CC -V 2>&1` in *"Version 7."*) archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' @@ -99,7 +99,7 @@ ;; *) # Version 8.0 or newer tmp_idyn= -@@ -21893,7 +21893,7 @@ fi +@@ -21893,7 +21893,7 @@ ia64*) tmp_idyn=' -i_dynamic';; esac archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' @@ -108,7 +108,7 @@ ;; esac archive_cmds_need_lc_CXX=no -@@ -21925,7 +21925,7 @@ fi +@@ -21925,7 +21925,7 @@ ;; *) # Version 6 and above use weak symbols archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' @@ -117,7 +117,7 @@ ;; esac -@@ -21936,7 +21936,7 @@ fi +@@ -21936,7 +21936,7 @@ cxx*) # Compaq C++ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' @@ -126,7 +126,7 @@ runpath_var=LD_RUN_PATH hardcode_libdir_flag_spec_CXX='-rpath $libdir' -@@ -21970,7 +21970,7 @@ fi +@@ -21970,7 +21970,7 @@ # Sun C++ 5.9 no_undefined_flag_CXX=' -zdefs' archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' @@ -135,7 +135,7 @@ hardcode_libdir_flag_spec_CXX='-R$libdir' whole_archive_flag_spec_CXX='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object_CXX=yes -@@ -22038,7 +22038,7 @@ fi +@@ -22038,7 +22038,7 @@ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir' if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then @@ -144,7 +144,7 @@ export_dynamic_flag_spec_CXX='$wl-E' whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' fi -@@ -23563,7 +23563,7 @@ freebsd* | dragonfly*) +@@ -23563,7 +23563,7 @@ version_type=freebsd-$objformat case $version_type in freebsd-elf*) @@ -153,7 +153,7 @@ soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no -@@ -24751,7 +24751,7 @@ hardcode_automatic_F77=no +@@ -24751,7 +24751,7 @@ inherit_rpath_F77=no module_cmds_F77= module_expsym_cmds_F77= @@ -162,7 +162,7 @@ old_archive_cmds_F77=$old_archive_cmds reload_flag_F77=$reload_flag reload_cmds_F77=$reload_cmds -@@ -25478,7 +25478,7 @@ $as_echo_n "checking whether the $compil +@@ -25478,7 +25478,7 @@ hardcode_minus_L_F77=no hardcode_shlibpath_var_F77=unsupported inherit_rpath_F77=no @@ -171,7 +171,7 @@ module_cmds_F77= module_expsym_cmds_F77= old_archive_from_new_cmds_F77= -@@ -25780,7 +25780,7 @@ _LT_EOF +@@ -25780,7 +25780,7 @@ wlarc= else archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' @@ -180,7 +180,7 @@ fi ;; -@@ -25799,7 +25799,7 @@ _LT_EOF +@@ -25799,7 +25799,7 @@ _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' @@ -189,7 +189,7 @@ else ld_shlibs_F77=no fi -@@ -25828,7 +25828,7 @@ _LT_EOF +@@ -25828,7 +25828,7 @@ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then hardcode_libdir_flag_spec_F77='$wl-rpath $wl$libdir' archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' @@ -198,7 +198,7 @@ else ld_shlibs_F77=no fi -@@ -25846,7 +25846,7 @@ _LT_EOF +@@ -25846,7 +25846,7 @@ *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' @@ -207,7 +207,7 @@ else ld_shlibs_F77=no fi -@@ -26445,7 +26445,7 @@ $as_echo "$lt_cv_irix_exported_symbol" > +@@ -26445,7 +26445,7 @@ hardcode_direct_absolute_F77=yes if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' @@ -216,7 +216,7 @@ hardcode_libdir_flag_spec_F77='$wl-rpath,$libdir' export_dynamic_flag_spec_F77='$wl-E' else -@@ -27122,7 +27122,7 @@ freebsd* | dragonfly*) +@@ -27122,7 +27122,7 @@ version_type=freebsd-$objformat case $version_type in freebsd-elf*) @@ -225,7 +225,7 @@ soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no -@@ -34165,7 +34165,7 @@ fi +@@ -34165,7 +34165,7 @@ fi # Generic LAPACK library? @@ -234,7 +234,7 @@ if test $ax_lapack_ok = no; then save_LIBS="$LIBS"; LIBS="$BLAS_LIBS $LIBS" as_ac_Lib=`$as_echo "ac_cv_lib_$lapack''_$cheev" | $as_tr_sh` -@@ -70670,9 +70670,6 @@ esac +@@ -70670,9 +70670,6 @@ fi if test -n "$MOC"; then @@ -244,7 +244,7 @@ QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE moc" else QT_TOOLS_MISSING="$QT_TOOLS_MISSING moc" -@@ -70885,9 +70882,6 @@ esac +@@ -70885,9 +70882,6 @@ fi if test -n "$UIC"; then @@ -254,7 +254,7 @@ QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE uic" else QT_TOOLS_MISSING="$QT_TOOLS_MISSING uic" -@@ -71100,9 +71094,6 @@ esac +@@ -71100,9 +71094,6 @@ fi if test -n "$RCC"; then @@ -264,7 +264,7 @@ QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE rcc" else QT_TOOLS_MISSING="$QT_TOOLS_MISSING rcc" -@@ -71315,9 +71306,6 @@ esac +@@ -71315,9 +71306,6 @@ fi if test -n "$LRELEASE"; then @@ -274,7 +274,25 @@ QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE lrelease" else QT_TOOLS_MISSING="$QT_TOOLS_MISSING lrelease" -@@ -73640,7 +73628,7 @@ if test $use_osmesa = yes; then +@@ -71531,7 +71519,7 @@ + + if test -n "$QCOLLECTIONGENERATOR"; then + if test -n "$QTCHOOSER"; then +- QCOLLECTIONGENERATORFLAGS="-qt$qt_version" ++ QCOLLECTIONGENERATORFLAGS="-qt=qt$qt_version" + fi + QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE qcollectiongenerator" + else +@@ -71746,7 +71734,7 @@ + + if test -n "$QHELPGENERATOR"; then + if test -n "$QTCHOOSER"; then +- QHELPGENERATORFLAGS="-qt$qt_version" ++ QHELPGENERATORFLAGS="-qt=qt$qt_version" + fi + QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE qhelpgenerator" + else +@@ -73640,7 +73628,7 @@ warn_osmesa="OSMesa library not found. Offscreen rendering with FLTK will be disabled." fi @@ -283,7 +301,7 @@ save_CPPFLAGS="$CPPFLAGS" save_LDFLAGS="$LDFLAGS" save_LIBS="$LIBS" -@@ -75018,7 +75006,7 @@ fi +@@ -75018,7 +75006,7 @@ ;; yes | "") ac_octave_cholmod_pkg_check=yes @@ -292,7 +310,7 @@ ;; -* | */* | *.a | *.so | *.so.* | *.o) CHOLMOD_LIBS="$with_cholmod" -@@ -75598,7 +75586,7 @@ fi +@@ -75598,7 +75586,7 @@ ;; yes | "") ac_octave_umfpack_pkg_check=yes @@ -301,7 +319,7 @@ ;; -* | */* | *.a | *.so | *.so.* | *.o) UMFPACK_LIBS="$with_umfpack" -@@ -77450,6 +77438,13 @@ $as_echo_n "checking for include file