[SCM] an open source computer algebra system branch, debian, updated. 135ce5a283b0c913d2722c86fa55fffa2e22f4db
Bernhard R. Link
brlink at debian.org
Sun Feb 19 20:34:16 UTC 2012
The following commit has been merged in the debian branch:
commit 6aec14eb37fff787c197acf4d23283ffbcf8ce8f
Merge: cc4608e41b8d01ac25b73c135ebb2bf19d2eeabe bbc36dff3a4089ffa84aefb8fb8058a04b9c2e64
Author: Bernhard R. Link <brlink at debian.org>
Date: Sun Feb 19 21:27:37 2012 +0100
fix soname introduction patch
diff --combined debian/.git-dpm
index 4a1acf6,0000000..925ff1f
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
+# see git-dpm(1) from git-dpm package
- 34686511dc82d2ffe1e605405b3e52d848cb0cf0
- 34686511dc82d2ffe1e605405b3e52d848cb0cf0
++bbc36dff3a4089ffa84aefb8fb8058a04b9c2e64
++bbc36dff3a4089ffa84aefb8fb8058a04b9c2e64
+af80c455bead480e8e21703ac28b5a5965265887
+af80c455bead480e8e21703ac28b5a5965265887
+singular_3-1-4.dfsg.orig.tar.gz
+a06cbfe8374a4f1a20d602c9993d8a21c9dfbb1d
+14994054
diff --combined debian/patches/0005-append-suffix-to-soname.patch
index fae57a0,0000000..b644eb3
mode 100644,000000..100644
--- a/debian/patches/0005-append-suffix-to-soname.patch
+++ b/debian/patches/0005-append-suffix-to-soname.patch
@@@ -1,45 -1,0 +1,48 @@@
- From 7ad4411cb49752352a6f72377fc5d38f4c57669e Mon Sep 17 00:00:00 2001
- From: Tim Abbott <tabbott at mit.edu>
- Date: Sat, 31 May 2008 15:24:03 -0400
- Subject: append suffix to soname. (taken from soname.patch)
++From d9884bcc5309a6db6da8a8233cb3c46a4c16fafb Mon Sep 17 00:00:00 2001
++From: "Bernhard R. Link" <brlink at debian.org>
++Date: Sun, 19 Feb 2012 21:25:54 +0100
++Subject: append suffix to soname
+
++based on old patch most likely from sage,
++but merged with upstream changes and not using "`",
++as make does not know about the embedded spaces...
+---
+ Singular/Makefile.in | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/Singular/Makefile.in b/Singular/Makefile.in
- index 3bc2c32..bcc6266 100644
++index 3bc2c32..3885c42 100644
+--- a/Singular/Makefile.in
++++ b/Singular/Makefile.in
+@@ -137,6 +137,7 @@ LIBSINGULAR_LIBS =-lsingfac -lsingcf -lntl -lreadline -lgmp -lomalloc
+ SO_SUFFIX = so
+
+ LIBSINGULAR_FLAGS = -shared
- +LIBSINGULAR_NAME = libsingular-`cat ../VERSION`.so
+++LIBSINGULAR_NAME = libsingular-$(shell cat ../VERSION).so
+ LIBSINGULAR_LD = $(CXX)
+
+ # correct suffix for dynamic linking
+@@ -149,6 +150,7 @@ endif
+
+ ifeq ($(SINGUNAME),x86_64Mac-darwin)
+ SO_SUFFIX = dylib
++LIBSINGULAR_NAME = libsingular.dylib
+ MODULE_SUFFIX = bundle
+ LIBSINGULAR_FLAGS = -single_module
+ LIBSINGULAR_LD = $(LD)
+@@ -157,6 +159,7 @@ endif
+ ifeq ($(SINGUNAME),ppcMac-darwin)
+ MACOSX_DEPLOYMENT_TARGET=10.4
+ SO_SUFFIX = dylib
++LIBSINGULAR_NAME = libsingular.dylib
+ MODULE_SUFFIX = bundle
+ LIBSINGULAR_FLAGS = -single_module
+ LIBSINGULAR_LD = $(LD)
+@@ -165,6 +168,7 @@ endif
+ ifeq ($(SINGUNAME),ix86-Win)
+ SO_SUFFIX = dll
+ MODULE_SUFFIX = dll
- ++LIBSINGULAR_NAME = libsingular.dll
+++LIBSINGULAR_NAME = libsingular.dll
+ LIBSINGULAR_FLAGS = -shared
+ LIBSINGULAR_LIBS = -lsingfac -lsingcf -lntl -lreadline -lgmp -lomalloc -lhtmlhelp
+ endif
diff --combined debian/patches/0006-This-patch-fixes-the-bogus-default-targets-in-Makefi.patch
index 3dbfce1,0000000..7337758
mode 100644,000000..100644
--- a/debian/patches/0006-This-patch-fixes-the-bogus-default-targets-in-Makefi.patch
+++ b/debian/patches/0006-This-patch-fixes-the-bogus-default-targets-in-Makefi.patch
@@@ -1,57 -1,0 +1,57 @@@
- From 3367dd6c38ce2d5dd49c32ee9a64852c082a9342 Mon Sep 17 00:00:00 2001
++From f1280e20976aff7fcbad05114fe480f493d705f2 Mon Sep 17 00:00:00 2001
+From: Felix Salfelder <felix at salfelder.org>
+Date: Thu, 16 Feb 2012 11:07:25 +0100
+Subject: =?UTF-8?q?This=20patch=20fixes=20the=20bogus=20default=20targets=20?=
+ =?UTF-8?q?in=20Makefile.in=0Anow=20'make\=20{all,install}'=20works=20as=20u?=
+ =?UTF-8?q?sual=20and=20expected?=
+
+---
+ Makefile.in | 14 +++++++++-----
+ 1 files changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 8e78512..1e1f4f3 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -24,8 +24,12 @@ GUNZIP = @GUNZIP@
+
+ ##############################################################
+ # default target
+-${SINGULAR}:
+- ${MAKE} install
++all:
++ @ for SUBDIR in ${BUILD1_SUBDIRS}; \
++ do \
++ echo ${MAKE} all in $${SUBDIR}; \
++ ${MAKE} -C $$SUBDIR || exit 1; \
++ done
+
+ ##############################################################
+ # general targets
+@@ -34,7 +38,7 @@ ${SINGULAR}:
+
+ TEXINFO_TEX_FILES = epsf.tex texinfo.tex txi-cs.tex txi-de.tex txi-no.tex
+ TEXINFO_TEX_DIR = Texinfo/doc
+-all:
++bogus_all:
+ echo For everybody who did not read the README: use make install
+ exit 1
+
+@@ -42,7 +46,7 @@ install install_all:
+ @ for SUBDIR in ${BUILD1_SUBDIRS}; \
+ do \
+ echo ${MAKE} $@ in $${SUBDIR}; \
+- (cd $${SUBDIR} && ${MAKE} $@ ) || exit 1;\
++ ${MAKE} -C $$SUBDIR $@ ;\
+ (if test "$${SUBDIR}" = Texinfo && test -d doc; then \
+ for FILE in ${TEXINFO_TEX_FILES}; \
+ do \
+@@ -62,7 +66,7 @@ install-nolns:
+ @ for SUBDIR in ${BUILD1_SUBDIRS}; \
+ do \
+ echo ${MAKE} $@ in $${SUBDIR}; \
+- (cd $${SUBDIR} && ${MAKE} $@ ) || exit 1;\
++ ${MAKE} -C $$SUBDIR $@ ;\
+ (if test "$${SUBDIR}" = Texinfo && test -d doc; then \
+ for FILE in ${TEXINFO_TEX_FILES}; \
+ do \
diff --combined debian/patches/0007-assert-needs-to-be-defined-after-include-assert.h.patch
index 1f36988,0000000..a04702c
mode 100644,000000..100644
--- a/debian/patches/0007-assert-needs-to-be-defined-after-include-assert.h.patch
+++ b/debian/patches/0007-assert-needs-to-be-defined-after-include-assert.h.patch
@@@ -1,24 -1,0 +1,24 @@@
- From c05557c5745928160452b82605159fb9e4cb4f84 Mon Sep 17 00:00:00 2001
++From c8710571ba8c96aef1755dec9c2a10775da5bb0b Mon Sep 17 00:00:00 2001
+From: Felix Salfelder <felix at salfelder.org>
+Date: Thu, 16 Feb 2012 11:23:11 +0100
+Subject: =?UTF-8?q?assert=20needs=20to=20be=20defined=20after=20#include=20"?=
+ =?UTF-8?q?assert.h",=0Aalso=20if=20-Ifactory=20is=20used.?=
+
+---
+ factory/assert.h | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/factory/assert.h b/factory/assert.h
+index 5590bbc..098e8b8 100644
+--- a/factory/assert.h
++++ b/factory/assert.h
+@@ -127,3 +127,9 @@ extern "C" {
+ #define PVIRT_CHARCC(msg) = 0
+ #endif /* NOASSERT */
+ /* }}} */
++
++
++//assert is expected to be available after '#include "assert.h"'
++#ifndef assert
++# define assert(a)
++#endif
diff --combined debian/patches/0008-miscellaneous-Makefile-template-patches.patch
index d698068,0000000..ef94437
mode 100644,000000..100644
--- a/debian/patches/0008-miscellaneous-Makefile-template-patches.patch
+++ b/debian/patches/0008-miscellaneous-Makefile-template-patches.patch
@@@ -1,345 -1,0 +1,345 @@@
- From 34686511dc82d2ffe1e605405b3e52d848cb0cf0 Mon Sep 17 00:00:00 2001
++From bbc36dff3a4089ffa84aefb8fb8058a04b9c2e64 Mon Sep 17 00:00:00 2001
+From: Felix Salfelder <felix at salfelder.org>
+Date: Thu, 16 Feb 2012 12:37:00 +0100
+Subject: =?UTF-8?q?miscellaneous=20Makefile=20template=20patches=0A=20=20=20?=
+ =?UTF-8?q?=20=20-=20fix=20flags=20(mostly=20search=20paths)=0A=20=20=20=20=20?=
+ =?UTF-8?q?-=20repair=20default=20and=20install=20targets=0A=20=20=20=20=20-?=
+ =?UTF-8?q?=20break=20dependency=20loops=0A=20=20=20=20=20-=20weaken=20depen?=
+ =?UTF-8?q?dencies=20(temporary,=20upstream=20fixes=20needed)?=
+
+---
+ Singular/Makefile.in | 55 ++++++++++++++++++++++++++++++-----------------
+ emacs/Makefile.in | 5 +++-
+ factory/GNUmakefile.in | 18 ++++++++-------
+ kernel/Makefile.in | 6 ++--
+ libfac/Makefile.in | 24 ++++++++++----------
+ omalloc/Makefile.in | 6 ++--
+ 6 files changed, 67 insertions(+), 47 deletions(-)
+
+diff --git a/Singular/Makefile.in b/Singular/Makefile.in
- index bcc6266..5179c56 100644
++index 3885c42..3b775ea 100644
+--- a/Singular/Makefile.in
++++ b/Singular/Makefile.in
+@@ -85,7 +85,7 @@ endif
+ DEFS = -DNDEBUG -DOM_NDEBUG -D at SING_UNAME@ @DEFS@
+ LDFLAGS2 = @LDFLAGS@
+ ifneq ($(SINGUNAME),ix86-Win)
+-LDFLAGS = -L at prefix@/kernel -L../kernel -lkernel @LDFLAGS@
++LDFLAGS = -L at prefix@/kernel -L../kernel -L../omalloc -L../libfac -L../factory -lkernel @LDFLAGS@
+ LDFLAGSG = -L at prefix@/kernel -L../kernel -lkernel_g @LD_DYN_FLAGS1@ @LDFLAGS@
+ LDFLAGSP = -L at prefix@/kernel -L../kernel -lkernel_p @LD_DYN_FLAGS1@ @LDFLAGS@
+ else
+@@ -362,14 +362,14 @@ GFTABLES = $(wildcard LIB/gftables/[1-9]*)
+ fi
+
+ .cc.o:
+- ${CXX} ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} -c $<
++ ${CXX} -fPIC ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} -c $<
+ .c.o:
+- ${CC} ${CFLAGS} ${CPPFLAGS} ${DEFS} -c $<
++ ${CC} -fPIC ${CFLAGS} ${CPPFLAGS} ${DEFS} -c $<
+
+ %.dl_o : %.cc
+ ${CXX} ${CXXFLAGS} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFS} ${SFLAGS} -c $< -o $@
+
+-all: $(SING_EXEC)
++all: $(SING_EXEC) $(LIBSINGULAR_NAME)
+
+ Singular-static: version.h
+ sleep 1
+@@ -386,11 +386,16 @@ Singular${S_EXT}: mod2.h Makefile version.h $(WIN_LIBS) scanner.cc ${OBJS} \
+ tesths.cc iparith.o mpsr_Tok.o claptmpl.o\
+ ${OBJS} ${LDFLAGS} ${LIBS} ${LD_DYN_FLAGS} ../kernel/mmalloc.o
+
+-libsingular: mod2.h Makefile version.h $(WIN_LIBS) scanner.cc ${OBJS} \
+- iparith.o libparse.cc claptmpl.o mpsr_Tok.o $(DL_LIBS)
+- $(LIBSINGULAR_LD) ${SLDFLAGS} ${LIBSINGULAR_FLAGS} -o libsingular.${SO_SUFFIX} \
+- iparith.o mpsr_Tok.o claptmpl.o \
+- ${OBJS} -lkernel -L../kernel -L../factory -L../libfac -L${libdir} ${LIBSINGULAR_LIBS} -ldl
++libsingular: ${LIBSINGULAR_NAME}
++
++${LIBSINGULAR_NAME}: version.h $(WIN_LIBS) scanner.cc ${OBJS} \
++ iparith.o libparse.cc claptmpl.o mpsr_Tok.o $(DL_LIBS) tesths.o
++ $(LIBSINGULAR_LD) ${SLDFLAGS} ${LIBSINGULAR_FLAGS} -o ${LIBSINGULAR_NAME} \
++ tesths.o iparith.o mpsr_Tok.o claptmpl.o \
++ ${OBJS} -lkernel -L../kernel -L../factory -L../libfac -L${libdir} ${LIBSINGULAR_LIBS}
++ if [ $(LIBSINGULAR_NAME) != libsingular.$(SO_SUFFIX) ]; then \
++ ln -fs $(LIBSINGULAR_NAME) libsingular.$(SO_SUFFIX); \
++ fi
+
+ libsingular.a: mod2.h Makefile version.h $(WIN_LIBS) scanner.cc ${OBJS} \
+ iparith.o libparse.cc claptmpl.o mpsr_Tok.o
+@@ -426,13 +431,16 @@ iparith.inc: gentable.cc grammar.h tok.h table.h mod2.h
+ ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXTEMPLFLAGS} ${DEFS} ${LD_DYN_FLAGS} gentable.cc \
+ -o gentable1
+ ./gentable1
+- /bin/rm -f gentable1 gentable1.exe
++ # /bin/rm -f gentable1 gentable1.exe
+
+ mpsr_Tok.inc: gentable2.cc grammar.h tok.h table.h mod2.h
+ ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXTEMPLFLAGS} ${DEFS} ${LD_DYN_FLAGS} gentable2.cc \
+ -o gentable2
+ ./gentable2
+- /bin/rm -f gentable2 gentable2.exe
++ # /bin/rm -f gentable2 gentable2.exe
++ #
++ # FIXME: the above doesnt work.
++ touch $@
+
+
+ svnver:
+@@ -476,17 +484,17 @@ TSingular: mod2.h feOpt.cc version.h emacs.cc \
+ feOpt.o: feOpt.inc feOptES.inc feOptTS.inc
+ extra.o: feOpt.inc
+
+-feOpt.inc: feOpt.cc mod2.h
++feOpt.inc: feOpt.cc |mod2.h
+ $(CXX) $(CXXFLAGS) -DGENERATE_OPTION_INDEX ${CPPFLAGS} feOpt.cc -o feOpt
+ ./feOpt
+ /bin/rm -f feOpt feOpt.exe
+
+-feOptES.inc: feOpt.cc mod2.h
++feOptES.inc: feOpt.cc |mod2.h
+ $(CXX) $(CXXFLAGS) -DGENERATE_OPTION_INDEX -DESINGULAR -I../kernel feOpt.cc -o feOptES
+ ./feOptES
+ rm -f feOptES feOptES.exe
+
+-feOptTS.inc: feOpt.cc mod2.h
++feOptTS.inc: feOpt.cc |mod2.h
+ $(CXX) $(CXXFLAGS) -DGENERATE_OPTION_INDEX -DTSINGULAR -I../kernel feOpt.cc -o feOptTS
+ ./feOptTS
+ rm -f feOptTS feOptTS.exe
+@@ -557,11 +565,11 @@ endif
+ ##
+ ## install targets
+ ##
+-install: all installbin installslib
++install: all installbin installslib install-libsingular
+
+ install_all: install
+
+-install-nolns: all installbin-nolns installslib-nolns
++install-ln: all installbin installslib-ln
+
+ installbin: ${SING_EXEC} libparse ESingular TSingular ${RUN_SINGULARS}
+ ${MKINSTALLDIRS} $(DESTDIR)${bindir}
+@@ -569,6 +577,12 @@ installbin: ${SING_EXEC} libparse ESingular TSingular ${RUN_SINGULARS}
+ -for file in *.so; do \
+ ${INSTALL_PROGRAM} $$file $(DESTDIR)${bindir}; \
+ done
++ ${MKINSTALLDIRS} $(DESTDIR)${install_bindir}
++ ${MKINSTALLDIRS} $(DESTDIR)${libdir}
++ ${INSTALL_PROGRAM} ${SING_EXEC} $(DESTDIR)${SINGULAR}
++ for file in *.so; do \
++ ${INSTALL_PROGRAM} $$file $(DESTDIR)${libdir}; \
++ done
+ ${INSTALL_PROGRAM} libparse ${RUN_SINGULARS} $(DESTDIR)${bindir}
+ ${INSTALL_PROGRAM} ESingular TSingular $(DESTDIR)${bindir}
+ ${INSTALL_PROGRAM} surfex $(DESTDIR)${bindir}
+@@ -579,10 +593,10 @@ installbin: ${SING_EXEC} libparse ESingular TSingular ${RUN_SINGULARS}
+ installbin-nolns: installbin
+ ${INSTALL_PROGRAM} ${SING_EXEC} $(DESTDIR)${install_bindir}/Singular${EXEC_EXT};
+
+-installslib: LIB
++installslib-ln: LIB
+ test -r ${slibdir} || ${LN_S} `pwd`/LIB ${slibdir}
+
+-installslib-nolns: LIB
++installslib: LIB
+ ${MKINSTALLDIRS} $(DESTDIR)${slibdir}
+ for file in `pwd`/LIB/*.lib; do \
+ ${INSTALL_DATA} $$file $(DESTDIR)${slibdir}; \
+@@ -592,7 +606,7 @@ installslib-nolns: LIB
+ ${INSTALL_DATA} $$file $(DESTDIR)${slibdir}; \
+ done
+
+-install-libsingular: libsingular
++install-libsingular: ${LIBSINGULAR_NAME}
+ ${MKINSTALLDIRS} $(DESTDIR)${includedir}/singular
+ for file in *.$(SO_SUFFIX); do \
+ ${INSTALL_PROGRAM} $$file $(DESTDIR)${libdir}; \
+@@ -615,11 +629,12 @@ uninstallbin:
+ mostlyclean:
+ -rm -f Singular Singular-static Singularg Singularp libparse feOpt*.inc
+ -rm -f *.o *.og core *.op *.so* *.dl_o*
+- -rm -f ESingular* TSingular*
++ -rm -f ESingular* TSingular* libsingular
+
+ clean: mostlyclean
+ -rm -f *.bak *.d *.dd depend
+ -rm -f ${slibdir}
++ -rm -f gentable1 gentable2
+
+ distclean: clean
+ -rm -f iparith.inc mpsr_Tok.inc stamp.h
+diff --git a/emacs/Makefile.in b/emacs/Makefile.in
+index 86ba445..47c57e1 100644
+--- a/emacs/Makefile.in
++++ b/emacs/Makefile.in
+@@ -42,9 +42,12 @@ lib-cmpl.el: ${prefix}/Singular/Makefile lib.pl
+ (cd ${prefix}/Singular;${MAKE} --no-print-directory -s -f Makefile echoLIBS) > lib-temp
+ ${PERL} lib.pl -s ${singulardir} `cat lib-temp` > lib-cmpl.el
+
+-clean mostlyclean distclean:
++clean mostlyclean:
+ rm -f cmd-cmpl.el hlp-cmpl.el lib-cmpl.el ex-cmpl.el
+
++distclean: mostlyclean
++ rm -f Makefile
++
+ install-sharedist: all
+ ${MKINSTALLDIRS} ${emacsdir}
+ ${INSTALL_DATA} cmd-cmpl.el ${emacsdir}
+diff --git a/factory/GNUmakefile.in b/factory/GNUmakefile.in
+index 1e8d80d..c80d6e1 100644
+--- a/factory/GNUmakefile.in
++++ b/factory/GNUmakefile.in
+@@ -455,24 +455,24 @@ distfiles := \
+ #
+
+ # how to create library objets
+-%.o: %.cc config.h factoryconf.h
++%.o: %.cc config.h |factoryconf.h
+ $(CXX) -c $< $(LIBCXXFLAGS) -o $@
+ %.o: %.c config.h
+ $(CC) -c $< $(LIBCFLAGS) -o $@
+ # the debug version:
+-%.og: %.cc config.h factoryconf.h
++%.og: %.cc config.h |factoryconf.h
+ $(CXX) -g -c $< $(LIBCGGFLAGS) -o $@
+ # the profiling version:
+-%.op: %.cc config.h factoryconf.h
++%.op: %.cc config.h |factoryconf.h
+ $(CXX) -O -pg -c $< $(LIBCGGFLAGS) -o $@
+
+ # how to create dependency files. To avoid broken dependency files
+ # (which in turn break this GNUmakefile) we first generate them in
+ # a temporary file which we then move to the destination file.
+-%.dtmp: %.cc factoryconf.h config.h
++%.dtmp: %.cc |factoryconf.h config.h
+ echo $*.d "\\" > $@
+ $(CXX) -MM $< $(DEPCXXFLAGS) >> $@
+-%.dtmp: %.c factoryconf.h config.h
++%.dtmp: %.c |factoryconf.h config.h
+ echo $*.d "\\" > $@
+ $(CXX) -MM $< $(DEPCXXFLAGS) >> $@
+ %.dtmp: %.template
+@@ -783,8 +783,10 @@ $(srcdir)/configure: configure.in
+ # seems gmake needs at least a trivial command. otherwise all
+ # files which depend on config.h will be remade even if congig.h
+ # did not change.
+-config.h: stamp-h
+- @:
++#
++# WTF?
++#config.h: stamp-h
++# @:
+
+ stamp-h: config.h.in config.status
+ CONFIG_FILES= CONFIG_HEADERS=config.h ./config.status
+@@ -800,7 +802,7 @@ config.status: configure
+ ./config.status --recheck
+
+ # create cf_gmp.h
+-cf_gmp.h: GNUmakefile gen_cf_gmp.template
++cf_gmp.h: gen_cf_gmp.template
+ echo "#!/bin/sh" >gen_cf_gmp.sh
+ echo "GMP_H_T=\"`g++ $(LIBCXXFLAGS) -M gen_cf_gmp.cc|grep gmp.h` \"" >>gen_cf_gmp.sh
+ cat gen_cf_gmp.template >>gen_cf_gmp.sh
+diff --git a/kernel/Makefile.in b/kernel/Makefile.in
+index 7b8b77b..afba959 100644
+--- a/kernel/Makefile.in
++++ b/kernel/Makefile.in
+@@ -439,15 +439,15 @@ libkernel_p.a: ${OBJP} ${DL_LIBSP} ${OBJSP2}
+ ## dependencies
+ ##
+
+-%.dd: %.cc mod2.h
++%.dd: %.cc |mod2.h
+ echo $(@:.dd=.og) $(@:.dd=.op) $(@:.dd=.dl_o) $(@:.dd=.dl_og) $(@:.dd=.dl_op)" " \\ > $@
+ $(CXXM) -DGENTABLE ${CPPFLAGS} ${DEFSG} $< >> $@
+
+-%.d: %.c mod2.h
++%.d: %.c |mod2.h
+ echo $(@:.d=.og) $(@:.d=.op) " " \\ > $@
+ $(CCM) ${CPPFLAGS} ${DEFSG} $< >> $@
+
+-depend: $(CXXSOURCES:.cc=.dd) $(ESOURCES:.cc=.dd) $(CSOURCES:.c=.d) mod2.h
++depend: $(CXXSOURCES:.cc=.dd) $(ESOURCES:.cc=.dd) $(CSOURCES:.c=.d) |mod2.h
+ cat *.d *.dd >depend
+
+ ifeq (depend,$(wildcard depend))
+diff --git a/libfac/Makefile.in b/libfac/Makefile.in
+index 62faadb..b16e306 100644
+--- a/libfac/Makefile.in
++++ b/libfac/Makefile.in
+@@ -86,40 +86,40 @@ all: OPTOBJ ${TARGETNAME} libsingfac_g.a
+ OPTOBJ:
+ ${MKINSTALLDIRS} OPTOBJ
+
+-OPTOBJ/%.o: %.cc OPTOBJ
++OPTOBJ/%.o: %.cc |OPTOBJ
+ $(CXX) $(CXXFLAGS) $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
+
+-OPTOBJ/%.o: charset/%.cc OPTOBJ
++OPTOBJ/%.o: charset/%.cc |OPTOBJ
+ $(CXX) $(CXXFLAGS) $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
+
+-OPTOBJ/%.o: factor/%.cc OPTOBJ
++OPTOBJ/%.o: factor/%.cc |OPTOBJ
+ $(CXX) $(CXXFLAGS) $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
+
+-OPTOBJ/tmpl_inst.o: factor/tmpl_inst.cc OPTOBJ
++OPTOBJ/tmpl_inst.o: factor/tmpl_inst.cc
+ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
+
+-OPTOBJ/%.op: %.cc OPTOBJ
++OPTOBJ/%.op: %.cc |OPTOBJ
+ $(CXX) -O -pg $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
+
+-OPTOBJ/%.op: charset/%.cc OPTOBJ
++OPTOBJ/%.op: charset/%.cc |OPTOBJ
+ $(CXX) -O -pg $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
+
+-OPTOBJ/%.op: factor/%.cc OPTOBJ
++OPTOBJ/%.op: factor/%.cc |OPTOBJ
+ $(CXX) -O -pg $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
+
+-OPTOBJ/tmpl_inst.op: factor/tmpl_inst.cc OPTOBJ
++OPTOBJ/tmpl_inst.op: factor/tmpl_inst.cc |OPTOBJ
+ $(CXX) -O -pg $(CPPFLAGS) $(DEFS) -c $< -o $@
+
+-OPTOBJ/%.og: %.cc OPTOBJ
++OPTOBJ/%.og: %.cc |OPTOBJ
+ $(CXX) -g $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
+
+-OPTOBJ/%.og: charset/%.cc OPTOBJ
++OPTOBJ/%.og: charset/%.cc |OPTOBJ
+ $(CXX) -g $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
+
+-OPTOBJ/%.og: factor/%.cc OPTOBJ
++OPTOBJ/%.og: factor/%.cc |OPTOBJ
+ $(CXX) -g $(CXXTEMPLFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
+
+-OPTOBJ/tmpl_inst.og: factor/tmpl_inst.cc OPTOBJ
++OPTOBJ/tmpl_inst.og: factor/tmpl_inst.cc |OPTOBJ
+ $(CXX) -g $(CPPFLAGS) $(DEFS) -c $< -o $@
+
+ libfac: OPTOBJ libfac.a
+diff --git a/omalloc/Makefile.in b/omalloc/Makefile.in
+index 4956179..e3994b8 100644
+--- a/omalloc/Makefile.in
++++ b/omalloc/Makefile.in
+@@ -180,9 +180,9 @@ configure: configure.in
+ ##
+ install-nolns: install
+
+-install-libsingular:
+- $(MKINSTALLDIRS) $(includedir)/singular
+- $(INSTALL) omalloc.h $(includedir)/singular
++#install-libsingular:
++# $(MKINSTALLDIRS) $(includedir)/singular
++# $(INSTALL) omalloc.h $(includedir)/singular
+
+ install install-libsingular: all
+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
diff --combined debian/patches/series
index 9c1d6bc,0000000..d6b7886
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,8 -1,0 +1,8 @@@
+0001-use-DESTDIR-as-a-pre-prefix-in-install-targets.patch
+0002-fixing-template-install-path-in-factory-configure.in.patch
+0003-run-time-include-paths.patch
+0004-Fix-FTBFS-with-ld-as-needed.-LP-832790.patch
- 0005-append-suffix-to-soname.-taken-from-soname.patch.patch
++0005-append-suffix-to-soname.patch
+0006-This-patch-fixes-the-bogus-default-targets-in-Makefi.patch
+0007-assert-needs-to-be-defined-after-include-assert.h.patch
+0008-miscellaneous-Makefile-template-patches.patch
--
an open source computer algebra system
More information about the debian-science-commits
mailing list