62857 - LDAP build for OS/2

Status: RESOLVED FIXED

(Directory Graveyard :: LDAP C SDK, defect, P3)

Description

[jhp (no longer active)]

This bug is for file changes necessary to get LDAP building under 
OS/2.

Comment 1

[jhp (no longer active)]

Attachment: OS/2 patch for ldap files

Comment 2

[Mark Smith [:mcs]]

Reassigning to Michael Hein so he can review the proposed patch.

Comment 3

[jhp (no longer active)]

Attachment: latest patch file for OS/2

Comment 4

[Dmitry Kubov]

Some ifdefs must be changed for EMX too, not only VACPP

Comment 5

[Dan Mosedale (:dmosedale, :dmose)]

These patches are for the 4.0 branch of the SDK, and are needed for
--enable-ldap to work properly on OS/2.  Taking so that I can land turn on
--enable-ldap by default soon.  Dmitry, do you have other EMX patches ready? 
Otherwise I'd like to check this in as is.

Comment 6

[Dmitry Kubov]

Can you checkin your patches? Default EMX build can't be be broken until LDAP is
optional. I'll patch it later or send me patched files (dunno how to apply diffs
w/o CVS stuffs).

Comment 7

[Dmitry Kubov]

At least this can be changed now:
XP_OS2_VACPP -> XP_OS2
ifeq ($(MOZ_OS2_TOOLS),VACPP) -> ifeq ($(OS_ARCH),OS2)

Comment 8

[jhp (no longer active)]

Attachment: updated patch (cleanup)

Comment 9

[jhp (no longer active)]

I cleaned up the patch to work with latest code, but I have a few 
questions with some of the files:

autoconf.mk.in:
Should I explicitly set those values (BIN_SUFFIX and LINK) in the file 
like that, or should they be defined in configure.in and AC_SUBST'd 
into autoconf.mk?

liblber/Makefile.in &
libldap/Makefile.in:
What do you think of my changes here (in regards to SRCS->CSRCS and 
the OS/2 "install::" target)?  Are these correct?  Should we not be 
taking advantage of what NSPR has already defined in its rules.mk?

Comment 10

[Dan Mosedale (:dmosedale, :dmose)]

Not long after 0.9, we'll be moving to the v5.0 version of the LDAP SDK, which
comes with a new build system, so the current build system will be going away. 
So I'd suggest making as few changes as possible to this one, since we know it
more-or-less works as is.  With that in mind:

* autoconf.mk.in: moving this stuff to configure.in seems like more effort than
it's worth

* Makefile.ins: in theory those changes may be the Right Thing, but since we
know the existing rules (especially wrt to the SRCS/CSRCS/REALOBJS/OBJS stuff),
I'd vote for not changing this stuff either.

Comment 11

[Dmitry Kubov]

One more patch for EMX:
mozilla/directory/c-sdk/ldap/include/ldap.h

+#ifdef XP_OS2
+#include <sys/select.h>
+#endif
+#ifdef XP_OS2_EMX
+/*
+ * EMX-specific tweaks:
+ *    o Use stricmp instead of strcmpi.
+ */
+#define strcmpi stricmp
+#endif

After that LDAP can be built. Need more time to test is it working.

Comment 12

[Dmitry Kubov]

Attachment: Full diffs including EMX patch

Comment 13

[jhp (no longer active)]

Attachment: updated patch re: dan's comments

Comment 14

[jhp (no longer active)]

Well, in accordance to dan's comments, I have put back the 
REALOBJS/OBJS rules and just hacked the Makefiles to work under OS/2.  
Let me know what you think of this.  The above patch also includes 
dmitry's changes.

Comment 15

[Mike Kaply [:mkaply]]

r=mkaply

We'll keep a close eye on this when it goes in.

Comment 16

[cls]

sr=cls

Comment 17

[Dan Mosedale (:dmosedale, :dmose)]

Patch checked in.

Comment 18

[jhp (no longer active)]

VERIFIED

Comment 19

[Dan Mosedale (:dmosedale, :dmose)]

Reopening; need to check in the ldapcsdk_branch_50 so that mozilla doesn't
regress when we switch to that branch.

Comment 20

[Dan Mosedale (:dmosedale, :dmose)]

Attachment: Forward-port of code changes to ldapcsdk_branch_50, v1.

I've just attached a forward port of the code changes to the
ldapcsdk_branch_50.  The build system changes will need to be redone, as the
buildsystem has seen significant changes since the 4.0 SDK. mcs/mhein, can I
get a review on this?

Comment 21

[Dan Mosedale (:dmosedale, :dmose)]

Comment on attachment 71004 [details] [diff] [review]
Forward-port of code changes to ldapcsdk_branch_50, v1.

Bogus patch includes lots of irrelevant changes.  New patch soon.

Comment 22

[Dan Mosedale (:dmosedale, :dmose)]

Attachment: ldapcsdk_branch_50 corrected patch

OK, this is better. mcs/mhein: now I'm requesting a review for real.  :-)

Comment 23

[scottputterman]

adding nsbeta1+ since needed for merge from the LDAP C SDK v4.0

Comment 24

[Mark Smith [:mcs]]

Looks okay (I don't think it will break any non-OS2 builds anyway). r=mcs

Comment 25

[Dan Mosedale (:dmosedale, :dmose)]

Fix checked in to ldapcsdk_branch_50.