diff options
| author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2015-05-22 16:21:02 +0000 |
|---|---|---|
| committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2015-05-22 16:21:02 +0000 |
| commit | e630e19e4ce867f71e77c21db608c0b1c9be2e17 (patch) | |
| tree | 4a73fd75ac24247e9efeb6038b3ecb975c4ed264 /debian/rules2 | |
| parent | 00b164b7b08e616bbf14a383246e9a7ea43557bf (diff) | |
| download | gcc-5-e630e19e4ce867f71e77c21db608c0b1c9be2e17.tar.gz | |
* Various fixes to build a gnat cross compiler:
- Fix dependencies of packages.
- Fix building libgnatprj and libgnatvsn (still needed to figure
out if these are target or host libraries).
* Fix building cross compilers with dpkg 1.18.
git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-5@8060 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
Diffstat (limited to 'debian/rules2')
| -rw-r--r-- | debian/rules2 | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/debian/rules2 b/debian/rules2 index 3e09224..7bb90a5 100644 --- a/debian/rules2 +++ b/debian/rules2 @@ -90,7 +90,7 @@ else ifeq ($(with_ada),yes) gnatgcc := $(firstword $(wildcard /usr/bin/gnatgcc-5 /usr/bin/gnatgcc)) ifneq (,$(gnatgcc)) - CC = gnatgcc + CC = $(gnatgcc) else CC = gcc endif @@ -2217,10 +2217,6 @@ endif : # remove '*.la' and '*.lai' files, not shipped in any package. find $(d) -name '*.la' -o -name '*.lai' | xargs -r rm -f -ifneq ($(with_libgnat),yes) - rm -f $(d)/$(gcc_lib_dir)/adalib/lib*.so* -endif - ifeq ($(GFDL_INVARIANT_FREE),yes) for i in gcc gcov; do \ I=`echo $$i | tr a-z A-Z`; \ @@ -2245,6 +2241,19 @@ ifeq ($(GFDL_INVARIANT_FREE),yes) endif endif +ifneq ($(with_libgnat),yes) + rm -f $(d)/$(gcc_lib_dir)/adalib/lib*.so* +endif + +# FIXME: libgnatprj and libgnatvsn need proper configury/Makefiles +ifeq ($(DEB_CROSS),yes) + ifeq ($(with_ada),yes) + for i in 'libgnatprj*' 'libgnatvsn*'; do \ + mv $(d)/$(PF)/lib/$$i $(d)/$(usr_lib)/. || true; \ + done + endif +endif + # ifeq ($(with_ada),yes) # : # rename files (versioned ada binaries) # for i in ; do \ |