diff options
| author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2013-08-28 15:52:49 +0000 |
|---|---|---|
| committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2013-08-28 15:52:49 +0000 |
| commit | 452ee7dcd54e33fd4af31d665139388011f629e1 (patch) | |
| tree | 5fa85c8152c7c12f191e219531aabc396ffa7ebc /debian/rules2 | |
| parent | a13af918ff20c0cfbecfc6319d4f6bc6cdbefc9f (diff) | |
| download | gcc-48-452ee7dcd54e33fd4af31d665139388011f629e1.tar.gz | |
* Add packaging support for mips64(el) and mipsn32(el) including multilib
configurations (YunQiang Su). Addresses: #708143.
git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.8@6949 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
Diffstat (limited to 'debian/rules2')
| -rw-r--r-- | debian/rules2 | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/debian/rules2 b/debian/rules2 index 097084c..4c34ff4 100644 --- a/debian/rules2 +++ b/debian/rules2 @@ -806,7 +806,11 @@ endif gcc_lib_dir = $(PF)/$(configured_libdir)/$(gcc_subdir_name)/$(TARGET_ALIAS)/$(versiondir) gcc_lexec_dir = $(libexecdir)/$(gcc_subdir_name)/$(TARGET_ALIAS)/$(versiondir) -lib32 = $(PF)/lib32 +lib32loc = lib32 +ifneq (,$(findstring mips,$(DEB_TARGET_GNU_TYPE))) +lib32loc = lib +endif +lib32 = $(PF)/$(lib32loc) lib64 = lib64 libn32 = lib32 libx32 = libx32 @@ -830,7 +834,7 @@ ifeq ($(DEB_CROSS),yes) else usr_lib = $(PFL)/$(libdir) endif -usr_lib32 = $(PFL)/lib32 +usr_lib32 = $(PFL)/$(lib32loc) usr_libn32 = $(PFL)/lib32 usr_libx32 = $(PFL)/libx32 usr_lib64 = $(PFL)/lib64 @@ -852,7 +856,7 @@ gcc_lib_dirsf = $(gcc_lib_dir)/$(biarchsfsubdir) libgcc_dir = $(RPF)/$(libdir) # yes, really; lib32gcc_s ends up in usr -libgcc_dir32 = $(PFL)/lib32 +libgcc_dir32 = $(PFL)/$(lib32loc) libgcc_dirn32 = $(RPF)/lib32 # libx32gcc_s also ends up in usr libgcc_dirx32 = $(PFL)/libx32 @@ -1954,6 +1958,8 @@ ifneq ($(configured_libdir),$(libdir)) for i in debug go pkgconfig '*.so' '*.so.*' '*.a' '*.la' '*.py' '*.spec'; do \ mv $(d)/$(PF)/$(configured_libdir)/$$i \ $(d)/$(PF)/$(libdir)/. || true; \ + mv $(d)/$(PF)/libo32/$$i \ + $(d)/$(PF)/lib/. || true; \ done endif @@ -2003,7 +2009,7 @@ $(install_stamp): $(build_stamp) rm -rf $(d) mkdir -p $(d)/$(libdir) $(d)/$(PF) $(d)/$(PF)/$(libdir)/debug ifeq ($(biarch32),yes) - mkdir -p $(d)/$(PF)/lib32/debug + mkdir -p $(d)/$(PF)/$(lib32loc)/debug endif ifeq ($(biarch64),yes) mkdir -p $(d)/$(PF)/lib64/debug @@ -2049,6 +2055,8 @@ ifneq ($(configured_libdir),$(libdir)) for i in debug go pkgconfig '*.so' '*.so.*' '*.a' '*.la' '*.o' '*.py' '*.spec'; do \ mv $(d)/$(PF)/$(configured_libdir)/$$i \ $(d)/$(PF)/$(libdir)/. || true; \ + mv $(d)/$(PF)/libo32/$$i \ + $(d)/$(PF)/lib/. || true; \ done endif |