[gcc-6] 202/401: * Configure native builds using --with-program-prefix.
Ximin Luo
infinity0 at debian.org
Wed Apr 5 15:49:27 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 1ec3f13f89058bfc2e4644d6b418d646ed69112b
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date: Thu Sep 8 13:24:33 2016 +0000
* Configure native builds using --with-program-prefix.
git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8970 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
debian/changelog | 1 +
debian/control | 2 +-
debian/control.m4 | 2 +-
debian/rules.d/binary-ada.mk | 61 ++++++++++-------------
debian/rules.d/binary-cpp.mk | 14 ++----
debian/rules.d/binary-cxx.mk | 23 +++------
debian/rules.d/binary-d.mk | 14 ++----
debian/rules.d/binary-fortran.mk | 18 +++----
debian/rules.d/binary-gcc.mk | 18 +++----
debian/rules.d/binary-go.mk | 48 +++++++++---------
debian/rules.d/binary-java.mk | 104 ++++++++++++++++++++++++++-------------
debian/rules.defs | 32 +++++++-----
debian/rules2 | 5 ++
13 files changed, 177 insertions(+), 165 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 75a92f4..d542577 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
gcc-6 (6.2.0-4) UNRELEASED; urgency=medium
* gcj: Depend on the ecj1 standalone binary.
+ * Configure native builds using --with-program-prefix.
-- Matthias Klose <doko at debian.org> Sun, 04 Sep 2016 16:55:59 +0200
diff --git a/debian/control b/debian/control
index 6585813..ab82dd9 100644
--- a/debian/control
+++ b/debian/control
@@ -336,7 +336,7 @@ Priority: optional
Depends: gcc-6-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
Suggests: gcc-6-locales (>= ${gcc:SoftVersion})
Replaces: gccgo-6 (<< ${gcc:Version})
-Breaks: libmagics++-dev (<< 2.28.0-4)
+Breaks: libmagics++-dev (<< 2.28.0-4), hardening-wrapper (<< 2.8+nmu3)
Description: GNU C preprocessor
A macro processor that is used automatically by the GNU C compiler
to transform programs before actual compilation.
diff --git a/debian/control.m4 b/debian/control.m4
index 74d1bb4..f0b2c3c 100644
--- a/debian/control.m4
+++ b/debian/control.m4
@@ -825,7 +825,7 @@ Priority: ifdef(`TARGET',`extra',`PRI(optional)')
Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}
Suggests: gcc`'PV-locales (>= ${gcc:SoftVersion})
Replaces: gccgo-6 (<< ${gcc:Version})
-Breaks: libmagics++-dev (<< 2.28.0-4)
+Breaks: libmagics++-dev (<< 2.28.0-4)ifdef(`TARGET',`',`, hardening-wrapper (<< 2.8+nmu3)')
BUILT_USING`'dnl
Description: GNU C preprocessor
A macro processor that is used automatically by the GNU C compiler
diff --git a/debian/rules.d/binary-ada.mk b/debian/rules.d/binary-ada.mk
index f9eccbe..eb5e213 100644
--- a/debian/rules.d/binary-ada.mk
+++ b/debian/rules.d/binary-ada.mk
@@ -290,52 +290,38 @@ endif
done
ifneq (,$(filter $(build_type), build-native cross-build-native))
+ : # still ship the unversioned prefixed names in the gnat package.
+ for i in $(GNAT_TOOLS); do \
+ ln -sf $(cmd_prefix)$$i$(pkg_ver) \
+ $(d_gnat)/$(PF)/bin/$(cmd_prefix)$$i; \
+ ln -sf $(cmd_prefix)gnat$(pkg_ver).1 \
+ $(d_gnat)/$(PF)/share/man/man1/$(cmd_prefix)$$i.1; \
+ done
+ ifeq ($(unprefixed_names),yes)
: # ship the versioned prefixed names in the gnat package.
for i in $(GNAT_TOOLS); do \
- ln -sf $$i$(pkg_ver) \
- $(d_gnat)/$(PF)/bin/$(DEB_TARGET_GNU_TYPE)-$$i$(pkg_ver); \
- ln -sf $$i$(pkg_ver) \
- $(d_gnat)/$(PF)/bin/$(TARGET_ALIAS)-$$i$(pkg_ver); \
- ln -sf gnat$(pkg_ver).1 \
- $(d_gnat)/$(PF)/share/man/man1/$(DEB_TARGET_GNU_TYPE)-$$i$(pkg_ver).1; \
- ln -sf $$i$(pkg_ver).1 \
- $(d_gnat)/$(PF)/share/man/man1/$(TARGET_ALIAS)-$$i$(pkg_ver).1; \
+ ln -sf $(cmd_prefix)$$i$(pkg_ver) \
+ $(d_gnat)/$(PF)/bin/$$i$(pkg_ver); \
+ ln -sf $(cmd_prefix)gnat$(pkg_ver).1 \
+ $(d_gnat)/$(PF)/share/man/man1/$$i$(pkg_ver).1; \
done
: # still ship the unversioned names in the gnat package.
for i in $(GNAT_TOOLS); do \
ln -sf $$i$(pkg_ver) \
$(d_gnat)/$(PF)/bin/$$i; \
- ln -sf $$i$(pkg_ver) \
- $(d_gnat)/$(PF)/bin/$$i; \
ln -sf gnat$(pkg_ver).1 \
$(d_gnat)/$(PF)/share/man/man1/$$i.1; \
- ln -sf $$i$(pkg_ver).1 \
- $(d_gnat)/$(PF)/share/man/man1/$$i.1; \
done
- : # still ship the unversioned prefixed names in the gnat package.
- for i in $(GNAT_TOOLS); do \
- ln -sf $$i$(pkg_ver) \
- $(d_gnat)/$(PF)/bin/$(DEB_TARGET_GNU_TYPE)-$$i; \
- ln -sf $$i$(pkg_ver) \
- $(d_gnat)/$(PF)/bin/$(TARGET_ALIAS)-$$i; \
- ln -sf gnat$(pkg_ver).1 \
- $(d_gnat)/$(PF)/share/man/man1/$(DEB_TARGET_GNU_TYPE)-$$i.1; \
- ln -sf $$i$(pkg_ver).1 \
- $(d_gnat)/$(PF)/share/man/man1/$(TARGET_ALIAS)-$$i.1; \
- done
+ endif
else
- : # still ship the unversioned names in the gnat package.
+ : # still ship the unversioned prefixed names in the gnat package.
for i in $(GNAT_TOOLS); do \
- ln -sf $(DEB_TARGET_GNU_TYPE)-$$i$(pkg_ver) \
- $(d_gnat)/$(PF)/bin/$(DEB_TARGET_GNU_TYPE)-$$i; \
- ln -sf $(DEB_TARGET_GNU_TYPE)-$$i$(pkg_ver) \
- $(d_gnat)/$(PF)/bin/$(TARGET_ALIAS)-$$i; \
- ln -sf $(DEB_TARGET_GNU_TYPE)-gnat$(pkg_ver).1 \
- $(d_gnat)/$(PF)/share/man/man1/$(DEB_TARGET_GNU_TYPE)-$$i.1; \
- ln -sf $(DEB_TARGET_GNU_TYPE)-$$i$(pkg_ver).1 \
- $(d_gnat)/$(PF)/share/man/man1/$(TARGET_ALIAS)-$$i.1; \
+ ln -sf $(cmd_prefix)$$i$(pkg_ver) \
+ $(d_gnat)/$(PF)/bin/$(cmd_prefix)$$i; \
+ ln -sf $(cmd_prefix)gnat$(pkg_ver).1 \
+ $(d_gnat)/$(PF)/share/man/man1/$(cmd_prefix)$$i.1; \
done
endif
@@ -345,9 +331,14 @@ ifneq (,$(filter $(build_type), build-native cross-build-native))
$(d_gnat)/usr/share/ada/debian_packaging-$(GNAT_VERSION).mk
endif
: # keep this one unversioned, see Debian #802838.
- dh_link -p$(p_gnat) usr/bin/$(cmd_prefix)gcc$(pkg_ver) usr/bin/$(cmd_prefix)gnatgcc
- dh_link -p$(p_gnat) usr/share/man/man1/$(cmd_prefix)gcc$(pkg_ver).1.gz usr/share/man/man1/$(cmd_prefix)gnatgcc.1.gz
-
+ dh_link -p$(p_gnat) \
+ usr/bin/$(cmd_prefix)gcc$(pkg_ver) usr/bin/$(cmd_prefix)gnatgcc \
+ usr/share/man/man1/$(cmd_prefix)gcc$(pkg_ver).1.gz usr/share/man/man1/$(cmd_prefix)gnatgcc.1.gz
+ifeq ($(unprefixed_names),yes)
+ dh_link -p$(p_gnat) \
+ usr/bin/$(cmd_prefix)gcc usr/bin/gnatgcc \
+ usr/share/man/man1/$(cmd_prefix)gcc.1.gz usr/share/man/man1/gnatgcc.1.gz
+endif
debian/dh_rmemptydirs -p$(p_gnat)
dh_strip -p$(p_gnat)
diff --git a/debian/rules.d/binary-cpp.mk b/debian/rules.d/binary-cpp.mk
index f5807fc..b38e42b 100644
--- a/debian/rules.d/binary-cpp.mk
+++ b/debian/rules.d/binary-cpp.mk
@@ -33,16 +33,12 @@ $(binary_stamp)-cpp: $(install_stamp)
dh_installdirs -p$(p_cpp) $(dirs_cpp)
$(dh_compat2) dh_movefiles -p$(p_cpp) $(files_cpp)
-ifneq ($(DEB_CROSS),yes)
- ln -sf cpp$(pkg_ver) \
- $(d_cpp)/$(PF)/bin/$(DEB_TARGET_GNU_TYPE)-cpp$(pkg_ver)
- ln -sf cpp$(pkg_ver) \
- $(d_cpp)/$(PF)/bin/$(TARGET_ALIAS)-cpp$(pkg_ver)
+ifeq ($(unprefixed_names),yes)
+ ln -sf $(cmd_prefix)cpp$(pkg_ver) \
+ $(d_cpp)/$(PF)/bin/cpp$(pkg_ver)
ifneq ($(GFDL_INVARIANT_FREE),yes)
- ln -sf cpp$(pkg_ver).1 \
- $(d_cpp)/$(PF)/share/man/man1/$(DEB_TARGET_GNU_TYPE)-cpp$(pkg_ver).1
- ln -sf cpp$(pkg_ver).1 \
- $(d_cpp)/$(PF)/share/man/man1/$(TARGET_ALIAS)-cpp$(pkg_ver).1
+ ln -sf $(cmd_prefix)cpp$(pkg_ver).1 \
+ $(d_cpp)/$(PF)/share/man/man1/cpp$(pkg_ver).1
endif
endif
diff --git a/debian/rules.d/binary-cxx.mk b/debian/rules.d/binary-cxx.mk
index aeb4ef6..17a43c0 100644
--- a/debian/rules.d/binary-cxx.mk
+++ b/debian/rules.d/binary-cxx.mk
@@ -33,23 +33,12 @@ $(binary_stamp)-cxx: $(install_stamp)
dh_installdirs -p$(p_cxx) $(dirs_cxx)
$(dh_compat2) dh_movefiles -p$(p_cxx) $(files_cxx)
-ifneq ($(DEB_CROSS),yes)
- ln -sf g++$(pkg_ver) \
- $(d_cxx)/$(PF)/bin/$(DEB_TARGET_GNU_TYPE)-g++$(pkg_ver)
- ln -sf g++$(pkg_ver) \
- $(d_cxx)/$(PF)/bin/$(TARGET_ALIAS)-g++$(pkg_ver)
-endif
-
-ifneq ($(GFDL_INVARIANT_FREE),yes)
-# g++ man page is a .so link
- rm -f $(d_cxx)/$(PF)/share/man/man1/$(cmd_prefix)g++$(pkg_ver).1
- ln -sf $(cmd_prefix)gcc$(pkg_ver).1.gz \
- $(d_cxx)/$(PF)/share/man/man1/$(cmd_prefix)g++$(pkg_ver).1.gz
- ifneq ($(DEB_CROSS),yes)
- ln -sf g++$(pkg_ver).1.gz \
- $(d_cxx)/$(PF)/share/man/man1/$(DEB_TARGET_GNU_TYPE)-g++$(pkg_ver).1.gz
- ln -sf g++$(pkg_ver).1.gz \
- $(d_cxx)/$(PF)/share/man/man1/$(TARGET_ALIAS)-g++$(pkg_ver).1.gz
+ifeq ($(unprefixed_names),yes)
+ ln -sf $(cmd_prefix)g++$(pkg_ver) \
+ $(d_cxx)/$(PF)/bin/g++$(pkg_ver)
+ ifneq ($(GFDL_INVARIANT_FREE),yes)
+ ln -sf $(cmd_prefix)g++$(pkg_ver).1.gz \
+ $(d_cxx)/$(PF)/share/man/man1/g++$(pkg_ver).1.gz
endif
endif
diff --git a/debian/rules.d/binary-d.mk b/debian/rules.d/binary-d.mk
index 5c2b0f7..d004819 100644
--- a/debian/rules.d/binary-d.mk
+++ b/debian/rules.d/binary-d.mk
@@ -100,16 +100,12 @@ $(binary_stamp)-gdc: $(install_stamp)
$(dh_compat2) dh_movefiles -p$(p_gdc) -X/zlib/ $(files_gdc)
-ifneq ($(DEB_CROSS),yes)
- ln -sf gdc$(pkg_ver) \
- $(d_gdc)/$(PF)/bin/$(DEB_TARGET_GNU_TYPE)-gdc$(pkg_ver)
- ln -sf gdc$(pkg_ver) \
- $(d_gdc)/$(PF)/bin/$(TARGET_ALIAS)-gdc$(pkg_ver)
+ifeq ($(unprefixed_names),yes)
+ ln -sf $(cmd_prefix)gdc$(pkg_ver) \
+ $(d_gdc)/$(PF)/bin/gdc$(pkg_ver)
ifneq ($(GFDL_INVARIANT_FREE),yes-now-pure-gfdl)
- ln -sf gdc$(pkg_ver).1 \
- $(d_gdc)/$(PF)/share/man/man1/$(DEB_TARGET_GNU_TYPE)-gdc$(pkg_ver).1
- ln -sf gdc$(pkg_ver).1 \
- $(d_gdc)/$(PF)/share/man/man1/$(TARGET_ALIAS)-gdc$(pkg_ver).1
+ ln -sf $(cmd_prefix)gdc$(pkg_ver).1 \
+ $(d_gdc)/$(PF)/share/man/man1/gdc$(pkg_ver).1
endif
endif
diff --git a/debian/rules.d/binary-fortran.mk b/debian/rules.d/binary-fortran.mk
index 1e6fce4..32be526 100644
--- a/debian/rules.d/binary-fortran.mk
+++ b/debian/rules.d/binary-fortran.mk
@@ -175,17 +175,13 @@ $(binary_stamp)-fdev: $(install_stamp)
mv $(d)/$(usr_lib)/libgfortran.spec $(d_g95)/$(gcc_lib_dir)/
-ifneq ($(DEB_CROSS),yes)
- ln -sf gfortran$(pkg_ver) \
- $(d_g95)/$(PF)/bin/$(DEB_TARGET_GNU_TYPE)-gfortran$(pkg_ver)
- ln -sf gfortran$(pkg_ver) \
- $(d_g95)/$(PF)/bin/$(TARGET_ALIAS)-gfortran$(pkg_ver)
-ifneq ($(GFDL_INVARIANT_FREE),yes)
- ln -sf gfortran$(pkg_ver).1 \
- $(d_g95)/$(PF)/share/man/man1/$(DEB_TARGET_GNU_TYPE)-gfortran$(pkg_ver).1
- ln -sf gfortran$(pkg_ver).1 \
- $(d_g95)/$(PF)/share/man/man1/$(TARGET_ALIAS)-gfortran$(pkg_ver).1
-endif
+ifeq ($(unprefixed_names),yes)
+ ln -sf $(cmd_prefix)gfortran$(pkg_ver) \
+ $(d_g95)/$(PF)/bin/gfortran$(pkg_ver)
+ ifneq ($(GFDL_INVARIANT_FREE),yes)
+ ln -sf $(cmd_prefix)gfortran$(pkg_ver).1 \
+ $(d_g95)/$(PF)/share/man/man1/gfortran$(pkg_ver).1
+ endif
endif
ifeq ($(GFDL_INVARIANT_FREE),yes)
diff --git a/debian/rules.d/binary-gcc.mk b/debian/rules.d/binary-gcc.mk
index af190c0..d7745ee 100644
--- a/debian/rules.d/binary-gcc.mk
+++ b/debian/rules.d/binary-gcc.mk
@@ -134,21 +134,17 @@ endif
$(dh_compat2) dh_movefiles -p$(p_gcc) $(files_gcc)
-ifneq ($(DEB_CROSS),yes)
+ifeq ($(unprefixed_names),yes)
for i in gcc gcov gcov-tool gcc-ar gcc-nm gcc-ranlib; do \
- ln -sf $$i$(pkg_ver) \
- $(d_gcc)/$(PF)/bin/$(DEB_TARGET_GNU_TYPE)-$$i$(pkg_ver); \
- ln -sf $$i$(pkg_ver) \
- $(d_gcc)/$(PF)/bin/$(TARGET_ALIAS)-$$i$(pkg_ver); \
+ ln -sf $(cmd_prefix)$$i$(pkg_ver) \
+ $(d_gcc)/$(PF)/bin/$$i$(pkg_ver); \
done
-ifneq ($(GFDL_INVARIANT_FREE),yes)
+ ifneq ($(GFDL_INVARIANT_FREE),yes)
for i in gcc gcov gcc-ar gcc-nm gcc-ranlib; do \
- ln -sf gcc$(pkg_ver).1 \
- $(d_gcc)/$(PF)/share/man/man1/$(DEB_TARGET_GNU_TYPE)-$$i$(pkg_ver).1; \
- ln -sf $$i$(pkg_ver).1 \
- $(d_gcc)/$(PF)/share/man/man1/$(TARGET_ALIAS)-$$i$(pkg_ver).1; \
+ ln -sf $(cmd_prefix)gcc$(pkg_ver).1 \
+ $(d_gcc)/$(PF)/share/man/man1/$$i$(pkg_ver).1; \
done
-endif
+ endif
endif
# dh_installdebconf
diff --git a/debian/rules.d/binary-go.mk b/debian/rules.d/binary-go.mk
index 2e60437..c7e9e1d 100644
--- a/debian/rules.d/binary-go.mk
+++ b/debian/rules.d/binary-go.mk
@@ -49,9 +49,9 @@ files_go = \
ifneq (,$(filter $(build_type), build-native cross-build-native))
files_go += \
- $(PF)/bin/{go,gofmt}$(pkg_ver) \
+ $(PF)/bin/$(cmd_prefix){go,gofmt}$(pkg_ver) \
$(gcc_lexec_dir)/cgo \
- $(PF)/share/man/man1/{go,gofmt}$(pkg_ver).1
+ $(PF)/share/man/man1/$(cmd_prefix){go,gofmt}$(pkg_ver).1
endif
ifneq ($(GFDL_INVARIANT_FREE),yes)
@@ -67,7 +67,7 @@ ifeq ($(with_standalone_go),yes)
# XXX: what about triarch mapping?
files_go += \
- $(PF)/bin/{cpp,gcc,gcov,gcov-tool}$(pkg_ver) \
+ $(PF)/bin/$(cmd_prefix){cpp,gcc,gcov,gcov-tool}$(pkg_ver) \
$(PF)/bin/$(cmd_prefix)gcc-{ar,ranlib,nm}$(pkg_ver) \
$(PF)/share/man/man1/$(cmd_prefix)gcc-{ar,nm,ranlib}$(pkg_ver).1 \
$(gcc_lexec_dir)/{cc1,collect2,lto1,lto-wrapper} \
@@ -84,7 +84,7 @@ ifeq ($(with_standalone_go),yes)
ifneq ($(GFDL_INVARIANT_FREE),yes)
files_go += \
- $(PF)/share/man/man1/{cpp,gcc,gcov,gcov-tool}$(pkg_ver).1
+ $(PF)/share/man/man1/$(cmd_prefix){cpp,gcc,gcov,gcov-tool}$(pkg_ver).1
endif
ifeq ($(biarch64),yes)
@@ -228,33 +228,33 @@ ifneq (,$(findstring gccgo,$(PKGSOURCE)))
rm -rf $(d_go)/$(gcc_lib_dir)/include/openacc.h
endif
-ifneq ($(DEB_CROSS),yes)
- ln -sf gccgo$(pkg_ver) \
- $(d_go)/$(PF)/bin/$(DEB_TARGET_GNU_TYPE)-gccgo$(pkg_ver)
- ln -sf gccgo$(pkg_ver) \
- $(d_go)/$(PF)/bin/$(TARGET_ALIAS)-gccgo$(pkg_ver)
-ifneq ($(GFDL_INVARIANT_FREE),yes)
- ln -sf gccgo$(pkg_ver).1 \
- $(d_go)/$(PF)/share/man/man1/$(DEB_TARGET_GNU_TYPE)-gccgo$(pkg_ver).1
- ln -sf gccgo$(pkg_ver).1 \
- $(d_go)/$(PF)/share/man/man1/$(TARGET_ALIAS)-gccgo$(pkg_ver).1
-endif
+ifeq ($(unprefixed_names),yes)
+ ln -sf $(cmd_prefix)gccgo$(pkg_ver) \
+ $(d_go)/$(PF)/bin/gccgo$(pkg_ver)
+ ln -sf $(cmd_prefix)go$(pkg_ver) \
+ $(d_go)/$(PF)/bin/go$(pkg_ver)
+ ln -sf $(cmd_prefix)gofmt$(pkg_ver) \
+ $(d_go)/$(PF)/bin/gofmt$(pkg_ver)
+ ifneq ($(GFDL_INVARIANT_FREE),yes)
+ ln -sf $(cmd_prefix)gccgo$(pkg_ver).1 \
+ $(d_go)/$(PF)/share/man/man1/gccgo$(pkg_ver).1
+ endif
+ ln -sf $(cmd_prefix)go$(pkg_ver).1 \
+ $(d_go)/$(PF)/share/man/man1/go$(pkg_ver).1
+ ln -sf $(cmd_prefix)gofmt$(pkg_ver).1 \
+ $(d_go)/$(PF)/share/man/man1/gofmt$(pkg_ver).1
endif
ifeq ($(with_standalone_go),yes)
- ifneq ($(DEB_CROSS),yes)
+ ifeq ($(unprefixed_names),yes)
for i in gcc gcov gcov-tool gcc-ar gcc-nm gcc-ranlib; do \
- ln -sf $$i$(pkg_ver) \
- $(d_go)/$(PF)/bin/$(DEB_TARGET_GNU_TYPE)-$$i$(pkg_ver); \
- ln -sf $$i$(pkg_ver) \
- $(d_go)/$(PF)/bin/$(TARGET_ALIAS)-$$i$(pkg_ver); \
+ ln -sf $(cmd_prefix)$$i$(pkg_ver) \
+ $(d_go)/$(PF)/bin/$$i$(pkg_ver); \
done
ifneq ($(GFDL_INVARIANT_FREE),yes)
for i in gcc gcov gcov-tool gcc-ar gcc-nm gcc-ranlib; do \
- ln -sf gcc$(pkg_ver).1 \
- $(d_go)/$(PF)/share/man/man1/$(DEB_TARGET_GNU_TYPE)-$$i$(pkg_ver).1; \
- ln -sf $$i$(pkg_ver).1 \
- $(d_go)/$(PF)/share/man/man1/$(TARGET_ALIAS)-$$i$(pkg_ver).1; \
+ ln -sf $(cmd_prefix)gcc$(pkg_ver).1 \
+ $(d_go)/$(PF)/share/man/man1/$$i$(pkg_ver).1; \
done
endif
endif
diff --git a/debian/rules.d/binary-java.mk b/debian/rules.d/binary-java.mk
index ed4ad53..66b6851 100644
--- a/debian/rules.d/binary-java.mk
+++ b/debian/rules.d/binary-java.mk
@@ -108,8 +108,8 @@ dirs_jdk = \
$(jvm_dir)/bin
files_jdk = \
- $(PF)/bin/{gappletviewer,gjdoc,gc-analyze,gjar,gjarsigner,gcjh,gjavah,gnative2ascii,grmic,gserialver,jv-convert,jcf-dump}$(pkg_ver) \
- $(PF)/share/man/man1/{gappletviewer,gjdoc,gjar,gjarsigner,gcjh,gjavah,gnative2ascii,gserialver}$(pkg_ver).1 \
+ $(PF)/bin/$(cmd_prefix){gappletviewer,gjdoc,gc-analyze,gjar,gjarsigner,gcjh,gjavah,gnative2ascii,grmic,gserialver,jv-convert,jcf-dump}$(pkg_ver) \
+ $(PF)/share/man/man1/$(cmd_prefix){gappletviewer,gjdoc,gjar,gjarsigner,gcjh,gjavah,gnative2ascii,gserialver}$(pkg_ver).1 \
$(gcc_lib_dir)/include/{jni.h,jni_md.h,jvmpi.h} \
$(gcc_lib_dir)/include/{jawt.h,jawt_md.h} \
$(gcc_lib_dir)/include/gcj/libgcj-config.h \
@@ -134,8 +134,8 @@ dirs_jrehl = \
var/lib/gcj$(pkg_ver)
files_jrehl = \
- $(PF)/bin/{gij,gcj-dbtool,gorbd,grmid,grmiregistry,gkeytool,gtnameserv}$(pkg_ver) \
- $(PF)/share/man/man1/{gorbd,grmid,grmiregistry,gkeytool,gtnameserv}$(pkg_ver).1 \
+ $(PF)/bin/$(cmd_prefix){gij,gcj-dbtool,gorbd,grmid,grmiregistry,gkeytool,gtnameserv}$(pkg_ver) \
+ $(PF)/share/man/man1/$(cmd_prefix){gorbd,grmid,grmiregistry,gkeytool,gtnameserv}$(pkg_ver).1 \
$(jvm_dir)/jre/bin \
$(jvm_dir)/bin/{java,keytool,orbd,rmid,rmiregistry,tnameserv} \
$(jvm_dir)/jre/lib/rt.jar \
@@ -226,7 +226,7 @@ ifeq ($(with_standalone_gcj),yes)
# XXX: what about triarch mapping?
files_gcj += \
- $(PF)/bin/{cpp,gcc,gcov}$(pkg_ver) \
+ $(PF)/bin/$(cmd_prefix){cpp,gcc,gcov}$(pkg_ver) \
$(gcc_lexec_dir)/{collect2,lto1,lto-wrapper} \
$(gcc_lexec_dir)/liblto_plugin.so{,.0,.0.0.0} \
$(gcc_lib_dir)/{libgcc*,libgcov.a,*.o} \
@@ -236,7 +236,7 @@ ifeq ($(with_standalone_gcj),yes)
ifneq ($(GFDL_INVARIANT_FREE),yes)
files_gcj += \
- $(PF)/share/man/man1/{cpp,gcc,gcov}$(pkg_ver).1
+ $(PF)/share/man/man1/$(cmd_prefix){cpp,gcc,gcov}$(pkg_ver).1
endif
ifeq ($(biarch64),yes)
@@ -290,12 +290,12 @@ endif
ifeq ($(with_external_ecj1),yes)
ln -sf ../../ecj1 $(d_gcj)/$(gcc_lexec_dir)/ecj1
endif
-ifneq ($(DEB_CROSS),yes)
- ln -sf gcj$(pkg_ver) \
- $(d_gcj)/$(PF)/bin/$(TARGET_ALIAS)-gcj$(pkg_ver)
+ifeq ($(unprefixed_names),yes)
+ ln -sf $(cmd_prefix)gcj$(pkg_ver) \
+ $(d_gcj)/$(PF)/bin/gcj$(pkg_ver)
ifneq ($(GFDL_INVARIANT_FREE),yes)
- ln -sf gcj$(pkg_ver).1 \
- $(d_gcj)/$(PF)/share/man/man1/$(TARGET_ALIAS)-gcj$(pkg_ver).1
+ ln -sf $(cmd_prefix)gcj$(pkg_ver).1.gz \
+ $(d_gcj)/$(PF)/share/man/man1/gcj$(pkg_ver).1.gz
endif
endif
@@ -430,22 +430,39 @@ $(binary_stamp)-java: $(install_stamp)
# $(dh_compat2) dh_movefiles -p$(p_jqt) $(files_jqt)
#endif
+ifeq ($(unprefixed_names),yes)
+ for i in gij gcj-dbtool gorbd grmid grmiregistry gkeytool gtnameserv; do \
+ ln -sf $(cmd_prefix)$$i$(pkg_ver) \
+ $(d_jrehl)/$(PF)/bin/$$i$(pkg_ver); \
+ done
+ for i in gorbd grmid grmiregistry gkeytool gtnameserv; do \
+ ln -sf $(cmd_prefix)gnat$(pkg_ver).1.gz \
+ $(d_jrehl)/$(PF)/share/man/man1/$$i$(pkg_ver).1.gz; \
+ done
+ ifneq ($(GFDL_INVARIANT_FREE),yes)
+ for i in gij gcj-dbtool; do \
+ ln -sf $(cmd_prefix)gnat$(pkg_ver).1.gz \
+ $(d_jrehl)/$(PF)/share/man/man1/$$i$(pkg_ver).1.gz; \
+ done
+ endif
+endif
+
dh_link -p$(p_jrehl) \
$(jvm_dir) $(PF)/lib/jvm/java-gcj$(pkg_ver) \
- $(PF)/bin/gij$(pkg_ver) $(jvm_dir)/bin/gij \
- $(PF)/bin/gij$(pkg_ver) $(jvm_dir)/jre/bin/gij \
- $(PF)/bin/gcj-dbtool$(pkg_ver) $(jvm_dir)/bin/gcj-dbtool \
- $(PF)/bin/gcj-dbtool$(pkg_ver) $(jvm_dir)/jre/bin/gcj-dbtool \
- $(PF)/share/man/man1/gkeytool$(pkg_ver).1 $(jvm_dir)/man/man1/keytool.1 \
- $(PF)/share/man/man1/gorbd$(pkg_ver).1 $(jvm_dir)/man/man1/orbd.1 \
- $(PF)/share/man/man1/grmid$(pkg_ver).1 $(jvm_dir)/man/man1/rmid.1 \
- $(PF)/share/man/man1/grmiregistry$(pkg_ver).1 $(jvm_dir)/man/man1/rmiregistry.1 \
- $(PF)/share/man/man1/gtnameserv$(pkg_ver).1 $(jvm_dir)/man/man1/tnameserv.1 \
+ $(PF)/bin/$(cmd_prefix)gij$(pkg_ver) $(jvm_dir)/bin/gij \
+ $(PF)/bin/$(cmd_prefix)gij$(pkg_ver) $(jvm_dir)/jre/bin/gij \
+ $(PF)/bin/$(cmd_prefix)gcj-dbtool$(pkg_ver) $(jvm_dir)/bin/gcj-dbtool \
+ $(PF)/bin/$(cmd_prefix)gcj-dbtool$(pkg_ver) $(jvm_dir)/jre/bin/gcj-dbtool \
+ $(PF)/share/man/man1/$(cmd_prefix)gkeytool$(pkg_ver).1 $(jvm_dir)/man/man1/keytool.1 \
+ $(PF)/share/man/man1/$(cmd_prefix)gorbd$(pkg_ver).1 $(jvm_dir)/man/man1/orbd.1 \
+ $(PF)/share/man/man1/$(cmd_prefix)grmid$(pkg_ver).1 $(jvm_dir)/man/man1/rmid.1 \
+ $(PF)/share/man/man1/$(cmd_prefix)grmiregistry$(pkg_ver).1 $(jvm_dir)/man/man1/rmiregistry.1 \
+ $(PF)/share/man/man1/$(cmd_prefix)gtnameserv$(pkg_ver).1 $(jvm_dir)/man/man1/tnameserv.1 \
ifneq ($(GFDL_INVARIANT_FREE),yes)
dh_link -p$(p_jrehl) \
- $(PF)/share/man/man1/gij$(pkg_ver).1 $(jvm_dir)/man/man1/java.1 \
- $(PF)/share/man/man1/grmic$(pkg_ver).1 $(jvm_dir)/man/man1/rmiregistry.1
+ $(PF)/share/man/man1/$(cmd_prefix)gij$(pkg_ver).1 $(jvm_dir)/man/man1/java.1 \
+ $(PF)/share/man/man1/$(cmd_prefix)grmic$(pkg_ver).1 $(jvm_dir)/man/man1/rmiregistry.1
endif
ifneq ($(DEB_TARGET_ARCH_CPU),$(java_cpu))
@@ -465,9 +482,9 @@ endif
$(foreach i, jawt, $(gcj_vlibdir)/lib$(i).so $(jvm_dir)/lib/lib$(i).so)
ifeq ($(DEB_HOST_ARCH),hppa)
- mv $(d_jrehl)/$(PF)/bin/gij$(pkg_ver) \
- $(d_jrehl)/$(PF)/bin/gij$(pkg_ver).bin
- install -m755 debian/gij-hppa $(d_jrehl)/$(PF)/bin/gij$(pkg_ver)
+ mv $(d_jrehl)/$(PF)/bin/$(cmd_prefix)gij$(pkg_ver) \
+ $(d_jrehl)/$(PF)/bin/$(cmd_prefix)gij$(pkg_ver).bin
+ install -m755 debian/gij-hppa $(d_jrehl)/$(PF)/bin/$(cmd_prefix)gij$(pkg_ver)
endif
ln -s ../libgcj.so.$(GCJ_SONAME) \
@@ -617,13 +634,30 @@ endif
$(PF)/share/man/man1/ecj.1.gz $(jvm_dir)/man/man1/javac.1.gz \
$(PF)/share/man/man1/fastjar.1.gz $(jvm_dir)/man/man1/jar.1.gz
+ifeq ($(unprefixed_names),yes)
+ for i in gappletviewer gjdoc gc-analyze gjar gjarsigner gcjh gjavah gnative2ascii grmic gserialver jv-convert jcf-dump; do \
+ ln -sf $(cmd_prefix)$$i$(pkg_ver) \
+ $(d_jdk)/$(PF)/bin/$$i$(pkg_ver); \
+ done
+ for i in gappletviewer gjdoc gjar gjarsigner gcjh gjavah gnative2ascii gserialver; do \
+ ln -sf $(cmd_prefix)gnat$(pkg_ver).1 \
+ $(d_jdk)/$(PF)/share/man/man1/$$i$(pkg_ver).1; \
+ done
+ ifneq ($(GFDL_INVARIANT_FREE),yes)
+ for i in gc-analyze gnative2ascii grmic jv-convert jcf-dump; do \
+ ln -sf $(cmd_prefix)gnat$(pkg_ver).1 \
+ $(d_jdk)/$(PF)/share/man/man1/$$i$(pkg_ver).1; \
+ done
+ endif
+endif
+
dh_link -p$(p_jdk) \
- $(PF)/bin/gcj$(pkg_ver) $(jvm_dir)/bin/gcj \
- $(PF)/share/man/man1/gjarsigner$(pkg_ver).1 $(jvm_dir)/man/man1/jarsigner.1 \
- $(PF)/share/man/man1/gjdoc$(pkg_ver).1 $(jvm_dir)/man/man1/javadoc.1 \
- $(PF)/share/man/man1/gjavah$(pkg_ver).1 $(jvm_dir)/man/man1/javah.1 \
- $(PF)/share/man/man1/gserialver$(pkg_ver).1 $(jvm_dir)/man/man1/serialver.1 \
- $(PF)/share/man/man1/gappletviewer$(pkg_ver).1 $(jvm_dir)/man/man1/appletviewer.1
+ $(PF)/bin/$(cmd_prefix)gcj$(pkg_ver) $(jvm_dir)/bin/gcj \
+ $(PF)/share/man/man1/$(cmd_prefix)gjarsigner$(pkg_ver).1 $(jvm_dir)/man/man1/jarsigner.1 \
+ $(PF)/share/man/man1/$(cmd_prefix)gjdoc$(pkg_ver).1 $(jvm_dir)/man/man1/javadoc.1 \
+ $(PF)/share/man/man1/$(cmd_prefix)gjavah$(pkg_ver).1 $(jvm_dir)/man/man1/javah.1 \
+ $(PF)/share/man/man1/$(cmd_prefix)gserialver$(pkg_ver).1 $(jvm_dir)/man/man1/serialver.1 \
+ $(PF)/share/man/man1/$(cmd_prefix)gappletviewer$(pkg_ver).1 $(jvm_dir)/man/man1/appletviewer.1
ifneq ($(GFDL_INVARIANT_FREE),yes)
cp -p html/gcj.html $(d_jdk)/$(docdir)/$(p_jbase)/
@@ -632,9 +666,11 @@ endif
cp -p debian/FAQ.gcj $(d_jdk)/$(docdir)/$(p_jbase)/
- cp -p debian/gcj-wrapper$(pkg_ver) $(d_jdk)/$(PF)/bin/
- chmod 755 $(d_jdk)/$(PF)/bin/gcj-wrapper$(pkg_ver)
- cp -p debian/gcj-wrapper$(pkg_ver).1 $(d_jdk)/$(PF)/share/man/man1/
+ cp -p debian/gcj-wrapper$(pkg_ver) \
+ $(d_jdk)/$(PF)/bin/$(cmd_prefix)gcj-wrapper$(pkg_ver)
+ chmod 755 $(d_jdk)/$(PF)/bin/$(cmd_prefix)gcj-wrapper$(pkg_ver)
+ cp -p debian/gcj-wrapper$(pkg_ver).1 \
+ $(d_jdk)/$(PF)/share/man/man1/$(cmd_prefix)gcj-wrapper$(pkg_ver).1
debian/dh_rmemptydirs -p$(p_jdk)
diff --git a/debian/rules.defs b/debian/rules.defs
index 1680440..4ee6b0d 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -106,6 +106,18 @@ EPOCH := 1
DEB_EVERSION := $(EPOCH):$(DEB_VERSION)
BASE_VERSION := $(shell echo $(DEB_VERSION) | sed -e 's/\([1-9]\).*-.*/\1/')
+ifneq (,$(findstring gcc-snapshot, $(PKGSOURCE)))
+ single_package = yes
+ trunk_build = yes
+ with_linaro_branch =
+else ifneq (,$(findstring gcc-linaro, $(PKGSOURCE)))
+ single_package = yes
+ trunk_build = no
+else
+ # --program-suffix=-$(BASE_VERSION)
+ versioned_packages := yes
+endif
+
# push glibc stack traces into stderr
export LIBC_FATAL_STDERR_=1
@@ -238,7 +250,13 @@ else
TARGET_ALIAS := i586-gnu
endif
- cmd_prefix :=
+ ifeq ($(single_package),yes)
+ cmd_prefix :=
+ unprefixed_names :=
+ else
+ cmd_prefix := $(DEB_TARGET_GNU_TYPE)-
+ unprefixed_names := yes
+ endif
#ifeq ($(TARGET_ALIAS),i486-linux-gnu)
# TARGET_ALIAS := i686-linux-gnu
@@ -507,18 +525,6 @@ with_cpp := yes
# set lang when built from a different source package.
separate_lang := no
-ifneq (,$(findstring gcc-snapshot, $(PKGSOURCE)))
- single_package = yes
- trunk_build = yes
- with_linaro_branch =
-else ifneq (,$(findstring gcc-linaro, $(PKGSOURCE)))
- single_package = yes
- trunk_build = no
-else
- # --program-suffix=-$(BASE_VERSION)
- versioned_packages := yes
-endif
-
#no_dummy_cpus := ia64 i386 hppa s390 sparc
#ifneq (,$(filter $(DEB_TARGET_ARCH_CPU),$(no_dummy_cpus)))
# with_base_only := no
diff --git a/debian/rules2 b/debian/rules2
index d3b5d06..2b9d792 100644
--- a/debian/rules2
+++ b/debian/rules2
@@ -212,6 +212,9 @@ CONFARGS += \
ifeq ($(versioned_packages),yes)
CONFARGS += --program-suffix=-$(BASE_VERSION)
endif
+ifeq ($(build_type),build-native)
+ CONFARGS += --program-prefix=$(cmd_prefix)
+endif
ifneq (,$(filter $(DEB_STAGE),stage1 stage2))
CONFARGS += \
@@ -2379,6 +2382,8 @@ ifneq ($(with_common_libs),yes)
endif
@echo XXXXX `date -R`
+ find $(d) ! -type d -print
+ @echo XXXXX
touch $(install_stamp)
$(install_jit_stamp): $(build_jit_stamp) $(install_stamp)
--
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