Currently, the NSS build configuration for AIX is spread across several files, with several duplicated settings. I would like to merge the common settings into AIX.mk, using the AIX`uname -v`.`uname-r`.mk files for specific settings needed for particular AIX releases.
Created attachment 139142 [details] [diff] [review] Patch v1 - Moves common settings into AIX.mk. - Removes obsolete EXPORT_RULES variable from AIX.mk (not used anywhere in tree). - Removes -DAIX4_2 from AIX4.2.mk. We don't even support AIX 4.2 anymore, but this define is not used anywhere in the security code so there is no need to have this. - Removes -DAIX4_3 from AIX4.3.mk since it is unused.
Philip, I encourage you to go a step further and move everything into AIX.mk, eliminating the need for the AIX`uname -v`.`uname-r`.mk files. Then, add AIX to the TARGET_OSES list at line 61 of security/coreconf/config.mk.
Created attachment 139425 [details] [diff] [review] Patch v2 - Removes all AIX version specific files. - Removes support for AIX 3 and AIX 4 (< 4.3). These required special configuration, but they are no longer supported platforms and no one is building on them. - Cleans up whitespace.
Created attachment 139996 [details] [diff] [review] Patch v3 Same patch as before but adds -bnortllib to DSO_LDOPTS.
Comment on attachment 139996 [details] [diff] [review] Patch v3 r=wtc. Philip, I will make the following two changes before checking this in. Please let me know if you think that's OK. In security/coreconf/AIX.mk >+OS_LIBS = -blibpath:/usr/lib:/lib -lc -lm I want to use "+=" instead of "=". >+MKSHLIB = $(LD) $(DSO_LDOPTS) $(OS_LIBS) I want to change "$(OS_LIBS)" to "-blibpath:/usr/lib:/lib -lc -lm". The purpose of these two changes is to match exactly the original AIX4.3.mk, AIX5.1.mk, and AIX5.2.mk files.
Attachment #139996 - Flags: review?(wchang0222) → review+
Created attachment 140023 [details] [diff] [review] Patch v4 Philip, this is your patch v3 with my proposed changes.
Comment on attachment 140023 [details] [diff] [review] Patch v4 This looks fine. I would've preferred to only have the blibpath and math/c libraries in one location in the file, but this is still an improvement over the existing setup.
Attachment #140023 - Flags: review+
Patch v4 checked into the NSS tip (NSS 3.10), NSS_3_9_BRANCH (NSS 3.9.1), and NSS_CLIENT_TAG (Mozilla 1.7a).
Status: NEW → RESOLVED
Last Resolved: 14 years ago
Resolution: --- → FIXED
Target Milestone: --- → 3.9.1
You need to log in before you can comment on or make changes to this bug.