Some more fix to debian/rules.d/binary-ada.mk.
On Sat, 12 Sep 2015 23:56:13 +0800 YunQiang Su <wzss...@gmail.com> wrote:
> Package: src:gcc-5
> Version: 5.2.1-17
>
> I rewrite gnat sjlj support with a new src/libada-sjlj directory added,
> instead of the huge patch to src/gcc/ada/gcc-interfaces/Makefile.in.
>
> 0001_libgnatvsn-prj.diff
> as we build libgnatsvn/libgnatprj in build/TRIPLET, so fix something
> left.
>
> 0002_ada-sjlj.diff
> Rewrite gnat sjlj support, with a new added directory.
> It still builds zcx in build/gcc/ada/rts (not rts-natvie),
> while builds sjlj in build/gcc/ada/rts-sjlj.
> Some dependency chains ins Makefile.def are also got some change.
> ada-acats-sjlj.diff is not needed any more, as with this method of
> build,
> the upstream test just works.
>
> 0003_prepare-ada-cross-support.diff
> This is some changes for cross gnat support.
> Make package priority extra when cross build instead of optional.
> gcc-5-cross asks for it?
> dependencies = { module=all-target-libgnatvsn;
> on=all-target-libstdc++-v3; };
> in fact libgnatprj requires some header files of libstdc++,
> no idea whether libgnatprj does.
> since libgnatprj depends on libgnatvsn, so add
> libgnatvsn here.
> This is found when cross build for mipsel
> TOOLS_LIBS: change the order and add stdc++ here.
> on some architecture, the old order doesn't work.
> now idea why.
> this order just work for all architecture in the
> list of gcc-5-cross.
> Maybe you still wish to disable ada cross by default here.
>
>
> --
> YunQiang Su
Index: gcc/debian/rules.d/binary-ada.mk
===================================================================
--- gcc.orig/debian/rules.d/binary-ada.mk 2015-09-13 15:08:29.788151346
+0800
+++ gcc/debian/rules.d/binary-ada.mk 2015-09-13 15:10:18.251920384 +0800
@@ -26,7 +26,7 @@
endif
p_gnat = gnat-$(GNAT_VERSION)$(cross_bin_arch)
-p_gnsjlj= gnat-$(GNAT_VERSION)-sjlj$(cross_bin_arch)
+p_gnatsjlj= gnat-$(GNAT_VERSION)-sjlj$(cross_bin_arch)
p_lgnat = libgnat-$(GNAT_VERSION)$(cross_lib_arch)
p_lgnat_dbg = libgnat-$(GNAT_VERSION)-dbg$(cross_lib_arch)
p_lgnatvsn = libgnatvsn$(GNAT_VERSION)$(cross_lib_arch)
@@ -39,6 +39,7 @@
d_gbase = debian/$(p_gbase)
d_gnat = debian/$(p_gnat)
+d_gnatsjlj = debian/$(p_gnatsjlj)
d_lgnat = debian/$(p_lgnat)
d_lgnatvsn = debian/$(p_lgnatvsn)
d_lgnatprj = debian/$(p_lgnatprj)
@@ -288,8 +289,8 @@
dh_movefiles -p$(p_gnat) $(files_gnat)
ifeq ($(with_gnatsjlj),yes)
- dh_installdirs -p$(p_gnsjlj) $(gcc_lib_dir)
- dh_movefiles -p$(p_gnsjlj) $(gcc_lib_dir)/rts-sjlj/adalib
$(gcc_lib_dir)/rts-sjlj/adainclude
+ dh_installdirs -p$(p_gnatsjlj) $(gcc_lib_dir)
+ dh_movefiles -p$(p_gnatsjlj) $(gcc_lib_dir)/rts-sjlj/adalib
$(gcc_lib_dir)/rts-sjlj/adainclude
endif
ifeq ($(with_libgnat),yes)
@@ -307,7 +308,7 @@
endif
debian/dh_doclink -p$(p_gnat) $(p_gbase)
ifeq ($(with_gnatsjlj),yes)
- debian/dh_doclink -p$(p_gnsjlj) $(p_gbase)
+ debian/dh_doclink -p$(p_gnatsjlj) $(p_gbase)
endif
ifeq ($(PKGSOURCE),gnat-$(BASE_VERSION))
ifeq ($(with_check),yes)
@@ -396,17 +397,16 @@
dh_builddeb -p$(p_gnat)
ifeq ($(with_gnatsjlj),yes)
- dh_strip -p$(p_gnsjlj)
- dh_compress -p$(p_gnsjlj)
- dh_fixperms -p$(p_gnsjlj)
- find $(d_gnat)-sjlj -name '*.ali' | xargs chmod 444
- $(cross_shlibdeps) dh_shlibdeps -p$(p_gnsjlj)
- $(cross_gencontrol) dh_gencontrol -p$(p_gnsjlj) \
+ dh_strip -p$(p_gnatsjlj)
+ dh_compress -p$(p_gnatsjlj)
+ dh_fixperms -p$(p_gnatsjlj)
+ find $(d_gnatsjlj) -name '*.ali' | xargs chmod 444
+ dh_shlibdeps -p$(p_gnatsjlj)
+ dh_gencontrol -p$(p_gnatsjlj) \
-- -v$(DEB_VERSION) $(common_substvars)
- $(call cross_mangle_control,$(p_gnsjlj))
- dh_installdeb -p$(p_gnsjlj)
- dh_md5sums -p$(p_gnsjlj)
- dh_builddeb -p$(p_gnsjlj)
+ dh_installdeb -p$(p_gnatsjlj)
+ dh_md5sums -p$(p_gnatsjlj)
+ dh_builddeb -p$(p_gnatsjlj)
endif
trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
