From: Howard Chu Date: Sun, 7 Aug 2022 01:42:33 +0000 (+0100) Subject: ITS#9894 don't use gmake-specific features X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aef1c0508973902f39b934cfb5565cc722cfe845;p=thirdparty%2Fopenldap.git ITS#9894 don't use gmake-specific features --- diff --git a/configure.ac b/configure.ac index c9c2978449..9732b830aa 100644 --- a/configure.ac +++ b/configure.ac @@ -569,7 +569,6 @@ CLIENT_LIBS= SLAPD_LIBS= BALANCER_LIBS= -BALANCER_INCLUDE= BUILD_SLAPD=no BUILD_BALANCER=no @@ -3062,11 +3061,11 @@ if test "$ol_enable_balancer" != no \ -a "$ol_with_threads" != no \ -a "$have_libevent" = yes ; then if test "$ol_enable_balancer" = mod; then - BALANCER_INCLUDE=Makefile.module BUILD_BALANCER=mod + BALANCER_MAKE="servers/lloadd/Makefile_module.in:build/mod.mk" else - BALANCER_INCLUDE=Makefile.server BUILD_BALANCER=yes + BALANCER_MAKE="servers/lloadd/Makefile_server.in:build/srv.mk" fi fi @@ -3077,6 +3076,7 @@ if test "$ol_enable_slapi" != no ; then fi OL_VERSIONED_SYMBOLS="" +DO_VERSIONED_SYMBOLS="# " if test $ol_enable_versioning != no; then LDVS=`$LD --help < /dev/null 2>/dev/null | grep gnu-version-script` if test -z "$LDVS"; then @@ -3091,6 +3091,9 @@ if test $ol_enable_versioning != no; then else OL_VERSIONED_SYMBOLS="-z gnu-version-script=" fi + if test -n "$OL_VERSIONED_SYMBOLS"; then + DO_VERSIONED_SYMBOLS="" + fi fi dnl ---------------------------------------------------------------- @@ -3125,6 +3128,7 @@ AC_SUBST(WITH_SYSTEMD) AC_SUBST(BUILD_THREAD) AC_SUBST(BUILD_LIBS_DYNAMIC) AC_SUBST(OL_VERSIONED_SYMBOLS) +AC_SUBST(DO_VERSIONED_SYMBOLS) AC_SUBST(BUILD_SLAPD) dnl slapi @@ -3223,8 +3227,6 @@ AC_SUBST(SLAPD_SQL_INCLUDES) AC_SUBST(WT_CFLAGS) AC_SUBST(WT_LIBS) -AC_SUBST(BALANCER_INCLUDE) - dnl ---------------------------------------------------------------- dnl final help output AC_ARG_WITH(xxinstall,[ @@ -3271,9 +3273,7 @@ AC_CONFIG_FILES([Makefile:build/top.mk:Makefile.in:build/dir.mk] [servers/slapd/slapi/Makefile:build/top.mk:servers/slapd/slapi/Makefile.in:build/lib.mk:build/lib-shared.mk] [servers/slapd/overlays/Makefile:build/top.mk:servers/slapd/overlays/Makefile.in:build/lib.mk] [servers/slapd/pwmods/Makefile:build/top.mk:servers/slapd/pwmods/Makefile.in:build/lib.mk] -[servers/lloadd/Makefile:build/top.mk:servers/lloadd/Makefile.in] -[servers/lloadd/Makefile.server:servers/lloadd/Makefile_server.in:build/srv.mk] -[servers/lloadd/Makefile.module:servers/lloadd/Makefile_module.in:build/mod.mk] +[servers/lloadd/Makefile:build/top.mk:servers/lloadd/Makefile.in:$BALANCER_MAKE] [tests/Makefile:build/top.mk:tests/Makefile.in:build/dir.mk] [tests/run] [tests/modules/Makefile:build/top.mk:tests/modules/Makefile.in:build/dir.mk] diff --git a/libraries/liblber/Makefile.in b/libraries/liblber/Makefile.in index 4e34558daf..54369789ba 100644 --- a/libraries/liblber/Makefile.in +++ b/libraries/liblber/Makefile.in @@ -38,9 +38,7 @@ XLIBS = $(LIBRARY) $(LDAP_LIBLUTIL_A) XXLIBS = NT_LINK_LIBS = $(AC_LIBS) UNIX_LINK_LIBS = $(AC_LIBS) -ifneq (,$(OL_VERSIONED_SYMBOLS)) - SYMBOL_VERSION_FLAGS=$(OL_VERSIONED_SYMBOLS)$(srcdir)/lber.map -endif +@DO_VERSIONED_SYMBOLS@SYMBOL_VERSION_FLAGS=$(OL_VERSIONED_SYMBOLS)$(srcdir)/lber.map dtest: $(XLIBS) dtest.o $(LTLINK) -o $@ dtest.o $(LIBS) diff --git a/libraries/libldap/Makefile.in b/libraries/libldap/Makefile.in index a1941db25d..5d5c4c6514 100644 --- a/libraries/libldap/Makefile.in +++ b/libraries/libldap/Makefile.in @@ -58,9 +58,7 @@ XLIBS = $(LIBRARY) $(LDAP_LIBLBER_LA) $(LDAP_LIBLUTIL_A) XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS) NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) $(LTHREAD_LIBS) -ifneq (,$(OL_VERSIONED_SYMBOLS)) - SYMBOL_VERSION_FLAGS=$(OL_VERSIONED_SYMBOLS)$(srcdir)/ldap.map -endif +@DO_VERSIONED_SYMBOLS@SYMBOL_VERSION_FLAGS=$(OL_VERSIONED_SYMBOLS)$(srcdir)/ldap.map apitest: $(XLIBS) apitest.o $(LTLINK) -o $@ apitest.o $(LIBS) diff --git a/servers/lloadd/Makefile.in b/servers/lloadd/Makefile.in index 8db943d81b..a4c1dff1e5 100644 --- a/servers/lloadd/Makefile.in +++ b/servers/lloadd/Makefile.in @@ -16,8 +16,6 @@ XSRCS = version.c -NT_SRCS = nt_svc.c -NT_OBJS = nt_svc.o ../../libraries/liblutil/slapdmsg.res SRCS = backend.c bind.c config.c connection.c client.c \ daemon.c epoch.c extended.c init.c operation.c \ @@ -25,6 +23,12 @@ SRCS = backend.c bind.c config.c connection.c client.c \ upstream.c libevent_support.c \ $(@PLAT@_SRCS) +O = o + +OBJS = backend.$O bind.$O config.$O connection.$O client.$O \ + daemon.$O epoch.$O extended.$O init.$O operation.$O \ + tier.$O tier_roundrobin.$O tier_weighted.$O tier_bestof.$O \ + upstream.$O libevent_support.$O LDAP_INCDIR= ../../include -I$(srcdir) -I$(srcdir)/../slapd LDAP_LIBDIR= ../../libraries @@ -44,6 +48,3 @@ UNIX_OBJECTS = $(OBJS) version.o LLOADD_DEPENDS = $(@PLAT@_DEPENDS) LLOADD_OBJECTS = $(@PLAT@_OBJECTS) -include @BALANCER_INCLUDE@ - - diff --git a/servers/lloadd/Makefile_module.in b/servers/lloadd/Makefile_module.in index cd8cdb52d2..8ebb5d6a05 100644 --- a/servers/lloadd/Makefile_module.in +++ b/servers/lloadd/Makefile_module.in @@ -1,4 +1,4 @@ -# Makefile.in for Load Balancer +# Makefile.in for Load Balancer module # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## @@ -13,33 +13,16 @@ ## top-level directory of the distribution or, alternatively, at ## . - -XSRCS = version.c - -NT_SRCS = ../slapd/nt_svc.c -NT_OBJS = ../slapd/nt_svc.o ../../libraries/liblutil/slapdmsg.res +O = lo SRCS += module_init.c monitor.c -OBJS = $(patsubst %.c,%.lo,$(SRCS)) $(@PLAT@_OBJS) +OBJS += module_init.lo monitor.lo BUILD_OPT = "--enable-balancer=mod" BUILD_MOD = @BUILD_BALANCER@ LIBBASE=lloadd -# $(LTHREAD_LIBS) must be last! -XLIBS = $(LLOADD_L) -XXLIBS = $(LLOADD_LIBS) $(SECURITY_LIBS) $(LUTIL_LIBS) -XXXLIBS = $(LTHREAD_LIBS) - -NT_DEPENDS = slapd.exp -NT_OBJECTS = slapd.exp symdummy.o $(LLOADD_OBJS) version.o - -UNIX_DEPENDS = version.o $(LLOADD_L) -UNIX_OBJECTS = $(OBJS) version.o - -LLOADD_DEPENDS = $(@PLAT@_DEPENDS) -LLOADD_OBJECTS = $(@PLAT@_OBJECTS) LINK_LIBS=$(LLOADD_LIBS) MOD_DEFS = -DSLAPD_IMPORT -DBALANCER_MODULE diff --git a/servers/lloadd/Makefile_server.in b/servers/lloadd/Makefile_server.in index 0fa77bdec4..86d99d2fe1 100644 --- a/servers/lloadd/Makefile_server.in +++ b/servers/lloadd/Makefile_server.in @@ -1,4 +1,4 @@ -# Makefile.in for Load Balancer +# Makefile.in for standalone Load Balancer # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## @@ -16,8 +16,6 @@ PROGRAMS = lloadd XPROGRAMS = slloadd -XSRCS = version.c - NT_SRCS = ../slapd/nt_svc.c NT_OBJS = ../slapd/nt_svc.o ../../libraries/liblutil/slapdmsg.res @@ -25,27 +23,17 @@ SRCS += main.c value.c \ ../slapd/ch_malloc.c ../slapd/logging.c ../slapd/proxyp.c \ ../slapd/sl_malloc.c ../slapd/user.c ../slapd/verbs.c -OBJS = $(patsubst %.c,%.o,$(SRCS)) $(@PLAT@_OBJS) +OBJS += main.o value.o \ + ../slapd/ch_malloc.o ../slapd/logging.o ../slapd/proxyp.o \ + ../slapd/sl_malloc.o ../slapd/user.o ../slapd/verbs.o \ + $(@PLAT@_OBJS) BUILD_OPT = "--enable-balancer" BUILD_SRV = @BUILD_BALANCER@ all-local-srv: $(PROGRAMS) all-cffiles -# $(LTHREAD_LIBS) must be last! -XLIBS = $(LLOADD_L) -XXLIBS = $(LLOADD_LIBS) $(SECURITY_LIBS) $(LUTIL_LIBS) $(SYSTEMD_LIBS) -XXXLIBS = $(LTHREAD_LIBS) - -NT_DEPENDS = slapd.exp -NT_OBJECTS = slapd.exp symdummy.o $(LLOADD_OBJS) version.o - -UNIX_DEPENDS = version.o $(LLOADD_L) -UNIX_OBJECTS = $(OBJS) version.o - -LLOADD_DEPENDS = $(@PLAT@_DEPENDS) -LLOADD_OBJECTS = $(@PLAT@_OBJECTS) - +XXLIBS += $(SYSTEMD_LIBS) lloadd: $(LLOADD_DEPENDS) version.o $(LTLINK) -o $@ $(OBJS) version.o $(LIBS)