From fcb865786b524917aa9d3df8745aca66716794bf Mon Sep 17 00:00:00 2001 From: Mate Soos Date: Sun, 2 Jun 2024 21:50:06 -0400 Subject: [PATCH] Also add a dynamic library --- Liliana Marie Prikler : Added -L. Squashed fix for cadical and mobical. makefile.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/makefile.in b/makefile.in index 291cb3e3..d179f591 100644 --- a/makefile.in +++ b/makefile.in @@ -34,7 +34,7 @@ COMPILE=$(CXX) $(CXXFLAGS) -I$(DIR) -I$(ROOT)/src #--------------------------------------------------------------------------# -all: libcadical.a cadical mobical +all: libcadical.so libcadical.a cadical mobical #--------------------------------------------------------------------------# @@ -54,10 +54,10 @@ contrib/%.o: $(ROOT)/contrib/%.cpp $(ROOT)/contrib/%.hpp $(ROOT)/src/*.hpp makef # tester 'mobical') and the library are the main build targets. cadical: src/cadical.o libcadical.a makefile - $(COMPILE) -o $@ $< -L. -lcadical $(LIBS) + $(COMPILE) -static -o $@ $< -L. -lcadical $(LIBS) mobical: src/mobical.o libcadical.a makefile $(LIBS) - $(COMPILE) -o $@ $< -L. -lcadical + $(COMPILE) -static -o $@ $< -L. -lcadical libcadical.a: $(OBJ_SOLVER) $(OBJ_CONTRIB) makefile ar rc $@ $(OBJ_SOLVER) $(OBJ_CONTRIB) @@ -62,5 +62,8 @@ mobical: src/mobical.o libcadical.a makefile $(LIBS) libcadical.a: $(OBJ_SOLVER) $(OBJ_CONTRIB) makefile ar rc $@ $(OBJ_SOLVER) $(OBJ_CONTRIB) +libcadical.so: $(OBJ_SOLVER) $(OBJ_CONTRIB) $(LIBS) makefile + $(COMPILE) -shared -o $@ $(OBJ_SOLVER) $(OBJ_CONTRIB) $(LIBS) + #--------------------------------------------------------------------------# # Note that 'build.hpp' is generated and resides in the build directory.
03-21
AgeCommit message (Expand)Author
tests: gdm: Remove tmpfs related tests....This test never managed to reveal the problem described in [1] because from gnu/system/vm.scm it is seen that our "/tmp" mount is filtered out and replaced with a "/tmp" file-system that is mounted with (needed-for-boot? #t). This last bit is crucial as the problem was caused by the user specified "/tmp" file-system lacking this part which caused "/tmp" being mounted after x11-socket-directory-service has run, effectively shadowing the directory. [1]: <https://issues.guix.gnu.org/57589> * gnu/tests/gdm.scm (%test-gdm-wayland-tmpfs): Delete variable. (make-os): Remove tmpfs? argument. (run-gdm-test): Remove tmpfs? argument. Add a small delay since waiting for gdm.pid is not enough, causing the tests to fail sporadically. Reviewed-by: Josselin Poiret <dev@jpoiret.xyz> Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> Bruno Victal
2022-12-04tests: Add gdm tests....* gnu/tests/gdm.scm: New file. * gnu/local.mk: Register it. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Bruno Victal