From a1b70efd48ce85dbd65388fa7c397b5380c1224f Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Thu, 8 Mar 2018 11:11:37 +0100 Subject: openldap in stage3 works --- build_stage3.sh | 6 ++---- i486-stage3/openldap/DESCR | 6 ++++++ 2 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 i486-stage3/openldap/DESCR diff --git a/build_stage3.sh b/build_stage3.sh index 7e45b65..7107510 100755 --- a/build_stage3.sh +++ b/build_stage3.sh @@ -52,6 +52,7 @@ sysfsutils iputils vi which xfsprogs +openldap " #~ iptables iproute2 @@ -69,11 +70,8 @@ xfsprogs #~ gdb: python guile2.0 # wait for posix threads, gcc toolchain rebuild +# HERE TODO: libraries must be installed before the server overlays, why are they not? # openldap: -#/usr/lib/gcc/i486-pc-linux-gnu/7.3.0/ld: cannot find -lldap_r -#collect2: error: ld returned 1 exit status -#libtool: install: error: relink `accesslog.la' with the above command before installing it -#make[2]: Leaving directory '/build/openldap/src/openldap-2.4.45/servers/slapd/overlays' # building toolchain (gcc): again, lobtool problems #/usr/lib/gcc/i486-pc-linux-gnu/7.3.0/ld: cannot find -lquadmath diff --git a/i486-stage3/openldap/DESCR b/i486-stage3/openldap/DESCR new file mode 100644 index 0000000..bbf06e2 --- /dev/null +++ b/i486-stage3/openldap/DESCR @@ -0,0 +1,6 @@ +# FS#57749: relink against missing libraries in split package +sed -i 's/for dir in clients servers/for dir in libraries clients servers/' PKGBUILD +sed -i '/usr\/share\/man\/man5\/slapo-lastbind.5/ a rm -rf ${pkgdir}/usr/{lib,include,man3}' PKGBUILD + +# we actually need only libldap, but installing openldap doesn't harm us +ADDITIONAL_INSTALL_PACKAGE=libldap -- cgit v1.2.3-54-g00ecf