[SCM] an open source computer algebra system branch, debian, updated. b5948886dfedc65056586a6e55ce337f5eca2001

Bernhard R. Link brlink at debian.org
Mon Mar 5 20:05:38 UTC 2012


The following commit has been merged in the debian branch:
commit b5948886dfedc65056586a6e55ce337f5eca2001
Author: Bernhard R. Link <brlink at debian.org>
Date:   Mon Mar 5 21:06:06 2012 +0100

    make sure ESingular and TSingular are built in 'build' and not in 'binary', also pass proper flags

diff --git a/debian/rules b/debian/rules
index af0f783..e4dec94 100755
--- a/debian/rules
+++ b/debian/rules
@@ -178,7 +178,9 @@ EXAMPLE_EXCLUDE=-exclude MP -exclude gfan -exclude normaliz -exclude sing4ti2 -e
 
 build-stamp: configure-stamp
 	$(MAKE) LD='$(CXX) $(CXXFLAGS) -fPIC $(LDFLAGS)' LIBSINGULAR_FLAGS='-shared -Wl,-soname,libsingular-$(VERSION).so $(CXXFLAGS) -fPIC $(LDFLAGS) -L../omalloc' LD_DYN_FLAGS2='' DL_LIBSG='' GLIBC_DYN_FIX="-lc"
-	$(MAKE) -C Singular libparse
+	# libparse is needed for doc-building ESingular and TSingular not built by "all".
+	# and the makefile here uses the wrong flags (only CPPFLAGS, not CXXFLAGS)
+	$(MAKE) -C Singular CPPFLAGS='-I. -I.. $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)' libparse ESingular TSingular
 	cd Singular && ln -sf ../kernel/p_*.so .
 	mkdir -p debian/lddir && ln -sf ../../Singular/libsingular.so debian/lddir/libsingular-$(VERSION).so
 	SINGULAR_BIN_DIR=$(CURDIR)/Singular \

-- 
an open source computer algebra system



More information about the debian-science-commits mailing list