[gcc-6] 17/401: * Remove obsolete libgccmath packaging support. * Define SONAME macros whether the libararies are built or not.
Ximin Luo
infinity0 at debian.org
Wed Apr 5 15:47:56 UTC 2017
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch pu/reproducible_builds
in repository gcc-6.
commit a24300ef29adf31c1a9df5b2d02b220b85ca48d1
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date: Sun Dec 13 13:15:51 2015 +0000
* Remove obsolete libgccmath packaging support.
* Define SONAME macros whether the libararies are built or not.
git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8514 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
debian/changelog | 2 +
debian/control.m4 | 34 ----------
debian/rules.conf | 6 +-
debian/rules.d/binary-libgcc.mk | 2 +-
debian/rules.d/binary-libgccmath.mk | 121 -----------------------------------
debian/rules.d/binary-libquadmath.mk | 2 +-
debian/rules.sonames | 29 +++------
debian/rules2 | 2 +-
8 files changed, 14 insertions(+), 184 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1d6b6fb..2f389de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ gcc-6 (6-20151211-2) UNRELEASED; urgency=medium
* Update ada-m68k patch.
* Allow unstripped, non-optimized debug builds with setting DEB_BUILD_OPTIONS
including gccdebug.
+ * Remove obsolete libgccmath packaging support.
+ * Define SONAME macros whether the libararies are built or not.
-- Matthias Klose <doko at debian.org> Sun, 13 Dec 2015 12:20:23 +0100
diff --git a/debian/control.m4 b/debian/control.m4
index 003ed25..bd88149 100644
--- a/debian/control.m4
+++ b/debian/control.m4
@@ -712,40 +712,6 @@ Description: GCC support library (x32 development files)
')`'dnl x32dev
')`'dnl cdev
-ifdef(`TARGET', `', `
-ifenabled(`libgmath',`
-Package: libgccmath`'GCCMATH_SO`'LS
-Architecture: i386
-ifdef(`MULTIARCH', `Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-')`'dnl
-Section: libs
-Priority: PRI(optional)
-Depends: BASELDEP, ${shlibs:Depends}, ${misc:Depends}
-BUILT_USING`'dnl
-Description: GCC math support library
- Support library for GCC.
-
-Package: lib32gccmath`'GCCMATH_SO`'LS
-Architecture: amd64
-Section: libs
-Priority: PRI(optional)
-Depends: BASELDEP, ${shlibs:Depends}, ${misc:Depends}
-BUILT_USING`'dnl
-Description: GCC math support library (32bit)
- Support library for GCC.
-
-Package: lib64gccmath`'GCCMATH_SO`'LS
-Architecture: i386
-Section: libs
-Priority: PRI(optional)
-Depends: BASELDEP, ${shlibs:Depends}, ${misc:Depends}
-BUILT_USING`'dnl
-Description: GCC math support library (64bit)
- Support library for GCC.
-')`'dnl
-')`'dnl native
-
ifenabled(`cdev',`
Package: gcc`'PV`'TS
Architecture: any
diff --git a/debian/rules.conf b/debian/rules.conf
index 7dd75fd..ca6d56d 100644
--- a/debian/rules.conf
+++ b/debian/rules.conf
@@ -577,7 +577,6 @@ DEB_SOEVERSION := $(EPOCH):5
DEB_STDCXX_SOVERSION := 5
DEB_GCJ_SOVERSION := 5
DEB_GOMP_SOVERSION := $(DEB_SOVERSION)
-DEB_GCCMATH_SOVERSION := $(DEB_SOVERSION)
DEB_GCC_VERSION := $(DEB_VERSION)
DEB_GCJ_VERSION := $(DEB_VERSION)
@@ -981,7 +980,6 @@ control-file:
-DGNAT_V=$(GNAT_VERSION) \
-DPHOBOS_V=$(libphobos_version) \
-DGOMP_SO=$(GOMP_SONAME) \
- -DGCCMATH_SO=$(GCCMATH_SONAME) \
-DITM_SO=$(ITM_SONAME) \
-DATOMIC_SO=$(ATOMIC_SONAME) \
-DBTRACE_SO=$(BTRACE_SONAME) \
@@ -1295,7 +1293,6 @@ parameters-file:
echo 'PKG_GCJ_EXT := $(PKG_GCJ_EXT)'; \
echo 'PKG_LIBGCJ_EXT := $(PKG_LIBGCJ_EXT)'; \
echo 'DEB_GOMP_SOVERSION := $(DEB_GOMP_SOVERSION)'; \
- echo 'DEB_GCCMATH_SOVERSION := $(DEB_GCCMATH_SOVERSION)'; \
echo 'GCC_SONAME := $(GCC_SONAME)'; \
echo 'CXX_SONAME := $(CXX_SONAME)'; \
echo 'FORTRAN_SONAME := $(FORTRAN_SONAME)'; \
@@ -1317,8 +1314,7 @@ parameters-file:
echo 'VTV_SONAME := $(VTV_SONAME)'; \
echo 'CILKRTS_SONAME := $(CILKRTS_SONAME)'; \
echo 'MPX_SONAME := $(MPX_SONAME)'; \
- echo 'QMATH_SONAME := $(QUADMATH_SONAME)'; \
- echo 'GCCMATH_SONAME := $(GCCMATH_SONAME)'; \
+ echo 'QUADMATH_SONAME := $(QUADMATH_SONAME)'; \
echo 'GO_SONAME := $(GO_SONAME)'; \
echo 'CC1_SONAME := $(CC1_SONAME)'; \
echo 'GCCJIT_SONAME := $(GCCJIT_SONAME)'; \
diff --git a/debian/rules.d/binary-libgcc.mk b/debian/rules.d/binary-libgcc.mk
index 75c2b18..a703e1a 100644
--- a/debian/rules.d/binary-libgcc.mk
+++ b/debian/rules.d/binary-libgcc.mk
@@ -259,7 +259,7 @@ define __do_gcc_devels2
)
)
$(if $(filter yes, $(with_qmath)),
- $(call install_gcc_lib,libquadmath,$(QMATH_SONAME),$(1),$(2))
+ $(call install_gcc_lib,libquadmath,$(QUADMATH_SONAME),$(1),$(2))
)
endef
diff --git a/debian/rules.d/binary-libgccmath.mk b/debian/rules.d/binary-libgccmath.mk
index c68538e..e69de29 100644
--- a/debian/rules.d/binary-libgccmath.mk
+++ b/debian/rules.d/binary-libgccmath.mk
@@ -1,121 +0,0 @@
-ifeq ($(with_libgmath),yes)
- arch_binaries := $(arch_binaries) libgmath
-endif
-#ifeq ($(with_libgmathdev),yes)
-# arch_binaries := $(arch_binaries) libgmathdev
-#endif
-ifeq ($(with_lib64gmath),yes)
- arch_binaries := $(arch_binaries) lib64gmath
-endif
-ifeq ($(with_lib32gmath),yes)
- arch_binaries := $(arch_binaries) lib32gmath
-endif
-
-p_gmath = libgccmath$(GCCMATH_SONAME)
-p_l32gmath = lib32gccmath$(GCCMATH_SONAME)
-p_l64gmath = lib64gccmath$(GCCMATH_SONAME)
-p_gmathd = libgccmath$(GCCMATH_SONAME)-dev
-
-d_gmath = debian/$(p_gmath)
-d_l32gmath = debian/$(p_l32gmath)
-d_l64gmath = debian/$(p_l64gmath)
-d_gmathd = debian/$(p_gmathd)
-
-dirs_gmath = \
- $(docdir) \
- $(PF)/$(libdir)
-files_gmath = \
- $(PF)/$(libdir)/libgcc-math.so.*
-
-dirs_gmathd = \
- $(docdir)/$(p_base)
-ifeq ($(with_libgmath),yes)
-files_gmathd = \
- $(PF)/$(libdir)/libgcc-math.{a,so}
-endif
-
-ifeq ($(with_lib32gmath),yes)
- dirs_gmathd += $(lib32)
- files_gmathd += $(lib32)/libgcc-math.{a,so}
-endif
-ifeq ($(with_lib64gmath),yes)
- dirs_gmathd += $(PF)/lib64
- files_gmathd += $(PF)/lib64/libgcc-math.{a,so}
-endif
-
-$(binary_stamp)-libgmath: $(install_stamp)
- dh_testdir
- dh_testroot
- mv $(install_stamp) $(install_stamp)-tmp
- rm -rf $(d_gmath)
- dh_installdirs -p$(p_gmath) $(dirs_gmath)
- $(dh_compat2) dh_movefiles -p$(p_gmath) $(files_gmath)
- debian/dh_doclink -p$(p_gmath) $(p_base)
- debian/dh_rmemptydirs -p$(p_gmath)
- dh_strip -p$(p_gmath)
- dh_makeshlibs -p$(p_gmath) -V '$(p_gmath) (>= $(DEB_GCCMATH_SOVERSION))'
- dh_shlibdeps -p$(p_gmath)
- echo $(p_gmath) >> debian/arch_binaries
-
- trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
-
-# ----------------------------------------------------------------------
-$(binary_stamp)-libgmathdev: $(install_stamp)
- dh_testdir
- dh_testroot
- mv $(install_stamp) $(install_stamp)-tmp
-
- rm -rf $(d_gmathd)
- dh_installdirs -p$(p_gmathd) $(dirs_gmathd)
- $(dh_compat2) dh_movefiles -p$(p_gmathd) $(files_gmathd)
- debian/dh_doclink -p$(p_gmathd) $(p_base)
- cp -p $(srcdir)/libgcc-math/ChangeLog \
- $(d_gmathd)/$(docdir)/$(p_base)/changelog.libgcc-math
- debian/dh_rmemptydirs -p$(p_gmathd)
- dh_strip -p$(p_gmathd)
- dh_shlibdeps -p$(p_gmathd)
- echo $(p_gmathd) >> debian/arch_binaries
-
- trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
-
-# ----------------------------------------------------------------------
-$(binary_stamp)-lib64gmath: $(install_stamp)
- dh_testdir
- dh_testroot
- mv $(install_stamp) $(install_stamp)-tmp
-
- rm -rf $(d_l64gmath)
- dh_installdirs -p$(p_l64gmath) \
- $(PF)/lib64
- $(dh_compat2) dh_movefiles -p$(p_l64gmath) \
- $(PF)/lib64/libgcc-math.so.*
-
- debian/dh_doclink -p$(p_l64gmath) $(p_base)
-
- dh_strip -p$(p_l64gmath)
- dh_makeshlibs -p$(p_l64gmath) -V '$(p_l64gmath) (>= $(DEB_GCCMATH_SOVERSION))'
-# dh_shlibdeps -p$(p_l64gmath)
- echo $(p_l64gmath) >> debian/arch_binaries
-
- trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
-
-# ----------------------------------------------------------------------
-$(binary_stamp)-lib32gmath: $(install_stamp)
- dh_testdir
- dh_testroot
- mv $(install_stamp) $(install_stamp)-tmp
-
- rm -rf $(d_l32gmath)
- dh_installdirs -p$(p_l32gmath) \
- $(lib32)
- $(dh_compat2) dh_movefiles -p$(p_l32gmath) \
- $(lib32)/libgcc-math.so.*
-
- debian/dh_doclink -p$(p_l32gmath) $(p_base)
-
- dh_strip -p$(p_l32gmath)
- dh_makeshlibs -p$(p_l32gmath) -V '$(p_l32gmath) (>= $(DEB_GCCMATH_SOVERSION))'
- dh_shlibdeps -p$(p_l32gmath)
- echo $(p_l32gmath) >> debian/arch_binaries
-
- trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
diff --git a/debian/rules.d/binary-libquadmath.mk b/debian/rules.d/binary-libquadmath.mk
index 2ff1b44..fb7ed39 100644
--- a/debian/rules.d/binary-libquadmath.mk
+++ b/debian/rules.d/binary-libquadmath.mk
@@ -44,7 +44,7 @@ endef
# ----------------------------------------------------------------------
-do_qmath = $(call __do_qmath,lib$(1)quadmath$(QMATH_SONAME),$(1))
+do_qmath = $(call __do_qmath,lib$(1)quadmath$(QUADMATH_SONAME),$(1))
$(binary_stamp)-libqmath: $(install_stamp)
$(call do_qmath,)
diff --git a/debian/rules.sonames b/debian/rules.sonames
index 812c16c..5dfe66a 100644
--- a/debian/rules.sonames
+++ b/debian/rules.sonames
@@ -38,33 +38,21 @@ ifeq (,$(wildcard debian/soname-cache))
echo TSAN_SONAME=$$v >> $$cache; \
v=`tail -1 $(srcdir)/libsanitizer/ubsan/libtool-version | cut -d: -f1`; \
echo UBSAN_SONAME=$$v >> $$cache; \
- if [ "$(with_atomic)" = yes ]; then \
- v=`awk -F= '/^libtool_VERSION/ {split($$2,v,":"); print v[1]}' \
+ v=`awk -F= '/^libtool_VERSION/ {split($$2,v,":"); print v[1]}' \
$(srcdir)/libatomic/configure.ac`; \
- v=1; \
- echo ATOMIC_SONAME=$$v >> $$cache; \
- fi; \
- if [ "$(with_backtrace)" = yes ]; then \
- v=`awk -F= '/^libtool_VERSION/ {split($$2,v,":"); print v[1]}' \
+ v=1; \
+ echo ATOMIC_SONAME=$$v >> $$cache; \
+ v=`awk -F= '/^libtool_VERSION/ {split($$2,v,":"); print v[1]}' \
$(srcdir)/libbacktrace/configure.ac`; \
- echo BTRACE_SONAME=$$v >> $$cache; \
- fi; \
- if [ "$(with_qmath)" = yes ]; then \
- v=`tail -1 $(srcdir)/libquadmath/libtool-version | cut -d: -f1`; \
+ echo BTRACE_SONAME=$$v >> $$cache; \
+ v=`tail -1 $(srcdir)/libquadmath/libtool-version | cut -d: -f1`; \
echo QUADMATH_SONAME=$$v >> $$cache; \
- fi; \
- if [ "$(with_libgmath)" = yes ]; then \
- v=`tail -1 $(srcdir)/libgcc-math/libtool-version | cut -d: -f1`; \
- echo GCCMATH_SONAME=$$v >> $$cache; \
- fi; \
v=`grep '[^_]Library_Version.*:' $(srcdir)/gcc/ada/gnatvsn.ads \
| sed -e 's/.*"\([^"]*\)".*/\1/'`; \
echo GNAT_SONAME=$$v >> $$cache; \
- if [ "$(with_go)" = yes ]; then \
- v=`awk -F= '/^libtool_VERSION/ {split($$2,v,":"); print v[1]}' \
+ v=`awk -F= '/^libtool_VERSION/ {split($$2,v,":"); print v[1]}' \
$(srcdir)/libgo/configure.ac`; \
- echo GO_SONAME=$$v >> $$cache; \
- fi; \
+ echo GO_SONAME=$$v >> $$cache; \
echo ITM_SONAME=1 >> $$cache; \
v=`awk -F= '/^libtool_VERSION/ {split($$2,v,":"); print v[1]}' \
$(srcdir)/libvtv/configure.ac`; \
@@ -95,7 +83,6 @@ TSAN_SONAME = $(call vafilt,$(SONAME_VARS),TSAN_SONAME)
UBSAN_SONAME = $(call vafilt,$(SONAME_VARS),UBSAN_SONAME)
VTV_SONAME = $(call vafilt,$(SONAME_VARS),VTV_SONAME)
CILKRTS_SONAME = $(call vafilt,$(SONAME_VARS),CILKRTS_SONAME)
-GCCMATH_SONAME = $(call vafilt,$(SONAME_VARS),GCCMATH_SONAME)
QUADMATH_SONAME = $(call vafilt,$(SONAME_VARS),QUADMATH_SONAME)
GNAT_SONAME = $(call vafilt,$(SONAME_VARS),GNAT_SONAME)
GO_SONAME = $(call vafilt,$(SONAME_VARS),GO_SONAME)
diff --git a/debian/rules2 b/debian/rules2
index 104c1c8..48f601c 100644
--- a/debian/rules2
+++ b/debian/rules2
@@ -1798,7 +1798,7 @@ clean: debian/control
rm -f $$f2; \
done
rm -f debian/lib*gcc1.symbols
- rm -f debian/lib*{atomic$(ATOMIC_SONAME),cilkrts$(CILKRTS_SONAME),gfortran$(FORTRAN_SONAME),gomp$(GOMP_SONAME),itm$(ITM_SONAME),mpx$(MPX_SONAME),quadmath$(QMATH_SONAME)}.symbols
+ rm -f debian/lib*{atomic$(ATOMIC_SONAME),cilkrts$(CILKRTS_SONAME),gfortran$(FORTRAN_SONAME),gomp$(GOMP_SONAME),itm$(ITM_SONAME),mpx$(MPX_SONAME),quadmath$(QUADMATH_SONAME)}.symbols
find debian -maxdepth 1 -name '*-cross.symbols' -type l | xargs -r rm -f
rm -f debian/gcc-{XX,ar,nm,ranlib}-$(BASE_VERSION).1
rm -f debian/shlibs.local debian/shlibs.common* debian/substvars.local
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-6.git
More information about the Reproducible-commits
mailing list