summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--debian/changelog11
-rw-r--r--debian/patches/ada-hurd.diff4
-rw-r--r--debian/patches/ada-kfreebsd.diff6
-rw-r--r--debian/rules.conf23
4 files changed, 23 insertions, 21 deletions
diff --git a/debian/changelog b/debian/changelog
index e954479..7817e02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,17 @@ gcc-4.9 (4.9.0-2) UNRELEASED; urgency=medium
* libgnatvsn: Use CC and CXX passed from the toplevel makefile, drop gnat
build dependency on g++. Addresses: #746688.
+ Merge from gnat-4.9 (4.9.0-1) unstable; urgency=low:
+
+ [Ludovic Brenta]
+ * debian/patches/ada-hurd.diff: refresh for new upstream version that
+ restores POSIX compliance in System.OS_Interface.timespec.
+ * debian/patches/ada-kfreebsd.diff: make System.OS_Interface.To_Timespec
+ consistent with s-osinte-posix.adb.
+ [Nicolas Boulenguez]
+ * rules.conf (Build-Depends): mention gnat before gnat-x.y so that
+ buildds can bootstrap 4.9 in unstable. Fixes: #744724.
+
-- Matthias Klose <doko@debian.org> Fri, 02 May 2014 13:51:28 +0200
gcc-4.9 (4.9.0-1) unstable; urgency=medium
diff --git a/debian/patches/ada-hurd.diff b/debian/patches/ada-hurd.diff
index f96993f..c4051ca 100644
--- a/debian/patches/ada-hurd.diff
+++ b/debian/patches/ada-hurd.diff
@@ -677,7 +677,7 @@ Index: b/src/gcc/ada/s-osinte-gnu.ads
+
+ type timespec is record
+ tv_sec : time_t;
-+ tv_nsec : time_t; -- TODO: revert to long, per POSIX
++ tv_nsec : long;
+ end record;
+ pragma Convention (C, timespec);
+
@@ -823,7 +823,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
===================================================================
--- a/src/gcc/ada/gcc-interface/Makefile.in
+++ b/src/gcc/ada/gcc-interface/Makefile.in
-@@ -1292,6 +1292,33 @@
+@@ -1296,6 +1296,33 @@
MISCLIB = -lutil
endif
diff --git a/debian/patches/ada-kfreebsd.diff b/debian/patches/ada-kfreebsd.diff
index d784f87..dbabf5d 100644
--- a/debian/patches/ada-kfreebsd.diff
+++ b/debian/patches/ada-kfreebsd.diff
@@ -171,7 +171,7 @@ Index: b/src/gcc/ada/s-osinte-kfreebsd-gnu.adb
+ end if;
+
+ return timespec'(tv_sec => S,
-+ tv_nsec => time_t (Long_Long_Integer (F * 10#1#E9)));
++ tv_nsec => long (Long_Long_Integer (F * 10#1#E9)));
+ end To_Timespec;
+
+end System.OS_Interface;
@@ -179,7 +179,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
===================================================================
--- a/src/gcc/ada/gcc-interface/Makefile.in
+++ b/src/gcc/ada/gcc-interface/Makefile.in
-@@ -1268,7 +1268,7 @@
+@@ -1272,7 +1272,7 @@
a-intnam.ads<a-intnam-freebsd.ads \
s-inmaop.adb<s-inmaop-posix.adb \
s-intman.adb<s-intman-posix.adb \
@@ -188,7 +188,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
s-osinte.ads<s-osinte-kfreebsd-gnu.ads \
s-osprim.adb<s-osprim-posix.adb \
s-taprop.adb<s-taprop-posix.adb \
-@@ -1326,7 +1326,7 @@
+@@ -1330,7 +1330,7 @@
a-numaux.ads<a-numaux-x86.ads \
s-inmaop.adb<s-inmaop-posix.adb \
s-intman.adb<s-intman-posix.adb \
diff --git a/debian/rules.conf b/debian/rules.conf
index 1329dfd..9c1f7bb 100644
--- a/debian/rules.conf
+++ b/debian/rules.conf
@@ -462,13 +462,9 @@ ifeq ($(PKGSOURCE),gcc-$(BASE_VERSION))
#GNAT_BUILD_DEP := gnat (>= 4.1) [$(ada_no_archs)],
# Bootstrap step needs a gnatgcc symbolic link.
GNAT_BUILD_DEP := \
- gnat-4.9 [!arm !armhf !arm64 !powerpcspe !sh4 !sparc64 !hurd-i386] \
- | gnat-4.6 (>= 4.6.4-2) [!arm !armhf !arm64 !powerpcspe !sh4 !sparc64 !hurd-i386] \
- | gnat (>= 4.1) [!arm !armhf !arm64 !powerpcspe !sh4 !sparc64 !hurd-i386],
- GNAT_BUILD_DEP := \
- gnat-4.9 [!arm !armhf !arm64 !powerpcspe !sh4 !sparc64 !hurd-i386] \
- | gnat-4.6 (>= 4.6.4-2) [!arm !armhf !arm64 !powerpcspe !sh4 !sparc64 !hurd-i386] \
- | gnat (<< 4.6.1) [!arm !armhf !arm64 !powerpcspe !sh4 !sparc64 !hurd-i386],
+ gnat (>= 4.1) [!arm !armhf !arm64 !powerpcspe !sh4 !sparc64 !hurd-i386] \
+ | gnat-4.9 [!arm !armhf !arm64 !powerpcspe !sh4 !sparc64 !hurd-i386] \
+ | gnat-4.6 (>= 4.6.4-2) [!arm !armhf !arm64 !powerpcspe !sh4 !sparc64 !hurd-i386],
endif
else ifeq ($(single_package),yes)
# Ditto, as part of the gcc-snapshot package.
@@ -476,19 +472,14 @@ else ifeq ($(single_package),yes)
#GNAT_BUILD_DEP := gnat (>= 4.1) [$(ada_no_archs)], gcc-snapshot (>= 20090821-1) [armel armhf],
# Bootstrap step needs a gnatgcc symbolic link.
GNAT_BUILD_DEP := \
- gnat-4.9 [!arm !armhf !arm64 !powerpcspe !sh4 !sparc64 !hurd-i386] \
- | gnat-4.6 (>= 4.6.4-2) [!arm !armhf !arm64 !powerpcspe !sh4 !sparc64 !hurd-i386] \
- | gnat (>= 4.1) [!arm !armhf !arm64 !powerpcspe !sh4 !sparc64 !hurd-i386],
- GNAT_BUILD_DEP += \
- gnat-4.9 [!arm !armhf !arm64 !powerpcspe !sh4 !sparc64 !hurd-i386] \
- | gnat-4.6 (>= 4.6.4-2) [!arm !armhf !arm64 !powerpcspe !sh4 !sparc64 !hurd-i386] \
- | gnat (<< 4.6.1) [!arm !armhf !arm64 !powerpcspe !sh4 !sparc64 !hurd-i386],
+ gnat (>= 4.1) [!arm !armhf !arm64 !powerpcspe !sh4 !sparc64 !hurd-i386] \
+ | gnat-4.9 [!arm !armhf !arm64 !powerpcspe !sh4 !sparc64 !hurd-i386] \
+ | gnat-4.6 (>= 4.6.4-2) [!arm !armhf !arm64 !powerpcspe !sh4 !sparc64 !hurd-i386],
else ifeq ($(PKGSOURCE),gnat-$(BASE_VERSION))
# Special source package just for gnat. Fail early if gnat is not present,
# rather than waste CPU cycles and fail later.
# Bootstrap step needs a gnatgcc symbolic link.
- GNAT_BUILD_DEP := gnat-4.9 | gnat-4.6 (>= 4.6.4-2) | gnat (>= 4.1),
- GNAT_BUILD_DEP += gnat-4.9 | gnat-4.6 (>= 4.6.4-2) | gnat (<< 4.6.1),
+ GNAT_BUILD_DEP := gnat (>= 4.1) | gnat-4.9 | gnat-4.6 (>= 4.6.4-2),
GNAT_BUILD_DEP += $(SOURCE_BUILD_DEP)
JAVA_BUILD_DEP :=
JAVA_BUILD_INDEP :=
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-18 22:30:23 +0000