Source: gnat-4.8 Version: 4.8.2-4 Severity: important Tags: patch Usertags: ppc64 Please revert debian/patches/ada-ppc64.diff for fixing /lib64 detection. Here is a patch and buildlog. By the way, I surmise that mips64el and sparc64 ports also have this /lib64 detection bug on gcc/ada/gcc-interface/Makefile.in file, but it is unsure. Regards, -- Hiroyuki Yamamoto A75D B285 7050 4BF9 AEDA 91AC 3A10 59C6 5203 04DC
diff -Nurd gnat-4.8-4.8.2.orig/debian/patches/ada-ppc64.diff gnat-4.8-4.8.2/debian/patches/ada-ppc64.diff --- gnat-4.8-4.8.2.orig/debian/patches/ada-ppc64.diff 1970-01-01 09:00:00.000000000 +0900 +++ gnat-4.8-4.8.2/debian/patches/ada-ppc64.diff 2013-12-10 00:11:01.000000000 +0900 @@ -0,0 +1,24 @@ +# Fix 32/64 bit detection, broken due to the fact Debian installs +# 64-bit libraries in lib and not lib64. Fix based on the s390/s390x +# detection. + +--- a/src/gcc/ada/gcc-interface/Makefile.in ++++ b/src/gcc/ada/gcc-interface/Makefile.in +@@ -1858,9 +1858,14 @@ + LIBGNAT_TARGET_PAIRS_64 = \ + system.ads<system-linux-ppc64.ads + +- ifeq ($(strip $(shell $(GCC_FOR_TARGET) $(GNATLIBCFLAGS) -print-multi-os-directory)),../lib64) +- LIBGNAT_TARGET_PAIRS = \ +- $(LIBGNAT_TARGET_PAIRS_COMMON) $(LIBGNAT_TARGET_PAIRS_64) ++ ifeq ($(strip $(filter-out powerpc64,$(arch))),) ++ ifeq ($(strip $(MULTISUBDIR)),/32) ++ LIBGNAT_TARGET_PAIRS = \ ++ $(LIBGNAT_TARGET_PAIRS_COMMON) $(LIBGNAT_TARGET_PAIRS_32) ++ else ++ LIBGNAT_TARGET_PAIRS = \ ++ $(LIBGNAT_TARGET_PAIRS_COMMON) $(LIBGNAT_TARGET_PAIRS_64) ++ endif + else + LIBGNAT_TARGET_PAIRS = \ + $(LIBGNAT_TARGET_PAIRS_COMMON) $(LIBGNAT_TARGET_PAIRS_32) diff -Nurd gnat-4.8-4.8.2.orig/debian/rules.patch gnat-4.8-4.8.2/debian/rules.patch --- gnat-4.8-4.8.2.orig/debian/rules.patch 2013-10-30 05:06:25.000000000 +0900 +++ gnat-4.8-4.8.2/debian/rules.patch 2013-12-10 07:46:47.000000000 +0900 @@ -122,7 +122,8 @@ ada-gcc-name \ ada-default-project-path \ ada-symbolic-tracebacks \ - ada-library-project-files-soname + ada-library-project-files-soname \ + ada-ppc64 ifeq ($(biarch64),yes) debian_patches += \
Attachment:
gnat-4.8_4.8.2-4_buildlog.tar.xz
Description: application/xz