r44554 - in /packages/atlas/branches/atlas-3.9/trunk/debian: changelog patches/10_s390.diff patches/17_hppa.diff patches/18_alpha.diff patches/20_armel.diff patches/21_mips2.diff patches/22_sh.diff rules
sylvestre at users.alioth.debian.org
sylvestre at users.alioth.debian.org
Sat Mar 10 09:21:05 UTC 2012
Author: sylvestre
Date: Sat Mar 10 09:21:04 2012
New Revision: 44554
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44554
Log:
Switch to dpkg-source 3.0 (quilt) format
Removed:
packages/atlas/branches/atlas-3.9/trunk/debian/patches/10_s390.diff
packages/atlas/branches/atlas-3.9/trunk/debian/patches/17_hppa.diff
packages/atlas/branches/atlas-3.9/trunk/debian/patches/18_alpha.diff
packages/atlas/branches/atlas-3.9/trunk/debian/patches/20_armel.diff
packages/atlas/branches/atlas-3.9/trunk/debian/patches/21_mips2.diff
packages/atlas/branches/atlas-3.9/trunk/debian/patches/22_sh.diff
Modified:
packages/atlas/branches/atlas-3.9/trunk/debian/changelog
packages/atlas/branches/atlas-3.9/trunk/debian/rules
Modified: packages/atlas/branches/atlas-3.9/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/branches/atlas-3.9/trunk/debian/changelog?rev=44554&op=diff
==============================================================================
--- packages/atlas/branches/atlas-3.9/trunk/debian/changelog (original)
+++ packages/atlas/branches/atlas-3.9/trunk/debian/changelog Sat Mar 10 09:21:04 2012
@@ -1,9 +1,10 @@
-atlas3.9 (3.9.36-1) experimental; urgency=low
+atlas3.9 (3.9.69-1) experimental; urgency=low
* New upstream major release (developer release)
* Packages + path renamed
-
- -- Sylvestre Ledru <sylvestre at debian.org> Tue, 07 Sep 2010 23:21:30 +0200
+ * Switch to dpkg-source 3.0 (quilt) format
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Sat, 10 Mar 2012 10:12:51 +0100
atlas (3.8.3-30) unstable; urgency=low
Modified: packages/atlas/branches/atlas-3.9/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/branches/atlas-3.9/trunk/debian/rules?rev=44554&op=diff
==============================================================================
--- packages/atlas/branches/atlas-3.9/trunk/debian/rules (original)
+++ packages/atlas/branches/atlas-3.9/trunk/debian/rules Sat Mar 10 09:21:04 2012
@@ -7,86 +7,28 @@
DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-CHECK_EXTENSIONS=""
-
# Pointer bitwidth (default value)
MODE_BITWIDTH = 32
-
-# This is a data structure (machnam) coming from the C code:
-# CONFIG/include/atlconf.h
-# It defines the list of archs with preset options:
-# {"UNKNOWN", "POWER3", "POWER4", "POWER5", "PPCG4", "PPCG5",
-# "P5", "P5MMX", "PPRO", "PII", "PIII", "PM", "CoreSolo",
-# "CoreDuo", "Core2Solo", "Core2", "Corei7", "P4", "P4E", "Efficeon", "K7",
-# "HAMMER", "AMD64K10h", "UNKNOWNx86", "IA64Itan", "IA64Itan2",
-# "USI", "USII", "USIII", "USIV", "UnknownUS", "MIPSR1xK", "MIPSICE9"};
-# This is used by the flag -A with the position in the array
-# Don't forget, C format, the array starts from 0
-
-# About CPU extensions, it is defined in the same file
-# the datastructure ISAXNAM contains:
-# {"", "AltiVec", "SSE3", "SSE2", "SSE1", "3DNow"};
-# For example, for the activation of SSE2, we need both SSE2 (Number 3)
-# and SSE1 (Number 4)
-# >>> ISA=0
-# >>> ISA = ISA | (1<<3)
-# >>> ISA = ISA | (1<<4)
-# 24
-# So, to activate the SSE2, -V 24 should be used to the configure
-# A list can be found by running:
-# make xprint_enums ; ./xprint_enums
# 0 means Unknown CPU. Leave Atlas find out
# 1 means no extension
ARCHS=base_0_1
-DEB_SHLIBDEPS_INCLUDE_libatlas3.9gf-base := $(CURDIR)/debian/libatlas3gf-base/usr/lib/atlas-base-3.9/:$(CURDIR)/debian/libatlas3gf-base/usr/lib/atlas-base-3.9/atlas/
-
-# ifeq ($(DEB_HOST_ARCH_CPU),i386)
-# ifneq ($(DEB_BUILD_ARCH),kfreebsd-i386)
-# CHECK_EXTENSIONS=sse3
-# endif
-# ARCHS = base_10_1 sse_10_16 sse2_17_24 sse3_17_28 core2sse3_14_28
-# # 10 = PII 17 = P4
-# DEB_SHLIBDEPS_INCLUDE_libatlas3gf-sse = $(CURDIR)/debian/libatlas3gf-sse/usr/lib/atlas-sse:$(CURDIR)/debian/libatlas3gf-sse/usr/lib/atlas-sse/atlas
-# DEB_SHLIBDEPS_INCLUDE_libatlas3gf-sse2 = $(CURDIR)/debian/libatlas3gf-sse2/usr/lib/atlas-sse2:$(CURDIR)/debian/libatlas3gf-sse2/usr/lib/atlas-sse2/atlas
-# DEB_SHLIBDEPS_INCLUDE_libatlas3gf-sse3 = $(CURDIR)/debian/libatlas3gf-sse3/usr/lib/atlas-sse3:$(CURDIR)/debian/libatlas3gf-sse3/usr/lib/atlas-sse3/atlas
-# DEB_SHLIBDEPS_INCLUDE_libatlas3gf-core2sse3 = $(CURDIR)/debian/libatlas3gf-core2sse3/usr/lib/atlas-core2sse3:$(CURDIR)/debian/libatlas3gf-core2sse3/usr/lib/atlas-core2sse3/atlas
-# endif
+DEB_SHLIBDEPS_INCLUDE_libatlas3gf-base := $(CURDIR)/debian/libatlas3gf-base/usr/lib/atlas-base/:$(CURDIR)/debian/libatlas3gf-base/usr/lib/atlas-base/atlas/
# # see what do we do with the amd64 / intel 64
ifeq ($(DEB_HOST_ARCH_CPU),amd64)
# # 64 bits
MODE_BITWIDTH = 64
-# DEB_SHLIBDEPS_INCLUDE_libatlas3gf-amd64sse3 = $(CURDIR)/debian/libatlas3gf-amd64sse3/usr/lib/atlas-amd64sse3:$(CURDIR)/debian/libatlas3gf-amd64sse3/usr/lib/atlas-amd64sse3/atlas
-# DEB_SHLIBDEPS_INCLUDE_libatlas3gf-core2sse3 = $(CURDIR)/debian/libatlas3gf-core2sse3/usr/lib/atlas-core2sse3:$(CURDIR)/debian/libatlas3gf-core2sse3/usr/lib/atlas-core2sse3/atlas
-# DEB_SHLIBDEPS_INCLUDE_libatlas3gf-corei7sse3 = $(CURDIR)/debian/libatlas3gf-corei7sse3/usr/lib/atlas-corei7sse3:$(CURDIR)/debian/libatlas3gf-corei7sse3/usr/lib/atlas-corei7sse3/atlas
-# ARCHS += amd64sse3_20_28 core2sse3_17_28 corei7sse3_18_28
endif
ifeq ($(DEB_HOST_ARCH_CPU),ia64)
MODE_BITWIDTH = 64
-# ARCHS = base_25_1 sse_25_16 sse2_25_24
-# DEB_SHLIBDEPS_INCLUDE_libatlas3gf-sse = $(CURDIR)/debian/libatlas3gf-sse/usr/lib/atlas-sse:$(CURDIR)/debian/libatlas3gf-sse/usr/lib/atlas-sse/atlas
-# DEB_SHLIBDEPS_INCLUDE_libatlas3gf-sse2 = $(CURDIR)/debian/libatlas3gf-sse2/usr/lib/atlas-sse2:$(CURDIR)/debian/libatlas3gf-sse2/usr/lib/atlas-sse2/atlas
endif
ifeq ($(DEB_HOST_ARCH_CPU),ppc64)
# Power PC 64
MODE_BITWIDTH = 64
-# DEB_SHLIBDEPS_INCLUDE_libatlas3gf-altivec = $(CURDIR)/debian/libatlas3gf-altivec/usr/lib/atlas-altivec:$(CURDIR)/debian/libatlas3gf-altivec/usr/lib/atlas-altivec/atlas
-# ARCHS += altivec_3_2
-# # 2 = altivec
endif
-
-
-# ifeq ($(DEB_HOST_ARCH_CPU),ppc)
-# # Power PC 32
-# DEB_SHLIBDEPS_INCLUDE_libatlas3gf-altivec = $(CURDIR)/debian/libatlas3gf-altivec/usr/lib/atlas-altivec:$(CURDIR)/debian/libatlas3gf-altivec/usr/lib/atlas-altivec/atlas
-# ARCHS += altivec_3_2
-# # 2 = altivec
-# endif
-
-# TODO: alpha hppa sparc (they have specific accelerations)
GFORTRAN_LIB_PATH=`gcc -print-search-dirs|grep ^install:|awk '{print $$2}'`
@@ -98,14 +40,12 @@
-D c -DWALL \
-b $(MODE_BITWIDTH) \
-Fa alg '-Wa,--noexecstack -fPIC' \
- -Ss flapack /usr/lib/liblapack_pic.a \
-Ss f77lib "-L$(GFORTRAN_LIB_PATH) -lgfortran -lgcc_s -lpthread" \
- -Ss pmake '$(MAKE) -j 1' \
+ -Ss pmake '$(MAKE)' \
-A $$atlasArch \
-V $$atlasISA \
- -v 2 \
- -Si cputhrchk 0
-
+ -v 2
+# ../../configure --cc="cc" --cflags="-g -O2" -D c -DWALL -b 64 -Fa alg '-Wa,--noexecstack -fPIC' -Ss flapack /usr/lib/liblapack_pic.a -Ss f77lib "-L/usr/lib/gcc/x86_64-linux-gnu/4.4.5/ -lgfortran -lgcc_s -lpthread" -Ss pmake '/usr/bin/make -j 1' -A 0 -V 1 -v 2 -Si cputhrchk 0 -t 2
custom: custom-stamp
# Build a custom package optimized for the current arch
@@ -137,38 +77,25 @@
# debian/rules itself (yep, recursively)
# Remove all the other archs in this case
- sed '/AFTER THAT/q' $(CURDIR)/debian/control.in > $(CURDIR)/debian/control
dch --local='+custom' "custom build on: `uname -a`"
LANG=C debian/rules ARCHS=base__ binary
touch $@
configure-stamp:
- if test -n "$(CHECK_EXTENSIONS)"; then \
- if test -f /proc/cpuinfo; then \
- if ! grep ^flags /proc/cpuinfo | grep -q $(CHECK_EXTENSIONS); then \
- echo "Warning: In order to build Atlas under $(DEB_HOST_ARCH_CPU), you need the CPU extension $(CHECK_EXTENSIONS) available on your CPU"; \
- exit 1; \
- fi \
- fi \
- fi
- dh_testdir
-
- set -e; for ext in $(ARCHS); do \
- targetName=`echo $$ext|sed -e "s|\(.*\)_.*_.*|atlas-\1-3.9|g"`; \
- atlasArch=`echo $$ext|sed -e "s|.*_\(.*\)_.*|\1|g"`; \
- atlasISA=`echo $$ext|sed -e "s|.*_.*_\(.*\)|\1|g"`; \
- mkdir -p build/$$targetName; \
- cd build/$$targetName; \
- if test "$(ARCHS)" != "base__"; then \
- ../../configure $(COMMON_CONFIG_PARAMS) -t 2; \
- else \
- ../../configure $(COMMON_CONFIG_PARAMS); \
- fi; \
- echo "Configure done. targetName = $$targetName / atlasArch = $$atlasArch / atlasISA = $$atlasISA"; \
- cat Make.inc |grep ARCH|head -1|awk '{print $$3}'; \
- echo "=============================================="; \
- cd -; \
- done
+ dh_testdir
+
+ set -e; \
+ targetName=`echo $(ARCHS)|sed -e "s|\(.*\)_.*_.*|atlas-\1|g"`; \
+ atlasArch=`echo $(ARCHS)|sed -e "s|.*_\(.*\)_.*|\1|g"`; \
+ atlasISA=`echo $(ARCHS)|sed -e "s|.*_.*_\(.*\)|\1|g"`; \
+ mkdir -p build/$$targetName; \
+ cd build/$$targetName; \
+ ../../configure $(COMMON_CONFIG_PARAMS); \
+ echo "Configure done. targetName = $$targetName / atlasArch = $$atlasArch / atlasISA = $$atlasISA"; \
+ if test ! -s Make.inc; then echo "Configure failed: Make.inc not found"; exit 1; fi; \
+ cat Make.inc |grep ARCH|head -1|awk '{print $$3}'; \
+ echo "=============================================="; \
+ cd -
touch $@
@@ -181,27 +108,22 @@
build-arch: build-arch-stamp
build-arch-stamp: configure-stamp
dh_testdir
- set -e; for ext in $(ARCHS); do \
- targetName=`echo $$ext|sed -e "s|\(.*\)_.*_.*|atlas-\1-3.9|g"`; \
- cd build/$$targetName; \
- $(MAKE) build; \
- cd lib; \
- $(MAKE) shared; \
- $(MAKE) ptshared; \
- cd ..; \
- $(MAKE) check; \
- $(MAKE) ptcheck; \
- echo "=============================================="; \
- cd ../../../; \
- done
-# -for ext in $(ARCHS); do \
-# targetName=`echo $$ext|sed -e "s|\(.*\)_.*_.*|atlas-\1|g"`; \
-# cd build/$$targetName; \
-# $(MAKE) check ptcheck; \
-# echo "=============================================="; \
-# cd ../../../; \
-# done
- make -C TexDoc atlas_contrib.pdf atlas_devel.pdf atlas_install.pdf cblasqref.pdf f77blasqref.pdf lapackqref.pdf
+ set -e; \
+ targetName=`echo $(ARCHS)|sed -e "s|\(.*\)_.*_.*|atlas-\1|g"`; \
+ cd build/$$targetName; \
+ $(MAKE) build; \
+ cd lib; \
+ $(MAKE) shared; \
+ $(MAKE) ptshared; \
+ cd ..; \
+ $(MAKE) check; \
+ $(MAKE) ptcheck; \
+ echo "=============================================="; \
+ cd ../../../
+ # Do not build the help when building the custom package
+ if test "$(ARCHS)" != "base__"; then \
+ make -C TexDoc atlas_contrib.pdf atlas_devel.pdf atlas_install.pdf cblasqref.pdf f77blasqref.pdf lapackqref.pdf; \
+ fi
touch $@
clean:: clean-work #unpatch
@@ -230,31 +152,27 @@
dh_testdir
dh_testroot
- set -e; for ext in $(ARCHS); do \
- targetName=`echo $$ext|sed -e "s|\(.*\)_.*_.*|atlas-\1-3.9|g"`; \
- cd build/$$targetName; \
- echo "make install of $$targetName to $(DEB_DESTDIR)"; \
- $(MAKE) DESTDIR=$(DEB_DESTDIR) install; \
- echo "============================================="; \
- cd -; \
- done
-
-install/libatlas3.9-dev::
- if test -d $(CURDIR)/debian/libatlas3.9-dev/usr/include/; then \
- rm -rf $(CURDIR)/debian/libatlas3.9-dev/usr/include/; \
+ set -e; \
+ targetName=`echo $(ARCHS)|sed -e "s|\(.*\)_.*_.*|atlas-\1|g"`; \
+ cd build/$$targetName; \
+ echo "make install of $$targetName to $(DEB_DESTDIR)"; \
+ $(MAKE) DESTDIR=$(DEB_DESTDIR) install; \
+ echo "============================================="; \
+ cd -
+
+install/libatlas-dev::
+ if test -d $(CURDIR)/debian/libatlas-dev/usr/include/; then \
+ rm -rf $(CURDIR)/debian/libatlas-dev/usr/include/; \
fi
- mkdir -p $(CURDIR)/debian/libatlas3.9-dev/usr/include/
+ mkdir -p $(CURDIR)/debian/libatlas-dev/usr/include/
mv $(CURDIR)/debian/tmp/usr/include/*.h $(CURDIR)/debian/tmp/usr/include/atlas/
- mv $(CURDIR)/debian/tmp/usr/include/atlas $(CURDIR)/debian/libatlas3.9-dev/usr/include/
-
-install/libatlas3.9-doc::
- mkdir -p $(CURDIR)/debian/libatlas3.9-doc/usr/share/doc/libatlas3.9-doc/
- cp -R $(CURDIR)/doc/* $(CURDIR)/TexDoc/*.pdf $(CURDIR)/debian/libatlas3.9-doc/usr/share/doc/libatlas3.9-doc/
+ mv $(CURDIR)/debian/tmp/usr/include/atlas $(CURDIR)/debian/libatlas-dev/usr/include/
+
+install/libatlas-doc::
+ mkdir -p $(CURDIR)/debian/libatlas-doc/usr/share/doc/libatlas-doc/
+ cp -R $(CURDIR)/doc/* $(CURDIR)/TexDoc/*.pdf $(CURDIR)/debian/libatlas-doc/usr/share/doc/libatlas-doc/
binary: binary-indep binary-arch
- if test "$(ARCHS)" != "base__"; then \
- cp $(CURDIR)/debian/control.in $(CURDIR)/debian/control; \
- fi
binary-indep: build install
dh_testdir -i
More information about the debian-science-commits
mailing list