54225 - Fix nsprpub/rules.mk and os2.mk to buil dldap.

Status: VERIFIED FIXED

(NSPR :: NSPR, defect, P3)

Description

[Huynh Trinh]

Currently ldap depends on nsprpub/rules.mk which form a .def filename 
based on .dll filename. As a result we end up with xxx.dll.def on an 
OS/2 build. This fix defines DEF_FILE in rules.mk so that we can build 
ldap.
Furthermore we define a BIN_SUFFIX in os2.mk.

Comment 1

[Huynh Trinh]

Attachment: Batch01 - Fix for nsprpub/config/os2.mk and rules.mk

Comment 2

[Mike Kaply [:mkaply]]

This should be in NSPR.

We would need this change on the client branch of NSPR.

Comment 3

[Wan-Teh Chang]

Why do you need to add this rule to mozilla/nsprpub/config/rules.mk?
+ifeq ($(OS_ARCH), OS2)
+%.o: %.c
+       @$(MAKE_OBJDIR)
+ifeq ($(MOZ_OS2_TOOLS),VACPP)
+       $(CCC) -Fo$@ -c $(CCCFLAGS) $<
+else
+       $(CCC) -o $@ -c $(CCCFLAGS) $<
+endif
+endif

Comment 4

[Wan-Teh Chang]

What does nsprpub/rules.mk have to do with ldap?

Why do you need to define LINK_EXE and BIN_SUFFIX
in nsprpub/config/OS2.mk?

Comment 5

[Huynh Trinh]

WanTeh;

- ldap/build/Makefile refer to NSPR_TREE/config/rules.mk, which for 
OS2 build is nsprpub/config/rules.mk.
- The BIN_SUFFIX defaults to a null value but for OS2 we need .exe in 
os2.mk
- I originally need LINK_EXE per ldap/build/Makefile but subsequenly 
no longer need it.
We can withdraw LINK_EXE or leave it in OS2.mk without much harm.
- %o : %c rule is needed in nsprpub/config/rules.mk for OS2 for 
compile.

Comment 6

[Wan-Teh Chang]

> - ldap/build/Makefile refer to NSPR_TREE/config/rules.mk, which for 
> OS2 build is nsprpub/config/rules.mk.

I see.  Do you know who owns ldap/build/Makefile?
mozilla/nsprpub/config/rules.mk is only for NSPR
internal use.  It is wrong for ldap to refer to
this NSPR internal file.  I will not change
mozilla/nsprpub/config/rules.mk for ldap to build.

Can you build NSPR on OS/2 without these changes?
Are these changes only for building ldap?

Comment 7

[Wan-Teh Chang]

> - %o : %c rule is needed in nsprpub/config/rules.mk
> for OS2 for compile.

I don't think NSPR needs this rule.  Is this for ldap
to compile on OS2?

Comment 8

[Mike Kaply [:mkaply]]

Mr. Mosedale.

Could you take a look at the comments from wtc regarding LDAP depending on the 
NSPR rules.mk?

Comment 9

[Dan Mosedale (:dmosedale, :dmose)]

Reassigning to [e-mail], who owns the LDAP C SDK.  I think the
dependency is a result of history (ie it's been that way for a long long time).
Perhaps Michael can speak to the where the LDAP C SDK build system will/should go...

Comment 10

[Huynh Trinh]

Strictly speaking, to build OS/2 NSPR and mozilla client, we do not 
need the proposed rule changes. But to build LDAP, we do need the 
change to build for OS/2, that is why I was careful to enclosed it in 
an OS2 specific block. Another posibility is for LDAP to have its own 
rules.mk and reduces its dependency on NSPR.

Comment 11

[Wan-Teh Chang]

Huynh: LDAP must have its own rules.mk.  I will not
change NSPR's makefiles so that LDAP can build.  I
am sorry that this will likely make your job harder...

Do you still want me to check in the DEF_FILE related
changes to mozilla/nsprpub/config/rules.mk?  Those
are independent of LDAP and look fine to me.

Comment 12

[Huynh Trinh]

Wan-Teh;
Yes, please check in the DEF_FILE changes. 
I may have to code the rules in the LDAP makefile. Thanks. Huynh

Comment 13

[Mike Kaply [:mkaply]]

OK, this one is done.

Comment 14

[Mike Kaply [:mkaply]]

We've been building LDAP for a while now.

Marking verified.