← Back to branch summary

~ubuntu-branches/ubuntu/lucid/gcj-4.3/lucid

« back to all changes in this revision

Viewing changes to debian/rules2

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2009-09-23 20:07:15 UTC
  • mfrom: (1.2.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20090923200715-x4vshvbcfqgtwshr
Tags: 4.3.4-3ubuntu1
Sync with gcc-4.3 4.3.4-3ubuntu1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/rules2
140
140
endif
141
141
 
142
142
lib32           = $(PF)/lib32
143
 
ifneq ($(PKGSOURCE),gcc-snapshot)
144
 
  ifeq ($(distribution)-$(DEB_TARGET_ARCH),Debian-amd64)
145
 
    lib32               = emul/ia32-linux/usr/lib
146
 
  endif
147
 
endif
148
143
lib64           = lib64
149
144
libn32          = lib32
150
145
 
181
176
        --prefix=/$(PF) \
182
177
        --enable-shared \
183
178
        --enable-multiarch \
 
179
        --enable-linker-build-id \
184
180
        --with-system-zlib \
185
181
 
186
182
ifneq ($(PKGSOURCE),gcc-snapshot)
292
288
ifneq (,$(findstring arm-linux-gnueabi,$(DEB_TARGET_GNU_TYPE)))
293
289
  CONFARGS += --disable-sjlj-exceptions
294
290
  ifeq ($(distribution),Ubuntu)
295
 
    CONFARGS += --with-arch=armv5t --with-tune=cortex-a8
296
 
    #CONFARGS += --with-float=softfp --with-fpu=vfp
297
 
    #CONFARGS += --enable-multilib
 
291
    CONFARGS += --with-arch=armv6 --with-tune=cortex-a8
 
292
    CONFARGS += --with-float=softfp --with-fpu=vfp
298
293
  endif
299
294
endif
300
295
 
1257
1252
ifeq ($(with_gccbase),yes)
1258
1253
  include debian/rules.d/binary-base.mk
1259
1254
endif
1260
 
ifeq ($(with_libgcc),yes)
1261
 
  include debian/rules.d/binary-libgcc.mk
1262
 
endif
 
1255
include debian/rules.d/binary-libgcc.mk
1263
1256
 
1264
1257
ifeq ($(with_gccmath),yes)
1265
1258
  include debian/rules.d/binary-libgccmath.mk
1657
1650
          echo "removed RPATH: $$i"; \
1658
1651
        done
1659
1652
 
1660
 
ifneq (,$(findstring emul/ia32-linux, $(lib32)))
1661
 
        mkdir -p $(d)/$(lib32)
1662
 
        mv $(d)/$(PF)/lib32/* $(d)/$(lib32)/.
1663
 
        rmdir $(d)/$(PF)/lib32
1664
 
endif
1665
 
 
1666
1653
        : # fix '*.la' and '*.lai' files
1667
1654
        for i in $$(find $(d) -name '*.la' -o -name '*.lai'); do \
1668
1655
          libdir=$$(sed -n "s,^libdir='\(.*\)'.*,\1,p" $$i); \