Bug 215996
| Summary: | [exp-run] Move inclusion of bsd.default-versions.mk to options section | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Tijl Coosemans <tijl> | ||||||||||
| Component: | Ports Framework | Assignee: | Tijl Coosemans <tijl> | ||||||||||
| Status: | Closed FIXED | ||||||||||||
| Severity: | Affects Only Me | CC: | bhughes, ports-bugs, sunpoet | ||||||||||
| Priority: | --- | Keywords: | patch | ||||||||||
| Version: | Latest | ||||||||||||
| Hardware: | Any | ||||||||||||
| OS: | Any | ||||||||||||
| Attachments: |
|
||||||||||||
No, see the review and or PR for why it is put where it is and not earlier like I first wanted to do. (In reply to Mathieu Arnold from comment #1) But you still think it would be better if bsd.default-version.mk was included in the options section of bsd.port.mk, right? Now that FreeBSD 9 is EoL it's time to remove WITH_OPENSSL_PORT from port Makefiles. The patch does something else by the way. It moves the .endif from the options section down a bit. Currently there's some code between the options section and the pre-makefile section that gets executed on every include of bsd.port.*mk (this includes parsing bsd.options.mk multiple times). This should probably be committed even without the bsd.default-version.mk change. Created attachment 178866 [details] patch2 The patch now removes WITH_OPENSSL_PORT from all ports as well. After this we can work on bug 213811 (Set SSL_DEFAULT=openssl). Reopen to request exp-run. Can you refresh the patch? Created attachment 179252 [details]
patch3
Updated patch.
(the original idea will not solve ftp/curl's problem, it should be fixed to not chose the default options depending on the default ssl version, like always GSSAPI_BASE, and tell people using openssl from ports to change the options.) Oh, we can use :? now that 9 is out, forgot about it. New failures on 10.3 i386:
+ {"origin"=>"devel/efl", "phase"=>"configure", "errortype"=>"configure_error"}
+ {"origin"=>"sysutils/ori", "phase"=>"build", "errortype"=>"linker_error"}
17 skipped due to efl
Failure logs:
http://package22.nyi.freebsd.org/data/103i386-default-PR215996/2017-01-25_17h24m36s/logs/errors/efl-1.18.4_2.log
http://package22.nyi.freebsd.org/data/103i386-default-PR215996/2017-01-25_17h24m36s/logs/errors/ori-0.8.1_5.log
On 11.0 amd64 the 2 new failures are the same http://package23.nyi.freebsd.org/data/110amd64-default-PR215996/2017-01-26_06h21m15s/logs/errors/efl-1.18.4_2.log http://package23.nyi.freebsd.org/data/110amd64-default-PR215996/2017-01-26_06h21m15s/logs/errors/ori-0.8.1_5.log Created attachment 179498 [details]
patch4
Fix efl and ori.
Exp-run looks fine. A commit references this bug: Author: tijl Date: Sun Feb 5 21:20:27 UTC 2017 New revision: 433456 URL: https://svnweb.freebsd.org/changeset/ports/433456 Log: - Remove inclusion of bsd.default-versions.mk from ftp/curl/Makefile so bsd.default-versions.mk can rely on ARCH being defined. - In bsd.port.mk move inclusion of bsd.default-versions.mk from the pre-makefile section to the options section so the variables can be used earlier. Also put the bit of code sitting between the options section and the pre-makefile section into the options section. - Remove last few cases where ports set WITH_OPENSSL_PORT. This variable is handled in bsd.default-versions.mk and some ports were setting it after including bsd.port.options.mk. After FreeBSD 9 EoL all but a few ports, and then only when setting non-default options, work without setting that variable. PR: 215996 Exp-run by: antoine Approved by: portmgr (antoine) Changes: head/Mk/bsd.default-versions.mk head/Mk/bsd.port.mk head/Tools/scripts/chkversion.pl head/benchmarks/wrk/Makefile head/databases/mariadb100-client/files/patch-cmake_ssl.cmake head/databases/mariadb100-server/Makefile head/databases/mariadb100-server/files/patch-cmake_ssl.cmake head/deskutils/owncloudclient/Makefile head/devel/efl/Makefile head/devel/efl/files/extra-patch-configure.ac head/devel/efl/files/patch-configure.ac head/devel/efl/files/patch-m4_efl.m4 head/dns/knot1/Makefile head/dns/validns/Makefile head/ftp/curl/Makefile head/irc/irssi-fish/Makefile head/net/freeradius2/Makefile head/net/freeradius3/Makefile head/net-im/jabberd/Makefile head/net-mgmt/virt-viewer/Makefile head/security/opencryptoki/Makefile head/security/softhsm2/Makefile head/sysutils/ori/Makefile head/sysutils/ori/files/ head/sysutils/ori/files/patch-SConstruct head/sysutils/syslog-ng36/Makefile head/www/mod_tsa/Makefile head/www/nginx/Makefile head/www/nginx-devel/Makefile head/www/node/Makefile head/www/node4/Makefile head/www/node6/Makefile This patch changed the default build options for www/node4, www/node6, and www/node without so much as a headsup or UPDATING entry. Any particular reason why these were changed? I am the maintainer for these ports, which is why I asked :) It needs openssl 1.0.2 and FreeBSD 10 only has 1.0.1. This is only temporary. The next step is to let ports use ports openssl by default instead of the base system openssl.
If you want you could limit the change to just FreeBSD 10 using something like this:
OPTIONS_DEFAULT_FreeBSD_10=BUNDLED_SSL
OPTIONS_DEFAULT=${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}}
Yes, indeed, I had worked quite a bit with the build toggles when I changed the default build to use a shared openssl. It was by accident that I noticed the default changed back to the bundled one. The node.js project recently introduce the ability to use an external CA store in v7.5.0, and I would really like to change www/node to use ca_root_nss instead of a hardcoded CA store built into the node.js binary. Thanks for the feedback, I will submit some PRs to keep node.js building with a shared openssl at least on 11.x. I was thinking about doing what you suggested, too, changing the default for FreeBSD 10.x to use BUNDLED_SSL until the default for ports changes. Thanks for the feedback :) |
Created attachment 178791 [details] patch Move inclusion of bsd.default-versions.mk from pre-makefile section to options section in bsd.port.mk so ftp/curl/Makefile no longer has to include it and bsd.default-versions.mk can expect ARCH to be defined.