https://bugs.openldap.org/show_bug.cgi?id=9235
Bug ID: 9235 Summary: Stop building libldap Product: OpenLDAP Version: 2.5 Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: --- Component: libraries Assignee: bugs@openldap.org Reporter: quanah@openldap.org Target Milestone: ---
For 2.5+, we will no longer build libldap, only libldap_r
Source should remain in the tree
https://bugs.openldap.org/show_bug.cgi?id=9235
Quanah Gibson-Mount quanah@openldap.org changed:
What |Removed |Added ---------------------------------------------------------------------------- Keywords| |OL_2_5_REQ Target Milestone|--- |2.5.0
https://bugs.openldap.org/show_bug.cgi?id=9235
Quanah Gibson-Mount quanah@openldap.org changed:
What |Removed |Added ---------------------------------------------------------------------------- Ever confirmed|0 |1 Assignee|bugs@openldap.org |quanah@openldap.org Status|UNCONFIRMED |IN_PROGRESS
https://bugs.openldap.org/show_bug.cgi?id=9235
--- Comment #1 from Quanah Gibson-Mount quanah@openldap.org --- Discussed with Howard.
For 2.5:
a: The files in libldap_r/ get moved into libldap/ b: We keep thr_stub.c c: It should be possible to build non-threaded libldap IF slapd is disabled, otherwise, we require threaded libldap
Resulting in: libldap just contains everything, compiles with -DLDAP_R_COMPILE
https://bugs.openldap.org/show_bug.cgi?id=9235
Quanah Gibson-Mount quanah@openldap.org changed:
What |Removed |Added ---------------------------------------------------------------------------- Summary|Stop building libldap |Merge libldap_r into | |libldap
https://bugs.openldap.org/show_bug.cgi?id=9235
--- Comment #2 from Quanah Gibson-Mount quanah@openldap.org --- Since we still allow non-threaded libldap as long as slapd is disabled, then we need to disable librewerite for that scenario.
The files added to the libldap/ dir from the old libldap_r need to be entirely wrapped in #ifdef LDAP_R_COMPILE
and we need to conditionally set LDAP_R_COMPILE
https://bugs.openldap.org/show_bug.cgi?id=9235
--- Comment #3 from Ryan Tandy ryan@openldap.org --- FTR I've been working on these last items and I'm quite close to posting a PR.
WIP branch is https://git.openldap.org/ryan/openldap/-/commits/its9235 - I can put it up as a WIP: MR if that would be useful.
https://bugs.openldap.org/show_bug.cgi?id=9235
Ryan Tandy ryan@openldap.org changed:
What |Removed |Added ---------------------------------------------------------------------------- Status|IN_PROGRESS |RESOLVED Resolution|--- |TEST
https://bugs.openldap.org/show_bug.cgi?id=9235
Quanah Gibson-Mount quanah@openldap.org changed:
What |Removed |Added ---------------------------------------------------------------------------- Keywords|OL_2_5_REQ |
https://bugs.openldap.org/show_bug.cgi?id=9235
--- Comment #4 from Quanah Gibson-Mount quanah@openldap.org --- Commits: • c06ac436 by Quanah Gibson-Mount at 2020-07-03T17:23:14-07:00 ITS#9235 Merge libldap_r into libldap
• a5c0b593 by Ryan Tandy at 2020-07-03T17:23:14-07:00 ITS#9235 Define LDAP_R_COMPILE iff building with threads
• a10210db by Ryan Tandy at 2020-07-03T17:23:14-07:00 ITS#9235 Only compile libldap_r sources when LDAP_R_COMPILE
• c4b6aad6 by Ryan Tandy at 2020-07-03T17:23:14-07:00 ITS#9235 Link test progs with thread libs
• 1f39b05f by Ryan Tandy at 2020-07-03T17:23:14-07:00 ITS#9235 Fix librewrite compile without threads
• a5414507 by Ryan Tandy at 2020-07-03T17:24:16-07:00 ITS#9235 Add CI build without threads
• a4474d35 by Ryan Tandy at 2020-07-03T17:24:16-07:00 ITS#9235 Delete LDAP_THREAD_SAFE
• a95e65d0 by Ryan Tandy at 2020-07-03T17:24:16-07:00 ITS#9235 Update comments referring to libldap_r
• fab49ef4 by Ryan Tandy at 2020-07-03T17:24:16-07:00 ITS#9235 Restore LDAP_API_FEATURE_X_OPENLDAP_REENTRANT
• e2a7ad39 by Ryan Tandy at 2020-07-04T00:38:36+00:00 ITS#9235 Disable slapd-mtread when NO_THREADS
https://bugs.openldap.org/show_bug.cgi?id=9235
--- Comment #5 from Michael Ströder michael@stroeder.com --- Was this already tested with contrib overlays?
My RE25 build fails like this:
make: Entering directory '/home/michael/src/openldap-git/re25/openldap/contrib/slapd-modules/allowed' ../../../libtool --mode=compile gcc -g -O2 -Wall -DSLAPD_OVER_ALLOWED=SLAPD_MOD_DYNAMIC -I../../../include -I../../../include -I../../../servers/slapd -c allowed.c libtool: compile: gcc -g -O2 -Wall -DSLAPD_OVER_ALLOWED=SLAPD_MOD_DYNAMIC -I../../../include -I../../../include -I../../../servers/slapd -c allowed.c -fPIC -DPIC -o .libs/allowed.o allowed.c: In function ‘aa_operational’: allowed.c:349:30: warning: ‘i’ may be used uninitialized in this function [-Wmaybe-uninitialized] 349 | bv_allowed = ch_calloc( i + 1, sizeof( struct berval ) ); | ~~^~~ libtool: compile: gcc -g -O2 -Wall -DSLAPD_OVER_ALLOWED=SLAPD_MOD_DYNAMIC -I../../../include -I../../../include -I../../../servers/slapd -c allowed.c -o allowed.o >/dev/null 2>&1 ../../../libtool --mode=link gcc -g -O2 -Wall -version-info 0:0:0 \ -rpath /opt/openldap-RE25/lib64/openldap -module -o allowed.la allowed.lo ../../../libraries/libldap/libldap.la ../../../libraries/liblber/liblber.la libtool: error: cannot find the library '../../../libraries/libldap/libldap.la' or unhandled argument '../../../libraries/libldap/libldap.la' make: *** [Makefile:47: allowed.la] Error 1
https://bugs.openldap.org/show_bug.cgi?id=9235
--- Comment #6 from Ryan Tandy ryan@openldap.org --- (In reply to Michael Ströder from comment #5)
Was this already tested with contrib overlays?
They were working at one point... thanks for reporting that. I'll look into it.
https://bugs.openldap.org/show_bug.cgi?id=9235
--- Comment #7 from Ryan Tandy ryan@openldap.org --- allowed works for me in master and RE25. Are you doing an out-of-tree build or anything like that? The path to libldap shouldn't have changed...
https://bugs.openldap.org/show_bug.cgi?id=9235
Quanah Gibson-Mount quanah@openldap.org changed:
What |Removed |Added ---------------------------------------------------------------------------- Status|RESOLVED |VERIFIED Resolution|TEST |FIXED
-
openldap-its＠openldap.org