Andreas Tille pushed to branch master at Debian Med / phipack
Commits: 9c5eec0d by Andreas Tille at 2020-09-08T22:29:16+02:00 routine-update: Add salsa-ci file - - - - - 717251c0 by Andreas Tille at 2020-09-08T22:33:31+02:00 Fix compiler variable to enable cross building - - - - - 4 changed files: - debian/changelog - + debian/patches/cross.patch - debian/patches/series - + debian/salsa-ci.yml Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +phipack (0.0.20160614-5) UNRELEASED; urgency=medium + + * Add salsa-ci file (routine-update) + * Fix compiler variable to enable cross building + Closes: #968242 + + -- Andreas Tille <[email protected]> Tue, 08 Sep 2020 22:29:16 +0200 + phipack (0.0.20160614-4) unstable; urgency=medium * Team Upload. ===================================== debian/patches/cross.patch ===================================== @@ -0,0 +1,40 @@ +From: Helmut Grohne <[email protected]> +Date: Tue, 11 Aug 2020 16:10:26 +0200 +Description: Fix compiler variable to enable cross building +Bug-Debian: https://bugs.debian.org/968242 + +--- phipack-0.0.20160614.orig/src/Makefile ++++ phipack-0.0.20160614/src/Makefile +@@ -1,7 +1,7 @@ + # compiler +-#CXX = /opt/ibmcmp/vac/6.0/bin/xlc +-CXX = gcc +-CXXFLAGS += -O3 -Wall ++#CC = /opt/ibmcmp/vac/6.0/bin/xlc ++CC = gcc ++CFLAGS += -O3 -Wall + + # target macros + PhiOBJ = normal.o stats.o maxChi.o main.o queue.o graphCode.o fasta.o phylip.o mem.o misc.o pairScore.o seqManip.o global.o +@@ -12,18 +12,18 @@ + + # implicit construction rule + %.o : %.c +- $(CXX) -c $(CXXFLAGS) $< -o $@ ++ $(CC) -c $(CFLAGS) $< -o $@ + + + Phi: $(PhiOBJ) +- $(CXX) $(CXXFLAGS) -o Phi $(PhiOBJ) -lm $(LDFLAGS) ++ $(CC) $(CFLAGS) -o Phi $(PhiOBJ) -lm $(LDFLAGS) + cp Phi ../ + cd ppma_2_bmp && ${MAKE} + cp ppma_2_bmp/ppma_2_bmp ../ + + + Profile: $(ProfOBJ) +- $(CXX) $(CXXFLAGS) -o Profile $(ProfOBJ) -lm $(MYLIB) $(LDFLAGS) ++ $(CC) $(CFLAGS) -o Profile $(ProfOBJ) -lm $(MYLIB) $(LDFLAGS) + cp Profile ../ + clean : FORCE + rm -f *.o ===================================== debian/patches/series ===================================== @@ -1 +1,2 @@ hardening.patch +cross.patch ===================================== debian/salsa-ci.yml ===================================== @@ -0,0 +1,4 @@ +--- +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml View it on GitLab: https://salsa.debian.org/med-team/phipack/-/compare/d5438353efae0fa2320ff210915aba1722bebc3c...717251c0c093c698a166d2dbcab3577ccf65211b -- View it on GitLab: https://salsa.debian.org/med-team/phipack/-/compare/d5438353efae0fa2320ff210915aba1722bebc3c...717251c0c093c698a166d2dbcab3577ccf65211b You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
