From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7B70D138330 for ; Sun, 4 Sep 2016 13:02:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6FE57E0A61; Sun, 4 Sep 2016 13:02:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 85F54E09FF for ; Sun, 4 Sep 2016 13:02:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E96F23408A6 for ; Sun, 4 Sep 2016 13:02:14 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CEADD2471 for ; Sun, 4 Sep 2016 13:02:12 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1472994011.b57cefc0475955dc9dce44855af6a5795a78a001.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-biology/mosaik/, sci-biology/mosaik/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-biology/mosaik/Manifest sci-biology/mosaik/files/mosaik-2.2.30-Wformat-security.patch sci-biology/mosaik/files/mosaik-2.2.30-fix-build-system.patch sci-biology/mosaik/files/mosaik-2.2.30-remove-platform-code.patch sci-biology/mosaik/mosaik-2.2.30.ebuild X-VCS-Directories: sci-biology/mosaik/files/ sci-biology/mosaik/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: b57cefc0475955dc9dce44855af6a5795a78a001 X-VCS-Branch: master Date: Sun, 4 Sep 2016 13:02:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0edf30d9-87b8-43e7-ad9f-87b97de08014 X-Archives-Hash: 4141235b830b2b0a6e24454374b732c5 commit: b57cefc0475955dc9dce44855af6a5795a78a001 Author: David Seifert gentoo org> AuthorDate: Sun Sep 4 12:59:47 2016 +0000 Commit: David Seifert gentoo org> CommitDate: Sun Sep 4 13:00:11 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b57cefc0 sci-biology/mosaik: Version bump to 2.2.30 * EAPI=6 * Make build system verbose * Honour CPPFLAGS and LDFLAGS * Handle LFS properly * Fix -Werror=format-security errors Package-Manager: portage-2.3.0 sci-biology/mosaik/Manifest | 1 + .../files/mosaik-2.2.30-Wformat-security.patch | 84 ++++++++ .../files/mosaik-2.2.30-fix-build-system.patch | 226 +++++++++++++++++++++ .../files/mosaik-2.2.30-remove-platform-code.patch | 10 + sci-biology/mosaik/mosaik-2.2.30.ebuild | 53 +++++ 5 files changed, 374 insertions(+) diff --git a/sci-biology/mosaik/Manifest b/sci-biology/mosaik/Manifest index 77f5aa8..de9954a 100644 --- a/sci-biology/mosaik/Manifest +++ b/sci-biology/mosaik/Manifest @@ -1,2 +1,3 @@ DIST Mosaik-1.0.1367-source.tar.bz2 8700231 SHA256 2a6ee1d25af835028b71f2518c6a00e929e64e7be6305183dfe0e242a015c750 SHA512 2100cd3b182a77be9a7411dce61ee51cb28b5e8e64282ec26e74d86c1e41d3254f7f62bd69f2ee4ad4d60c535e00e604b5f84f748f5c43ad4b0ac939cf8ed81a WHIRLPOOL cf25de6062201956068f02c339216d11fc1b473d68d7b4e9aed12d6f53ac5485995082a386b972d9545672346fac08f607bae34ac839bc8edf461b84e7430456 DIST Mosaik-1.0.1388-source.tar.bz2 8730164 SHA256 d6a8effa49adac617a388e2132aaf1a6b0679c783574d7df2cbd952a5f96e60c SHA512 cb6c4035cf9a6433b25800d841b74add3c88f06a87ac0261ffbba7be0528bcb02460fbbd0095656e60ca44c28ea249fe702bb0a4262d2ba64574a7e54a05a2bb WHIRLPOOL 5bf926898ab0f40f21858e511c366586d82450f4ef9af14e4add2e7e889be27a543afa23006de3bb2f49d2a43a81d32473958946a5cc08da0a26feee41c7a3e0 +DIST mosaik-2.2.30.tar.gz 4387062 SHA256 685dcc4cde1b56d19be37bfb238ae4cddeb25dced6da7b3880e68973957e940e SHA512 1acf534e6defc927fc22937a7bae6786e85ab7aa234b4209169f1267f1a9bd68415b441c6aed2e7cd667f694a562017ebc9457251958f77386259ffce9812b10 WHIRLPOOL 493291cc94cc5f95f5f1f62c3208f1c8dbb8cb0efcf6a21cca3e3963228f02ab0e59f11e00d8a9724a99733ffd290bc979262c0e553a1ee55c1adc9c392c3813 diff --git a/sci-biology/mosaik/files/mosaik-2.2.30-Wformat-security.patch b/sci-biology/mosaik/files/mosaik-2.2.30-Wformat-security.patch new file mode 100644 index 00000000..9f72718 --- /dev/null +++ b/sci-biology/mosaik/files/mosaik-2.2.30-Wformat-security.patch @@ -0,0 +1,84 @@ +- Fix incorrect printf format specifier (-Wformat) +* fann.c: In function ‘fann_print_connections’: +* fann.c:889:11: warning: format ‘%d’ expects argument of type ‘int’, but argument 2 has type ‘long int’ [-Wformat=] +* printf("L %3d / N %4d %s\n", layer_it - ann->first_layer, + +- Fix erroneous memset call +* md5.c: In function ‘MD5Final’: +* md5.c:152:26: warning: argument to ‘sizeof’ in ‘memset’ call is the same expression as the destination; did you mean to dereference it? [-Wsizeof-pointer-memaccess] +* memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */ + +--- a/fann-2.1.0/fann.c ++++ b/fann-2.1.0/fann.c +@@ -886,7 +886,7 @@ + neurons[ann->connections[i] - ann->first_layer->first_neuron] = (char)('A' + value); + } + } +- printf("L %3d / N %4d %s\n", layer_it - ann->first_layer, ++ printf("L %3ld / N %4ld %s\n", layer_it - ann->first_layer, + neuron_it - ann->first_layer->first_neuron, neurons); + } + } +@@ -987,12 +987,12 @@ + { + if(ann->network_type == FANN_NETTYPE_SHORTCUT) + { +- printf(" Hidden layer :%4d neurons, 0 bias\n", ++ printf(" Hidden layer :%4ld neurons, 0 bias\n", + layer_it->last_neuron - layer_it->first_neuron); + } + else + { +- printf(" Hidden layer :%4d neurons, 1 bias\n", ++ printf(" Hidden layer :%4ld neurons, 1 bias\n", + layer_it->last_neuron - layer_it->first_neuron - 1); + } + } +--- a/fann-2.1.0/fann_io.c ++++ b/fann-2.1.0/fann_io.c +@@ -174,7 +174,7 @@ + #endif + + /* Save network parameters */ +- fprintf(conf, "num_layers=%u\n", ann->last_layer - ann->first_layer); ++ fprintf(conf, "num_layers=%ld\n", ann->last_layer - ann->first_layer); + fprintf(conf, "learning_rate=%f\n", ann->learning_rate); + fprintf(conf, "connection_rate=%f\n", ann->connection_rate); + fprintf(conf, "network_type=%u\n", ann->network_type); +@@ -236,7 +236,7 @@ + for(layer_it = ann->first_layer; layer_it != ann->last_layer; layer_it++) + { + /* the number of neurons in the layers (in the last layer, there is always one too many neurons, because of an unused bias) */ +- fprintf(conf, "%u ", layer_it->last_neuron - layer_it->first_neuron); ++ fprintf(conf, "%ld ", layer_it->last_neuron - layer_it->first_neuron); + } + fprintf(conf, "\n"); + +@@ -316,14 +316,14 @@ + if(save_as_fixed) + { + /* save the connection "(source weight) " */ +- fprintf(conf, "(%u, %d) ", ++ fprintf(conf, "(%ld, %d) ", + connected_neurons[i] - first_neuron, + (int) floor((weights[i] * fixed_multiplier) + 0.5)); + } + else + { + /* save the connection "(source weight) " */ +- fprintf(conf, "(%u, " FANNPRINTF ") ", connected_neurons[i] - first_neuron, weights[i]); ++ fprintf(conf, "(%ld, " FANNPRINTF ") ", connected_neurons[i] - first_neuron, weights[i]); + } + #else + /* save the connection "(source weight) " */ +--- a/CommonSource/Utilities/md5.c ++++ b/CommonSource/Utilities/md5.c +@@ -149,7 +149,7 @@ + MD5Transform(ctx->buf, (uint32 *) ctx->in); + byteReverse((unsigned char *) ctx->buf, 4); + memcpy(digest, ctx->buf, 16); +- memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */ ++ memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */ + } + + diff --git a/sci-biology/mosaik/files/mosaik-2.2.30-fix-build-system.patch b/sci-biology/mosaik/files/mosaik-2.2.30-fix-build-system.patch new file mode 100644 index 00000000..00a9bec --- /dev/null +++ b/sci-biology/mosaik/files/mosaik-2.2.30-fix-build-system.patch @@ -0,0 +1,226 @@ +- Make build system verbose by default, as required by Gentoo policy + See also: https://bugs.gentoo.org/show_bug.cgi?id=429308 +- Remove CFLAGS and CXXFLAGS defaults +- Fix order of flags and honour CPPFLAGS for LFS support + and LDFLAGS for --as-needed, respectively + +--- a/CommonSource/DataStructures/Makefile ++++ b/CommonSource/DataStructures/Makefile +@@ -22,7 +22,7 @@ + + $(BUILT_OBJECTS): $(SOURCES) + @echo " * compiling" $(*F).cpp +- @$(CXX) -c -o $@ $(*F).cpp $(CXXFLAGS) $(PLATFORM_FLAGS) $(INCLUDES) ++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(PLATFORM_FLAGS) $(INCLUDES) -c -o $@ $(*F).cpp + + clean: + @echo "Cleaning up." +--- a/CommonSource/ExternalReadFormats/Makefile ++++ b/CommonSource/ExternalReadFormats/Makefile +@@ -22,7 +22,7 @@ + + $(BUILT_OBJECTS): $(SOURCES) + @echo " * compiling" $(*F).cpp +- @$(CXX) -c -o $@ $(*F).cpp $(CXXFLAGS) $(PLATFORM_FLAGS) $(INCLUDES) ++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(PLATFORM_FLAGS) $(INCLUDES) -c -o $@ $(*F).cpp + + clean: + @echo "Cleaning up." +--- a/CommonSource/MosaikReadFormat/Makefile ++++ b/CommonSource/MosaikReadFormat/Makefile +@@ -22,7 +22,7 @@ + + $(BUILT_OBJECTS): $(SOURCES) + @echo " * compiling" $(*F).cpp +- @$(CXX) -c -o $@ $(*F).cpp $(CXXFLAGS) $(PLATFORM_FLAGS) $(INCLUDES) ++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(PLATFORM_FLAGS) $(INCLUDES) -c -o $@ $(*F).cpp + + clean: + @echo "Cleaning up." +--- a/CommonSource/PairwiseAlignment/Makefile ++++ b/CommonSource/PairwiseAlignment/Makefile +@@ -26,11 +26,11 @@ + + $(BUILT_OBJECTS): $(SOURCES) + @echo " * compiling" $(*F).cpp +- @$(CXX) -c -o $@ $(*F).cpp $(CXXFLAGS) $(PLATFORM_FLAGS) $(INCLUDES) ++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(PLATFORM_FLAGS) $(INCLUDES) -c -o $@ $(*F).cpp + + $(CBUILT_OBJECTS): $(CSOURCES) + @echo " * compiling" $(*F).c +- @$(CC) -c -o $@ $(*F).c -O3 $(PLATFORM_FLAGS) $(INCLUDES) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(PLATFORM_FLAGS) $(INCLUDES) -c -o $@ $(*F).c + + clean: + @echo "Cleaning up." +--- a/CommonSource/Utilities/Makefile ++++ b/CommonSource/Utilities/Makefile +@@ -48,11 +48,11 @@ + + $(BUILT_OBJECTS): $(SOURCES) + @echo " * compiling" $(*F).cpp +- @$(CXX) -c -o $@ $(*F).cpp $(CXXFLAGS) $(PLATFORM_FLAGS) $(INCLUDES) ++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(PLATFORM_FLAGS) $(INCLUDES) -c -o $@ $(*F).cpp + + $(CBUILT_OBJECTS): $(CSOURCES) + @echo " * compiling" $(*F).c +- @$(CC) -c -o $@ $(*F).c -O3 -w -DSQLITE_OMIT_LOAD_EXTENSION $(PLATFORM_FLAGS) $(INCLUDES) ++ $(CC) $(CFLAGS) $(CPPFLAGS) -DSQLITE_OMIT_LOAD_EXTENSION $(PLATFORM_FLAGS) $(INCLUDES) -c -o $@ $(*F).c + + clean: + @echo "Cleaning up." +--- a/fann-2.1.0/Makefile ++++ b/fann-2.1.0/Makefile +@@ -12,7 +12,7 @@ + + $(CBUILT_OBJECTS): $(CSOURCES) + @echo " * compiling" $(*F).c +- @$(CC) -c -o $@ $(*F).c -O3 $(PLATFORM_FLAGS) -I$(INCLUDES) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(PLATFORM_FLAGS) -I$(INCLUDES) -c -o $@ $(*F).c + + clean: + @echo "Cleaning up." +--- a/Makefile ++++ b/Makefile +@@ -4,8 +4,8 @@ + # ========================== + + # define our object and binary directories +-export OBJ_DIR = ../obj +-export BIN_DIR = ../bin ++export OBJ_DIR = ./obj ++export BIN_DIR = ./bin + + # define our common source directories + export ASSEMBLY_DIR = CommonSource/AssemblyFormats +@@ -16,20 +16,6 @@ + export PAIRWISE_DIR = CommonSource/PairwiseAlignment + export UTILITIES_DIR = CommonSource/Utilities + +-# define some default flags +-FLAGS = -Wall -Wno-char-subscripts -ansi -O3 +-#FLAGS = -Wall -Wno-char-subscripts -ansi -g -D VERBOSE_DEBUG #gdb debugging +-#FLAGS = -Wall -Wno-char-subscripts -ansi -O3 -D VERBOSE_DEBUG #enables verbose debugging +-CFLAGS = +-CXXFLAGS = +-#CXXFLAGS = -ansi -pedantic -Wextra -Weffc++ +-CFLAGS += $(FLAGS) +-CXXFLAGS += $(FLAGS) +-export CFLAGS +-export CXXFLAGS +-#export LDFLAGS = -Wl +-export CXX ?= g++ +- + # define our platform + export BLD_PLATFORM ?= linux + include includes/$(BLD_PLATFORM).inc +--- a/MosaikAligner/Makefile ++++ b/MosaikAligner/Makefile +@@ -68,11 +68,11 @@ + + $(PROGRAM): $(BUILT_OBJECTS) $(EXT_OBJECTS) + @echo " * linking $(PROGRAM)" +- @$(CXX) $(LDFLAGS) $(CXXFLAGS) $(PLATFORM_FLAGS) -o $(TD)$(BIN_DIR)/$@ $^ $(LIBS) ++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $(PLATFORM_FLAGS) -o $(TD)$(BIN_DIR)/$@ $^ $(LIBS) + + $(BUILT_OBJECTS): $(SOURCES) + @echo " * compiling" $(*F).cpp +- @$(CXX) -c -o $@ $(*F).cpp $(CXXFLAGS) $(PLATFORM_FLAGS) $(INCLUDES) ++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(PLATFORM_FLAGS) $(INCLUDES) -c -o $@ $(*F).cpp + + $(EXT_OBJECTS): + @$(MAKE) --no-print-directory -C $(TD)$(DATA_STRUCT_DIR) +--- a/MosaikBuild/Makefile ++++ b/MosaikBuild/Makefile +@@ -26,11 +26,11 @@ + + $(PROGRAM): $(BUILT_OBJECTS) $(EXT_OBJECTS) + @echo " * linking $(PROGRAM)" +- @$(CXX) $(LDFLAGS) $(CXXFLAGS) $(PLATFORM_FLAGS) -o $(TD)$(BIN_DIR)/$@ $^ $(LIBS) ++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $(PLATFORM_FLAGS) -o $(TD)$(BIN_DIR)/$@ $^ $(LIBS) + + $(BUILT_OBJECTS): $(SOURCES) + @echo " * compiling" $(*F).cpp +- @$(CXX) -c -o $@ $(*F).cpp $(CXXFLAGS) $(PLATFORM_FLAGS) $(INCLUDES) ++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(PLATFORM_FLAGS) $(INCLUDES) -c -o $@ $(*F).cpp + + $(EXT_OBJECTS): + @$(MAKE) --no-print-directory -C $(TD)$(DATA_STRUCT_DIR) +--- a/MosaikJump/Makefile ++++ b/MosaikJump/Makefile +@@ -26,11 +26,11 @@ + + $(PROGRAM): $(BUILT_OBJECTS) $(EXT_OBJECTS) + @echo " * linking $(PROGRAM)" +- @$(CXX) $(LDFLAGS) $(CXXFLAGS) $(PLATFORM_FLAGS) -o $(TD)$(BIN_DIR)/$@ $^ $(LIBS) ++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $(PLATFORM_FLAGS) -o $(TD)$(BIN_DIR)/$@ $^ $(LIBS) + + $(BUILT_OBJECTS): $(SOURCES) + @echo " * compiling" $(*F).cpp +- @$(CXX) -c -o $@ $(*F).cpp $(CXXFLAGS) $(PLATFORM_FLAGS) $(INCLUDES) ++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(PLATFORM_FLAGS) $(INCLUDES) -c -o $@ $(*F).cpp + + $(EXT_OBJECTS): + @$(MAKE) --no-print-directory -C $(TD)$(MOSAIKREAD_DIR) +--- a/MosaikText/Makefile ++++ b/MosaikText/Makefile +@@ -26,11 +26,11 @@ + + $(PROGRAM): $(BUILT_OBJECTS) $(EXT_OBJECTS) + @echo " * linking $(PROGRAM)" +- @$(CXX) $(LDFLAGS) $(CXXFLAGS) $(PLATFORM_FLAGS) -o $(TD)$(BIN_DIR)/$@ $^ $(LIBS) ++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $(PLATFORM_FLAGS) -o $(TD)$(BIN_DIR)/$@ $^ $(LIBS) + + $(BUILT_OBJECTS): $(SOURCES) + @echo " * compiling" $(*F).cpp +- @$(CXX) -c -o $@ $(*F).cpp $(CXXFLAGS) $(PLATFORM_FLAGS) $(INCLUDES) ++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(PLATFORM_FLAGS) $(INCLUDES) -c -o $@ $(*F).cpp + + $(EXT_OBJECTS): + @$(MAKE) --no-print-directory -C $(TD)$(MOSAIKREAD_DIR) +--- a/networkFile/retrainCode/attachXC/Makefile ++++ b/networkFile/retrainCode/attachXC/Makefile +@@ -3,12 +3,11 @@ + # (c) 2012 Wan-Ping Lee + # ========================== + +-FLAGS = -Wall -O3 + + + all: xc_pe.cpp xc_se.cpp +- @$(CXX) $(FLAGS) xc_pe.cpp -o xc_pe +- @$(CXX) $(FLAGS) xc_se.cpp -o xc_se ++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) xc_pe.cpp -o xc_pe ++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) xc_se.cpp -o xc_se + + .PHONY: all + +--- a/networkFile/retrainCode/trainNetwork/Makefile ++++ b/networkFile/retrainCode/trainNetwork/Makefile +@@ -5,8 +5,6 @@ + + OBJ_DIR = ./obj + +-FLAGS = -Wall -O3 +-CFLAGS = -O3 + FANN=../../../fann-2.1.0 + + SOURCES = sam_parser_float.cpp parameter_parser_float.cpp mq_train_float.cpp +@@ -15,12 +13,12 @@ + all: $(FANN)/floatfann.c $(SOURCES) + @test -d $(OBJ_DIR) || mkdir $(OBJ_DIR) + @echo " * compiling ......" +- @$(CC) $(CFLAGS) -c -o $(OBJ_DIR)/floatfann.o $(FANN)/floatfann.c -I$(FANN)/include +- @$(CXX) -c $(FLAGS) -o $(OBJ_DIR)/sam_parser_float.o sam_parser_float.cpp +- @$(CXX) -c $(FLAGS) -o $(OBJ_DIR)/parameter_parser_float.o parameter_parser_float.cpp +- @$(CXX) -c $(FLAGS) -o $(OBJ_DIR)/mq_train_float.o mq_train_float.cpp -I$(FANN)/include ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $(OBJ_DIR)/floatfann.o $(FANN)/floatfann.c -I$(FANN)/include ++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $(OBJ_DIR)/sam_parser_float.o sam_parser_float.cpp ++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $(OBJ_DIR)/parameter_parser_float.o parameter_parser_float.cpp ++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $(OBJ_DIR)/mq_train_float.o mq_train_float.cpp -I$(FANN)/include + @echo " * linking ......" +- @$(CXX) $(FLAGS) $(OBJ_DIR)/*.o -o $(PROGRAM) ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJ_DIR)/*.o -o $(PROGRAM) + + .PHONY: all + diff --git a/sci-biology/mosaik/files/mosaik-2.2.30-remove-platform-code.patch b/sci-biology/mosaik/files/mosaik-2.2.30-remove-platform-code.patch new file mode 100644 index 00000000..8573573 --- /dev/null +++ b/sci-biology/mosaik/files/mosaik-2.2.30-remove-platform-code.patch @@ -0,0 +1,10 @@ +- Remove macro for enabling large file support, this is better handled at an + ebuild level, where the LFS flags can be handled for multiple architectures +- Remove static flag, which is contrary to Gentoo policy + +--- a/includes/linux.inc ++++ b/includes/linux.inc +@@ -1,2 +1,2 @@ + # define our processor specific flags +-export PLATFORM_FLAGS = -D_FILE_OFFSET_BITS=64 -static ++export PLATFORM_FLAGS = diff --git a/sci-biology/mosaik/mosaik-2.2.30.ebuild b/sci-biology/mosaik/mosaik-2.2.30.ebuild new file mode 100644 index 00000000..ab1d891 --- /dev/null +++ b/sci-biology/mosaik/mosaik-2.2.30.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit flag-o-matic toolchain-funcs vcs-snapshot + +DESCRIPTION="A reference-guided aligner for next-generation sequencing technologies" +HOMEPAGE="https://github.com/wanpinglee/MOSAIK" +SRC_URI="https://github.com/wanpinglee/MOSAIK/archive/5c25216d3522d6a33e53875cd76a6d65001e4e67.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +IUSE="" +KEYWORDS="~amd64 ~x86" + +DEPEND="" +RDEPEND="" + +S="${WORKDIR}/${P}/src" + +PATCHES=( + "${FILESDIR}/${P}-remove-platform-code.patch" + "${FILESDIR}/${P}-fix-build-system.patch" + "${FILESDIR}/${P}-Wformat-security.patch" +) + +src_configure() { + # readd default warning flags from build system + append-flags -Wall -Wno-char-subscripts + append-lfs-flags + export BLD_PLATFORM=linux +} + +src_compile() { + emake \ + CC=$(tc-getCC) \ + CXX=$(tc-getCXX) \ + CFLAGS="${CFLAGS}" \ + CXXFLAGS="${CXXFLAGS}" \ + CPPFLAGS="${CPPFLAGS}" \ + LDFLAGS="${LDFLAGS}" +} + +src_install() { + dobin bin/Mosaik* + + dodoc ../README + + insinto /usr/share/${PN}/examples + doins -r ../demo/. +}