[med-svn] r2690 - in trunk/packages/maq/trunk/debian: . patches
plessy at alioth.debian.org
plessy at alioth.debian.org
Sun Nov 16 14:13:56 UTC 2008
Author: plessy
Date: 2008-11-16 14:13:56 +0000 (Sun, 16 Nov 2008)
New Revision: 2690
Added:
trunk/packages/maq/trunk/debian/patches/20_prevent_-64_option.patch
Modified:
trunk/packages/maq/trunk/debian/changelog
trunk/packages/maq/trunk/debian/patches/10_prevent_-64_option.patch
trunk/packages/maq/trunk/debian/patches/series
Log:
Refactored the removal of -m64 option, and uploaded.
Modified: trunk/packages/maq/trunk/debian/changelog
===================================================================
--- trunk/packages/maq/trunk/debian/changelog 2008-11-15 23:04:25 UTC (rev 2689)
+++ trunk/packages/maq/trunk/debian/changelog 2008-11-16 14:13:56 UTC (rev 2690)
@@ -1,6 +1,6 @@
-maq (0.7.1-1) UNRELEASED; urgency=low
+maq (0.7.1-1) unstable; urgency=low
- * New upstream release 0.7.1
+ * New upstream release 0.7.1 (Closes: 505820)
- Accepts reads shorter than 127 bp (63 bp before).
- .map alignment changes and not backward-compatible.
- Reversion to short reads possible with --enable-shortreads.
@@ -12,16 +12,17 @@
- The mapcheck command can optionally dump additional information.
* debian/patches:
- 20_perl_path.patch deleted because accepted upstream.
- - 10_prevent_-64_option.patch deleted because it seems to build fine
- without.
- - Directory and quilt build-dependancy kept to ease possible QA work.
+ - 10_prevent_-64_option.patch reorganised to only modify configure.ac
+ and forwarded upstream.
+ - 20_prevent_-64_option.patch changes configure and can be regenerated
+ by running autoreconf.
* debian/control: typo corrected in short description (Closes: #492979)
* debian/reference: BibTeX reference downloaded from
http://genome.cshlp.org/citmgr?gca=genome;18/11/1851 with abstract
removed because it is a copyrighted work.
* debian/README.Sources renamed README.source to comply with Policy.
- -- Charles Plessy <plessy at debian.org> Fri, 14 Nov 2008 20:17:11 +0900
+ -- Charles Plessy <plessy at debian.org> Sun, 16 Nov 2008 22:52:04 +0900
maq (0.6.7-1) unstable; urgency=low
Modified: trunk/packages/maq/trunk/debian/patches/10_prevent_-64_option.patch
===================================================================
--- trunk/packages/maq/trunk/debian/patches/10_prevent_-64_option.patch 2008-11-15 23:04:25 UTC (rev 2689)
+++ trunk/packages/maq/trunk/debian/patches/10_prevent_-64_option.patch 2008-11-16 14:13:56 UTC (rev 2690)
@@ -1,51 +1,20 @@
---- maq-0.6.7.orig/configure
-+++ maq-0.6.7/configure
-@@ -3600,7 +3600,7 @@
- fi
-
- case $is_uni in
-- 1) CFLAGS="-m64"
-+ 1) CFLAGS=""
-
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -3643,7 +3643,7 @@
- fi
-
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext;;
-- 0) CFLAGS="-m64"
-+ 0) CFLAGS=""
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -3676,7 +3676,7 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-- ext_CFLAGS="-m64"
-+ ext_CFLAGS=""
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -3687,9 +3687,9 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext;;
+Author: Charles Plessy
+Forwarded: https://sourceforge.net/tracker/index.php?func=detail&aid=2298601&group_id=191815&atid=938895
+Reviewed: http://lists.debian.org/debian-mentors/2008/11/msg00189.html
+Description: -m64 is not necessary except for building "multiarch" versions,
+ which is probably not the original goal anyway.
+License: Same as Maq
+--- a/configure.ac
++++ b/configure.ac
+@@ -23,10 +23,7 @@ case "${host_cpu}-${host_os}" in
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM], [ext_CFLAGS="-m64"], []);;
esac;;
*)
-- { echo "$as_me:$LINENO: checking if gcc accepts -m64" >&5
--echo $ECHO_N "checking if gcc accepts -m64... $ECHO_C" >&6; }
+- AC_MSG_CHECKING([if gcc accepts -m64])
- CFLAGS="-m64"
-+ { echo "$as_me:$LINENO: checking if gcc accepts -m64 ... this is ignored on Debian GNU/Linux" >&5
-+echo $ECHO_N "checking if gcc accepts -m64... $ECHO_C ... this is ignored on Debian GNU/Linux" >&6; }
-+ CFLAGS=""
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -3722,7 +3722,7 @@
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-- ext_CFLAGS="-m64"; { echo "$as_me:$LINENO: result: yes" >&5
-+ ext_CFLAGS=""; { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
- else
- echo "$as_me: failed program was:" >&5
+- AC_COMPILE_IFELSE([AC_LANG_PROGRAM], [ext_CFLAGS="-m64"; AC_MSG_RESULT([yes])],
+- [ext_CFLAGS="-D_FILE_OFFSET_BITS=64"; AC_MSG_RESULT([no])]);;
++ ext_CFLAGS="-D_FILE_OFFSET_BITS=64";;
+ esac
+ AC_ARG_ENABLE(experimental, [ --enable-experimental enable experimental features],
+ [ext_CFLAGS="${ext_CFLAGS} -DMAQ_SHOW_EXPERIMENTAL"], [])
Added: trunk/packages/maq/trunk/debian/patches/20_prevent_-64_option.patch
===================================================================
--- trunk/packages/maq/trunk/debian/patches/20_prevent_-64_option.patch (rev 0)
+++ trunk/packages/maq/trunk/debian/patches/20_prevent_-64_option.patch 2008-11-16 14:13:56 UTC (rev 2690)
@@ -0,0 +1,65 @@
+Author: autoreconf
+Forwarded: no
+Description: autoreconf 2.62 ran after applying 10_prevent_-64_option.patch
+ By applying this patch, we do not need to do some autoreconf magic at
+ build time.
+License: probably not copyrightable.
+diff --git a/configure b/configure
+index 240b0ff..568a609 100755
+--- a/configure
++++ b/configure
+@@ -3822,53 +3822,7 @@ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext;;
+ esac;;
+ *)
+- { $as_echo "$as_me:$LINENO: checking if gcc accepts -m64" >&5
+-$as_echo_n "checking if gcc accepts -m64... " >&6; }
+- CFLAGS="-m64"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-int
+-main ()
+-{
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ext_CFLAGS="-m64"; { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ext_CFLAGS="-D_FILE_OFFSET_BITS=64"; { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext;;
++ ext_CFLAGS="-D_FILE_OFFSET_BITS=64";;
+ esac
+ # Check whether --enable-experimental was given.
+ if test "${enable_experimental+set}" = set; then
Modified: trunk/packages/maq/trunk/debian/patches/series
===================================================================
--- trunk/packages/maq/trunk/debian/patches/series 2008-11-15 23:04:25 UTC (rev 2689)
+++ trunk/packages/maq/trunk/debian/patches/series 2008-11-16 14:13:56 UTC (rev 2690)
@@ -1 +1,2 @@
10_prevent_-64_option.patch
+20_prevent_-64_option.patch
More information about the debian-med-commit
mailing list