From: Kevin M. Rosenberg Date: Wed, 21 Mar 2018 07:51:27 +0000 (+0000) Subject: Finish build for 6.0.1 X-Git-Tag: v6.0.2~7 X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=commitdiff_plain;h=5abb3194d9903b561f910139a534b23598ef3e17 Finish build for 6.0.1 --- diff --git a/debian/changelog b/debian/changelog index 93afb97..1ff1adb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ctsim (6.0.1-1) unstable; urgency=low + + * Add missing autoconf file in scripts/. + + -- Kevin M. Rosenberg Wed, 21 Mar 2018 01:27:19 -0600 + ctsim (6.0.0-2) unstable; urgency=low * Merge patches and packaging changes kindly make by Debian Med Team diff --git a/debian/control b/debian/control index 2f0602f..b661a28 100644 --- a/debian/control +++ b/debian/control @@ -11,14 +11,8 @@ Build-Depends: debhelper (>= 10), libglu1-mesa-dev, libwxgtk3.0-dev, ctn-dev, - libpng-dev, - libglib2.0-dev, - libgtk2.0-dev, - autotools-dev, - dh-autoreconf -Standards-Version: 3.9.8 -Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/ctsim.git -Vcs-Git: https://anonscm.debian.org/git/debian-med/ctsim.git + libpng-dev +Standards-Version: 4.1.3 Homepage: http://www.ctsim.org Package: ctsim diff --git a/debian/cvsbp-prepare.sh b/debian/cvsbp-prepare.sh new file mode 100755 index 0000000..143c4d7 --- /dev/null +++ b/debian/cvsbp-prepare.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +set -e # abort on error + +# Clean checked out CVS directory +rm -f debian/upload.sh debian/make-upstream.sh debian/make-debian.sh +rm -f do-autoconf +rm -f `find . -type f -name .cvsignore` +rm -rf images doc stamp-h.in build-stamp configure-stamp +rm -f debian/cvsbp-prepare.sh + + diff --git a/debian/make-upstream.sh b/debian/make-upstream.sh new file mode 100755 index 0000000..be11139 --- /dev/null +++ b/debian/make-upstream.sh @@ -0,0 +1,5 @@ +#!/bin/bash -e + +bups ctsim -d"-name doc -or -name images" + +exit 0 diff --git a/debian/rules b/debian/rules index 77aa33f..8df6f33 100755 --- a/debian/rules +++ b/debian/rules @@ -3,14 +3,15 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: - dh $@ --with autotools-dev --with autoreconf + dh $@ --with autoreconf override_dh_auto_clean: dh_auto_clean rm -f helical/sample-helical.sh tools/sample-ctsim.sh override_dh_auto_configure: - dh_auto_configure -- --with-ctn -with-x --without-lam + dh_auto_configure + #dh_auto_configure -- --with-ctn -with-x --without-lam override_dh_installdocs-indep: (cd docs; tar xzf html.tar.gz) diff --git a/scripts/ax_gcc_x86_avx_xgetbv.m4 b/scripts/ax_gcc_x86_avx_xgetbv.m4 new file mode 100644 index 0000000..2b38bbb --- /dev/null +++ b/scripts/ax_gcc_x86_avx_xgetbv.m4 @@ -0,0 +1,79 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_gcc_x86_avx_xgetbv.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_GCC_X86_AVX_XGETBV +# +# DESCRIPTION +# +# On later x86 processors with AVX SIMD support, with gcc or a compiler +# that has a compatible syntax for inline assembly instructions, run a +# small program that executes the xgetbv instruction with input OP. This +# can be used to detect if the OS supports AVX instruction usage. +# +# On output, the values of the eax and edx registers are stored as +# hexadecimal strings as "eax:edx" in the cache variable +# ax_cv_gcc_x86_avx_xgetbv. +# +# If the xgetbv instruction fails (because you are running a +# cross-compiler, or because you are not using gcc, or because you are on +# a processor that doesn't have this instruction), +# ax_cv_gcc_x86_avx_xgetbv_OP is set to the string "unknown". +# +# This macro mainly exists to be used in AX_EXT. +# +# LICENSE +# +# Copyright (c) 2013 Michael Petch +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 2 + +AC_DEFUN([AX_GCC_X86_AVX_XGETBV], +[AC_REQUIRE([AC_PROG_CC]) +AC_LANG_PUSH([C]) +AC_CACHE_CHECK(for x86-AVX xgetbv $1 output, ax_cv_gcc_x86_avx_xgetbv_$1, + [AC_RUN_IFELSE([AC_LANG_PROGRAM([#include ], [ + int op = $1, eax, edx; + FILE *f; + /* Opcodes for xgetbv */ + __asm__ __volatile__ (".byte 0x0f, 0x01, 0xd0" + : "=a" (eax), "=d" (edx) + : "c" (op)); + f = fopen("conftest_xgetbv", "w"); if (!f) return 1; + fprintf(f, "%x:%x\n", eax, edx); + fclose(f); + return 0; +])], + [ax_cv_gcc_x86_avx_xgetbv_$1=`cat conftest_xgetbv`; rm -f conftest_xgetbv], + [ax_cv_gcc_x86_avx_xgetbv_$1=unknown; rm -f conftest_xgetbv], + [ax_cv_gcc_x86_avx_xgetbv_$1=unknown])]) +AC_LANG_POP([C]) +])