Fix SO_VERSION expansion on OpenBSD

RESOLVED FIXED in mozilla6

Status

()

Core
Build Config
RESOLVED FIXED
6 years ago
6 years ago

People

(Reporter: gaston, Assigned: gaston)

Tracking

unspecified
mozilla6
All
OpenBSD
Points:
---

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(2 attachments, 1 obsolete attachment)

(Assignee)

Description

6 years ago
Created attachment 527373 [details] [diff] [review]
Use a shell test to set DLL_SUFFIX depending on SO_VERSION in env

Followup to https://bugzilla.mozilla.org/show_bug.cgi?id=648721, esp http://hg.mozilla.org/projects/cedar/rev/ea5232835539.

As of now, with expandlib_config.py, DLL_SUFFIX is set to normalize_suffix(".so.$(if $(SO_VERSION),$(SO_VERSION),1.0)"), which confuses it (it tries to link libxul.so with libmozalloc.a & libmozsqlite3.a, which don't exist).

The previous hack doesn't work for that case, so let's use a plain shell if in the configure.in block. Tested with SO_VERSION set to nothing, foo.bar and 23.0, for each of them DLL_SUFFIX is correctly set in mozilla-config.h/expandlib_config.py, and defaults to .so.1.0 if SO_VERSION is not set.
(Assignee)

Updated

6 years ago
Blocks: 650665
(Assignee)

Updated

6 years ago
Attachment #527373 - Flags: review?(mh+mozilla)
Attachment #527373 - Attachment is patch: true
Attachment #527373 - Attachment mime type: application/octet-stream → text/plain
Comment on attachment 527373 [details] [diff] [review]
Use a shell test to set DLL_SUFFIX depending on SO_VERSION in env

>+    if test $SO_VERSION ; then

Just a nit: for consistency, make that:
  if test "$SO_VERSION"; then

A small note about the patch itself, since you bothered creating an hg patch with a commit message, please put the bug number in the summary line, and make it concise so that it fits on one short line (for some value of short), though you can expand your thoughts on the following lines (though I don't know if it's better to leave an empty line between both, like with git, but then most people don't add notes after the summary).
Attachment #527373 - Flags: review?(mh+mozilla) → review+
(Assignee)

Comment 2

6 years ago
Created attachment 527389 [details] [diff] [review]
Use a shell test to set DLL_SUFFIX depending on SO_VERSION in env

New version with better commit message, and quote SO_VERSION.

I'm somewhat getting used to hg queues... and m-c builds and runs fine on OpenBSD with only 9 patches!
Assignee: nobody → landry
Attachment #527373 - Attachment is obsolete: true
Attachment #527389 - Flags: review?(mh+mozilla)
Comment on attachment 527389 [details] [diff] [review]
Use a shell test to set DLL_SUFFIX depending on SO_VERSION in env

>+    if test "$SO_VERSION" ; then

without the space before the semi-colon and we're good. Thanks
Attachment #527389 - Flags: review?(mh+mozilla) → review+
(Assignee)

Comment 4

6 years ago
Created attachment 527394 [details] [diff] [review]
Use shell frag to test SO_VERSION
Attachment #527394 - Flags: review?(mh+mozilla)
Attachment #527394 - Flags: review?(mh+mozilla) → review+
http://hg.mozilla.org/mozilla-central/rev/a7ef81a75db7
Status: NEW → RESOLVED
Last Resolved: 6 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla6
You need to log in before you can comment on or make changes to this bug.