From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 252091381F3 for ; Tue, 23 Jul 2013 17:51:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B29F2E0946; Tue, 23 Jul 2013 17:51:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 32FFEE0946 for ; Tue, 23 Jul 2013 17:51:58 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 05FD833E746 for ; Tue, 23 Jul 2013 17:51:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id A2757E5458 for ; Tue, 23 Jul 2013 17:51:55 +0000 (UTC) From: "Nicolas Bock" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nicolas Bock" Message-ID: <1374601856.198e6ae019c8d45ac96f2bcd9397e5b8a6fa990c.nicolasbock@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sys-cluster/charm/, sys-cluster/charm/files/ X-VCS-Repository: proj/sci X-VCS-Files: sys-cluster/charm/ChangeLog sys-cluster/charm/charm-6.5.1.ebuild sys-cluster/charm/files/charm-6.5.1-cleanup-config.patch X-VCS-Directories: sys-cluster/charm/ sys-cluster/charm/files/ X-VCS-Committer: nicolasbock X-VCS-Committer-Name: Nicolas Bock X-VCS-Revision: 198e6ae019c8d45ac96f2bcd9397e5b8a6fa990c X-VCS-Branch: master Date: Tue, 23 Jul 2013 17:51:55 +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: 0626909d-d874-4fa5-8757-8d900f1ebf1b X-Archives-Hash: b9a6fd0df31bf24790eab24cd798482d commit: 198e6ae019c8d45ac96f2bcd9397e5b8a6fa990c Author: Nicolas Bock gmail com> AuthorDate: Tue Jul 23 17:50:56 2013 +0000 Commit: Nicolas Bock gmail com> CommitDate: Tue Jul 23 17:50:56 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=198e6ae0 sys-cluster/charm-6.5.1: Added patch to fix config.h The added patch addresses bug #252, https://charm.cs.illinois.edu/redmine/issues/252 until upstream fixes this problem. Package-Manager: portage-2.2.0_alpha188 --- sys-cluster/charm/ChangeLog | 6 +++ sys-cluster/charm/charm-6.5.1.ebuild | 2 + .../charm/files/charm-6.5.1-cleanup-config.patch | 58 ++++++++++++++++++++++ 3 files changed, 66 insertions(+) diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog index cb0fdfc..60a0d00 100644 --- a/sys-cluster/charm/ChangeLog +++ b/sys-cluster/charm/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 23 Jul 2013; Nicolas Bock + +files/charm-6.5.1-cleanup-config.patch, charm-6.5.1.ebuild: + sys-cluster/charm-6.5.1: Added patch to fix config.h The added patch + addresses bug #252, https://charm.cs.illinois.edu/redmine/issues/252 until + upstream fixes this problem. + 03 Jul 2013; Nicolas Bock metadata.xml: Beautification. diff --git a/sys-cluster/charm/charm-6.5.1.ebuild b/sys-cluster/charm/charm-6.5.1.ebuild index 5172428..5405952 100644 --- a/sys-cluster/charm/charm-6.5.1.ebuild +++ b/sys-cluster/charm/charm-6.5.1.ebuild @@ -88,6 +88,8 @@ src_prepare() { # Fix QA notice. Filed report with upstream. append-cflags -DALLOCA_H + + epatch "${FILESDIR}/charm-6.5.1-cleanup-config.patch" } src_compile() { diff --git a/sys-cluster/charm/files/charm-6.5.1-cleanup-config.patch b/sys-cluster/charm/files/charm-6.5.1-cleanup-config.patch new file mode 100644 index 0000000..89834e4 --- /dev/null +++ b/sys-cluster/charm/files/charm-6.5.1-cleanup-config.patch @@ -0,0 +1,58 @@ +From 04639c20479564a2b5e662d90de953e3f37b0360 Mon Sep 17 00:00:00 2001 +From: Nicolas Bock +Date: Tue, 23 Jul 2013 11:19:22 -0600 +Subject: [PATCH] Commented out colliding defines in conv-autoconfig.h + +The colliding defines (bug #252) are commented out in configure. +--- + src/scripts/configure | 5 +++++ + src/scripts/configure.in | 3 +++ + 2 files changed, 8 insertions(+) + +diff --git a/src/scripts/configure b/src/scripts/configure +index 2629834..03dc778 100755 +--- a/src/scripts/configure ++++ b/src/scripts/configure +@@ -1703,6 +1703,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_config_headers="$ac_config_headers conv-autoconfig.h" + + ++ac_config_commands="$ac_config_commands config-cleanup" ++ ++ + CHARMINC="." + test -r ./conv-config.sh && . ./conv-config.sh + +@@ -5201,6 +5204,7 @@ for ac_config_target in $ac_config_targets + do + case $ac_config_target in + "conv-autoconfig.h") CONFIG_HEADERS="$CONFIG_HEADERS conv-autoconfig.h" ;; ++ "config-cleanup") CONFIG_COMMANDS="$CONFIG_COMMANDS config-cleanup" ;; + "libs/ck-libs/ampi/ampiCC") CONFIG_FILES="$CONFIG_FILES libs/ck-libs/ampi/ampiCC" ;; + "libs/ck-libs/ampi/ampirun") CONFIG_FILES="$CONFIG_FILES libs/ck-libs/ampi/ampirun" ;; + "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; +@@ -5754,6 +5758,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} + + + case $ac_file$ac_mode in ++ "config-cleanup":C) sed -i -e 's:^#define\s\+PACKAGE://&:' conv-autoconfig.h ;; + "default":C) chmod +x libs/ck-libs/ampi/ampiCC libs/ck-libs/ampi/ampirun + ;; + +diff --git a/src/scripts/configure.in b/src/scripts/configure.in +index 69e5318..2cb18b6 100644 +--- a/src/scripts/configure.in ++++ b/src/scripts/configure.in +@@ -3,6 +3,9 @@ AC_INIT(./Makefile) + + AC_CONFIG_HEADER(conv-autoconfig.h) + ++AC_CONFIG_COMMANDS([config-cleanup], ++ [sed -i -e 's:^#define\s\+PACKAGE://&:' conv-autoconfig.h]) ++ + CHARMINC="." + test -r ./conv-config.sh && . ./conv-config.sh + +-- +1.8.1.5 +