Bug#798531: gcc-5: fix ada acats tests:
Package: src:gcc-5
Version: 5.2.1-16
Use the correct libgnatvsn/libgnatprj path, and don't remove
objects file in gnattools build, as they are needed when build/run tests.
--
YunQiang Su
diff --git a/debian/patches/ada-acats.diff b/debian/patches/ada-acats.diff
index b34ac0e..d06acfd 100644
--- a/debian/patches/ada-acats.diff
+++ b/debian/patches/ada-acats.diff
@@ -6,7 +6,7 @@ Index: b/src/gcc/testsuite/ada/acats/run_acats
===================================================================
--- a/src/gcc/testsuite/ada/acats/run_acats
+++ b/src/gcc/testsuite/ada/acats/run_acats
-@@ -20,52 +20,29 @@ which () {
+@@ -20,52 +20,30 @@ which () {
return 1
}
@@ -48,10 +48,11 @@ Index: b/src/gcc/testsuite/ada/acats/run_acats
- exit 1
-fi
-
-+GNATTOOLS=`cd $BASE/../gnattools; ${PWDCMD-pwd}`
-+LIBGNATVSN=`cd $BASE/../libgnatvsn; ${PWDCMD-pwd}`
-+LIBGNATPRJ=`cd $BASE/../libgnatprj; ${PWDCMD-pwd}`
GCC_DRIVER="$BASE/xgcc"
++TARGET=`${GCC_DRIVER} -v 2>&1 |grep '^Target:' | cut -d' ' -f2`
++GNATTOOLS=`cd $BASE/../gnattools; ${PWDCMD-pwd}`
++LIBGNATVSN=`cd $BASE/../${TARGET}/libgnatvsn; ${PWDCMD-pwd}`
++LIBGNATPRJ=`cd $BASE/../${TARGET}/libgnatprj; ${PWDCMD-pwd}`
GCC="$BASE/xgcc -B$BASE/"
export PATH ADA_INCLUDE_PATH ADA_OBJECTS_PATH GCC_DRIVER GCC LD_LIBRARY_PATH
-
diff --git a/debian/patches/ada-gnattools-cross.diff b/debian/patches/ada-gnattools-cross.diff
index fa41bab..bb3cc27 100644
--- a/debian/patches/ada-gnattools-cross.diff
+++ b/debian/patches/ada-gnattools-cross.diff
@@ -356,7 +356,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
test -f $(RTSDIR)/s-oscons.ads || exit 1
# C files
$(MAKE) -C $(RTSDIR) \
-@@ -2795,32 +2670,47 @@ gnatlib: ../stamp-gnatlib1-$(RTSDIR) ../
+@@ -2795,32 +2670,44 @@ gnatlib: ../stamp-gnatlib1-$(RTSDIR) ../
# Warning: this target assumes that LIBRARY_VERSION has been set correctly.
gnatlib-shared-default:
@@ -413,14 +413,11 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
+ l=lib$${lib}$(hyphen)$(LIBRARY_VERSION)$(soext); \
+ $(LN_S) $$l.1 $$l; \
+ done
-+# Delete the object files, lest they be linked statically into the tools
-+# executables. Only the .ali, .a and .so files must remain.
-+ rm -f $(RTSDIR)/*.o
+ $(CHMOD) a-wx $(RTSDIR)/*.ali
gnatlib-shared-dual:
$(MAKE) $(FLAGS_TO_PASS) \
-@@ -2829,17 +2719,15 @@ gnatlib-shared-dual:
+@@ -2829,17 +2716,15 @@ gnatlib-shared-dual:
GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C)" \
MULTISUBDIR="$(MULTISUBDIR)" \
THREAD_KIND="$(THREAD_KIND)" \
@@ -441,7 +438,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
gnatlib-shared-dual-win32:
$(MAKE) $(FLAGS_TO_PASS) \
-@@ -2849,17 +2737,15 @@ gnatlib-shared-dual-win32:
+@@ -2849,17 +2734,15 @@ gnatlib-shared-dual-win32:
PICFLAG_FOR_TARGET="$(PICFLAG_FOR_TARGET)" \
MULTISUBDIR="$(MULTISUBDIR)" \
THREAD_KIND="$(THREAD_KIND)" \
@@ -462,7 +459,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
# ??? we need to add the option to support auto-import of arrays/records to
# the GNATLIBFLAGS when this will be supported by GNAT. At this point we will
-@@ -3097,6 +2983,68 @@ targext.o : targext.c
+@@ -3097,6 +2980,68 @@ targext.o : targext.c
$(ALL_CPPFLAGS) $(INCLUDES_FOR_SUBDIR) \
$< $(OUTPUT_OPTION)
Reply to: