make openssl universal_archs-aware

[jmroot (Joshua Root)]

The attached patch makes openssl respect the universal_archs variable if it is set. There is still one major issue when building for both 32- and 64-bit: there will be differences in the opensslconf.h that is generated. It should be possible to merge them with the addition of appropriate #ifdefs, but I'm not sure how best to go about doing that.

[jmroot (Joshua Root)]

Updated to apply an appropriate patch to each copy of opensslconf.h in order to make them identical yet still correct on each arch. This seems to work OK, and should continue to do so as long as opensslconf.h doesn't change too much.

[ryandesign (Ryan Carsten Schmidt)]

This looks good, except that it doesn't work on MacPorts 1.6.0 (says Error: Target org.macports.patch returned: can't read "universal_archs": no such variable), and the patch uses inconsistent whitespace for indentation.

I'll attach a revised patch which:

• uses consistent tab indentation to match the portfile
• sets universal_archs outside of the universal variant so it's set when the other phases come around
• uses curly braces around all variable references
• abstracts out the one change in the three ./Configure invocations into a new variable ${my_cc} and calls ./Configure in just one place

Problems that still remain:

• the part that searches for differences between files assumes "i386" is among the requested architectures (not necessarily so if the user modified universal_archs)
• the part that searches for differences between files checks for differences between "i386" and "i386" which it needn't do

The ${first_arch} code in the cairo port's universal variant may be helpful. (Note that the cairo port's universal variant is not working in cairo 1.6.4, but the mechanism is sound since it did work in 1.4.14. See #15451.)

[jmroot (Joshua Root)]

Updated for openssl 0.9.8h. (I was in the middle of doing this when you posted you comment, Ryan, but it looks like you have some other fixes as well.)

[jmroot (Joshua Root)]

I also fixed the indentation and the location of the universal_archs definition, BTW.

[ryandesign (Ryan Carsten Schmidt)]

Improvements in my second patch (w.r.t. my first patch):

• uses --no-backup-if-mismatch on the patch command, because jmr's new patch does (why?)
• borrows the ${first_arch} code from the cairo port
  • saves a copy during the post-patch phase
  • saves a diff during the diff phase
  • diffs correctly even if the user did not request the i386 arch

Problems remaining: the patch fails when I request all four architectures?

Error: Target org.macports.destroot returned: shell command "cd /opt/local/var/macports/build/_Users_rschmidt_macports_dports_devel_openssl/work/pre-dest/ppc64/opt/local && patch --no-backup-if-mismatch -p0 < /Users/rschmidt/macports/dports/devel/openssl/files/patch-opensslconf.h-64.diff" returned error 1
Command output: patching file include/openssl/opensslconf.h
Hunk #1 FAILED at 134.
Hunk #3 FAILED at 180.
2 out of 3 hunks FAILED -- saving rejects to file include/openssl/opensslconf.h.rej

[jmroot (Joshua Root)]

Replying to ryandesign@macports.org:

• uses --no-backup-if-mismatch on the patch command, because jmr's new patch does (why?)

After updating to 0.9.8h, the patches were applying cleanly but with a few lines' offset. Patch defaults to creating a .orig in this case, which of course is different for each arch and causes the merge to fail.

Not sure what's going on with ppc64.

[ryandesign (Ryan Carsten Schmidt)]

Gotcha (re: --no-backup-if-mismatch)

I'm attaching the four opensslconf.h files. Looks like there are three versions: one for ppc and i386, one for ppc64, and one for x86_64.

[jmroot (Joshua Root)]

Updated patches attached. Now works with ppc64.

[jmroot (Joshua Root)]

Committed in r41928 (maintainer timeout).

[(none)]

Milestone Port Enhancements deleted