diff options
Diffstat (limited to 'debian/rules.patch')
| -rw-r--r-- | debian/rules.patch | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/debian/rules.patch b/debian/rules.patch index 75ed421..f058a0e 100644 --- a/debian/rules.patch +++ b/debian/rules.patch @@ -207,11 +207,7 @@ ifeq ($(single_package),yes) debian_patches = endif -ifeq ($(trunk_build),yes) - debian_patches += gcc-sysroot-trunk -else - debian_patches += gcc-sysroot -endif +debian_patches += gcc-sysroot debian_patches += libgo-mksysinfo ifeq ($(with_softfloat),yes) @@ -268,13 +264,9 @@ ifeq ($(biarch64),yes) endif debian_patches += gcc-powerpc-undef ifneq (,$(findstring /$(DEB_TARGET_ARCH)/,$(biarch32archs))) -ifneq ($(DEB_TARGET_ARCH),x32) - ifeq ($(trunk_build),yes) - debian_patches += gcc-multilib64-multiarch-trunk - else - debian_patches += gcc-multilib64-multiarch - endif -endif + ifneq ($(DEB_TARGET_ARCH),x32) + debian_patches += gcc-multilib64-multiarch + endif endif ifeq ($(DEB_TARGET_ARCH),x32) debian_patches += gcc-multilibx32-multiarch |