Package: gcc-4.1
Version: 4.1.0-3
Severity: serious
Tags: patch
Sorry about this, but I just discovered that one Ada unit consisting
of two files, fname.ads and fname.adb, incorrectly appears in both
libgnatvsn and libgnatprj (it should only be in libgnatvsn). As a
result, GNAT refuses to compile any project that uses
/usr/share/ada/adainclude/gnatprj.gpr. The package libgnatprj-dev is
not exactly unusable (as project files are not mandatory), but nearly
enough so that I think this is a serious bug.
The patch below corrects that. Proposed changelog entry:
[Ludovic Brenta]
* Fix a stupid bug whereby fname.ad{b,s} would be included in both
libgnatvsn-dev and libgnatprj-dev, preventing use of gnatprj.gpr.
Closes: #...
--
Ludovic Brenta.
--- patches/ada-libgnatprj.dpatch 1c18bbdfc2a6556772e1a9a1f517b78b8f7fa56e
+++ patches/ada-libgnatprj.dpatch e060f9341f5dc9e6930a36dcf5a8bcedf3a35243
@@ -104,7 +104,7 @@
# We will use the just-built compiler to compile and link everything.
GCC=../gcc/xgcc -B../gcc/
-@@ -66,77 +66,11 @@
+@@ -66,76 +66,11 @@
# Since we don't have gnatmake, we must specify the full list of
# object files necessary to build gnatmake and gnatlink.
@@ -114,7 +114,6 @@
-ali.o \
-butil.o \
-fmap.o \
--fname.o \
-gnatlink.o \
-indepsw.o \
-osint.o \
@@ -365,7 +364,7 @@
+# Here we list one file per Ada unit: the body file if the unit has a
+# body, the spec file otherwise.
+PRJ_SOURCES := ali.adb ali-util.adb butil.adb binderr.adb errout.adb \
-+erroutc.adb errutil.adb err_vars.ads fmap.adb fname.adb impunit.adb \
++erroutc.adb errutil.adb err_vars.ads fmap.adb impunit.adb \
+lib-util.adb mlib.adb mlib-fil.adb mlib-tgt.adb mlib-utl.adb osint.adb
osint-c.adb \
+prj.adb prj-attr.adb prj-attr-pm.adb prj-com.ads prj-dect.adb prj-env.adb \
+prj-err.adb prj-ext.adb prj-nmsc.adb prj-part.adb prj-pp.adb prj-proc.adb \
============================================================
--- patches/ada-libgnatvsn.dpatch ab91381a9783709c4fa0ee8afa45e5d9a1db2f4b
+++ patches/ada-libgnatvsn.dpatch 57c92b3a80269b27404f494dbbe2b78357ddac0b
@@ -90,7 +90,7 @@
# We will use the just-built compiler to compile and link everything.
GCC=../gcc/xgcc -B../gcc/
-@@ -66,60 +67,34 @@
+@@ -66,60 +67,33 @@
# Since we don't have gnatmake, we must specify the full list of
# object files necessary to build gnatmake and gnatlink.
# TODO: remove from these lists the objects that are part of
@@ -104,7 +104,7 @@
-csets.o \
-debug.o \
fmap.o \
- fname.o \
+-fname.o \
gnatlink.o \
-gnatvsn.o \
-hostparm.o \
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
