mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-12 09:56:14 -05:00
3b7828cc7f
* gnu/packages/patches/minisat-friend-declaration.patch: New file. * gnu/packages/patches/minisat-install.patch: New file. * gnu/local.mk (dist_patch_DATA): Add both files above. * gnu/packages/maths.scm (minisat): New exported variable. Signed-off-by: Mathieu Othacehe <m.othacehe@gmail.com>
19 lines
883 B
Diff
19 lines
883 B
Diff
Avoid the default dynamic executable, which depends on minisat.so
|
|
Instead install the release version, which is statically linked.
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index ceb9d77..7b91906 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -191,9 +191,9 @@ install-lib: $(BUILD_DIR)/release/lib/$(MINISAT_SLIB) $(BUILD_DIR)/dynamic/lib/$
|
|
ln -sf $(MINISAT_DLIB).$(SOMAJOR) $(DESTDIR)$(libdir)/$(MINISAT_DLIB)
|
|
$(INSTALL) -m 644 $(BUILD_DIR)/release/lib/$(MINISAT_SLIB) $(DESTDIR)$(libdir)
|
|
|
|
-install-bin: $(BUILD_DIR)/dynamic/bin/$(MINISAT)
|
|
+install-bin: $(BUILD_DIR)/release/bin/$(MINISAT)
|
|
$(INSTALL) -d $(DESTDIR)$(bindir)
|
|
- $(INSTALL) -m 755 $(BUILD_DIR)/dynamic/bin/$(MINISAT) $(DESTDIR)$(bindir)
|
|
+ $(INSTALL) -m 755 $(BUILD_DIR)/release/bin/$(MINISAT) $(DESTDIR)$(bindir)
|
|
|
|
clean:
|
|
rm -f $(foreach t, release debug profile dynamic, $(foreach o, $(SRCS:.cc=.o), $(BUILD_DIR)/$t/$o)) \
|