]> code.citadel.org Git - citadel.git/commitdiff
Revert "Since glibc 2.34, libpthread is builtin , -lpthread no longer required."
authorArt Cancro <ajc@citadel.org>
Mon, 13 May 2024 19:31:30 +0000 (19:31 +0000)
committerArt Cancro <ajc@citadel.org>
Mon, 13 May 2024 19:31:30 +0000 (19:31 +0000)
This reverts commit 4b85688bcccc19efc674cf3ef28028677eae18bf.

citadel/Makefile

index 911af919bb852ea1bc90cf60f8b2ccb37ccb63e1..21c758592af2c68e55e39ad7300954823a1fdae5 100644 (file)
@@ -32,7 +32,7 @@ citserver: $(SERVER_OBJECTS) $(BACKEND_OBJECTS)
        ${CC} ${CFLAGS} \
                $(SERVER_OBJECTS) $(BACKEND_OBJECTS) \
                ${LDFLAGS} \
-               -lcitadel -lz -lical -lldap -lcrypt -lexpat -lcurl ${LRESOLV} ${BACKEND_LDFLAGS} \
+               -lcitadel -lpthread -lz -lical -lldap -lcrypt -lexpat -lcurl ${LRESOLV} ${BACKEND_LDFLAGS} \
                -o citserver
 
 setup: utils/setup.c server/citadel_dirs.c utils/*.h server/*.h
@@ -54,16 +54,16 @@ chkpwd: utils/chkpwd.c utils/auth.c utils/*.h server/*.h
        ${CC} ${CFLAGS} ${LDFLAGS} utils/chkpwd.c utils/auth.c -lcrypt -o chkpwd
 
 dbnothing: utils/dbnothing.c utils/*.h server/*.h ${BACKEND_OBJECTS}
-       ${CC} ${CFLAGS} ${LDFLAGS} utils/dbnothing.c ${BACKEND_OBJECTS} -lcitadel -lz ${BACKEND_LDFLAGS} -o dbnothing
+       ${CC} ${CFLAGS} ${LDFLAGS} utils/dbnothing.c ${BACKEND_OBJECTS} -lcitadel -lz ${BACKEND_LDFLAGS} -lpthread -o dbnothing
 
 ctdldump: utils/ctdldump.c utils/*.h server/*.h ${BACKEND_OBJECTS}
-       ${CC} ${CFLAGS} ${LDFLAGS} utils/ctdldump.c ${BACKEND_OBJECTS} -lcitadel -lz ${BACKEND_LDFLAGS} -o ctdldump
+       ${CC} ${CFLAGS} ${LDFLAGS} utils/ctdldump.c ${BACKEND_OBJECTS} -lcitadel -lz ${BACKEND_LDFLAGS} -lpthread -o ctdldump
 
 ctdlload: utils/ctdlload.c server/makeuserkey.c utils/*.h server/*.h ${BACKEND_OBJECTS}
-       ${CC} ${CFLAGS} ${LDFLAGS} utils/ctdlload.c server/makeuserkey.c ${BACKEND_OBJECTS} -lcitadel -lz ${BACKEND_LDFLAGS} -o ctdlload
+       ${CC} ${CFLAGS} ${LDFLAGS} utils/ctdlload.c server/makeuserkey.c ${BACKEND_OBJECTS} -lcitadel -lz ${BACKEND_LDFLAGS} -lpthread -o ctdlload
 
 loadtest: utils/loadtest.c server/citadel_dirs.c utils/*.h server/*.h
-       ${CC} ${CFLAGS} ${LDFLAGS} utils/loadtest.c -lcitadel -o loadtest
+       ${CC} ${CFLAGS} ${LDFLAGS} utils/loadtest.c -lcitadel -lpthread -o loadtest
 
 config.mk: configure
        ./configure