Emilio Pozuelo Monfort pushed to branch debian-unstable at X Strike Force / app
/ xutils-dev
Commits:
62dd9ad9 by Emilio Pozuelo Monfort at 2024-08-29T10:25:47+02:00
Fix AR command on GNU and FreeBSD
- - - - -
3 changed files:
- debian/changelog
- + debian/patches/08_gnu_ar_cq.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,5 +1,6 @@
xutils-dev (1:7.7+7) UNRELEASED; urgency=medium
+ [ Héctor Orón Martínez ]
* Team upload.
* debian/control: update Vcs fields.
* xorg-cf-files: Updated to 1.0.8.
@@ -11,6 +12,10 @@ xutils-dev (1:7.7+7) UNRELEASED; urgency=medium
* Update dh compat level to 10, no changes
* debian/salsa-ci.yml: enable gitlab CI
+ [ Emilio Pozuelo Monfort ]
+ * Fix AR command on GNU and FreeBSD. Thanks Samuel Thibault.
+ (Closes: #1077077)
+
-- Héctor Orón Martínez <zu...@debian.org> Thu, 10 Aug 2023 14:32:11 +0200
xutils-dev (1:7.7+6.1) unstable; urgency=medium
=====================================
debian/patches/08_gnu_ar_cq.patch
=====================================
@@ -0,0 +1,87 @@
+commit 90b66dc73deb9ef303690370395cf831425547c7
+Author: Yasuhiro Kimura <y...@utahime.org>
+Date: Thu Oct 13 15:22:02 2022 +0900
+
+ Fix incompatibility issue of GNU binutils 2.36 and later on FreeBSD.
+
+ Commit a6d4d6223ef75119d5373fa4cc04161bcdb4e769 fixes incompatibility
+ issue of GNU binutils 2.36 and later. If I check the diff of the
+ commit, there seems to be asumption that the issue is specific to
+ Linux. But it also happens on FreeBSD if user installs GNU binutils
+ from FreeBSD ports/packages collections and '/usr/local/bin' comes
+ before '/usr/bin' in the value of PATH enviroment variable. So fix the
+ issue also on FreeBSD with following way.
+
+ 1. Introduce new macro 'HasGnuAr'.
+ 2. Change Imake.tmpl so it defines 'ArCmd' as 'ArCmdBase cq' if
+ 'HasGnuAr' is defined.
+ 3. Define 'HasGnuAr' in both FreeBSD.cf and linux.cf.
+
+ Since 'ar' command of FreeBSD base system simply ignores 'l' option,
+ it also works fine even if GNU binutils isn't installed.
+
+commit 26b383ac4a5b65f808d1a159864fac266f136c84
+Author: Samuel Thibault <samuel.thiba...@ens-lyon.org>
+Date: Thu Jul 25 22:48:36 2024 +0200
+
+ Also fix incompatibility issue of GNU binutils 2.36 and later on GNU/Hurd
+
+ Just like 90b66dc73deb ("Fix incompatibility issue of GNU binutils 2.36
+ and later on FreeBSD.") did.
+
+Index: xutils-dev-7.7+6.2+hurd.1/xorg-cf-files/FreeBSD.cf
+===================================================================
+--- xutils-dev-7.7+6.2+hurd.1.orig/xorg-cf-files/FreeBSD.cf
++++ xutils-dev-7.7+6.2+hurd.1/xorg-cf-files/FreeBSD.cf
+@@ -153,6 +153,9 @@ XCOMM operating system: OSName (OSMajor
+ #ifndef HasFlex
+ #define HasFlex YES
+ #endif
++#ifndef HasGnuAr
++#define HasGnuAr YES
++#endif
+
+ #ifndef HasMktemp
+ #if (OSMajorVersion >= 4) || (OSMajorVersion == 3 && OSMinorVersion >= 1) || \
+Index: xutils-dev-7.7+6.2+hurd.1/xorg-cf-files/Imake.tmpl
+===================================================================
+--- xutils-dev-7.7+6.2+hurd.1.orig/xorg-cf-files/Imake.tmpl
++++ xutils-dev-7.7+6.2+hurd.1/xorg-cf-files/Imake.tmpl
+@@ -1140,7 +1140,7 @@ TCLIBDIR = TclLibDir
+ #define ArCmdBase ar
+ #endif
+ #ifndef ArCmd
+-#if HasLargeTmp || SystemV4 || LinuxBinUtilsMajorVersion
++#if HasLargeTmp || SystemV4 || HasGnuAr
+ #define ArCmd ArCmdBase cq
+ #else
+ #define ArCmd ArCmdBase clq
+Index: xutils-dev-7.7+6.2+hurd.1/xorg-cf-files/linux.cf
+===================================================================
+--- xutils-dev-7.7+6.2+hurd.1.orig/xorg-cf-files/linux.cf
++++ xutils-dev-7.7+6.2+hurd.1/xorg-cf-files/linux.cf
+@@ -103,6 +103,10 @@ XCOMM platform: $XFree86: xc/config/cf/
+ # define LinuxBinUtilsMajorVersion DefaultLinuxBinUtilsMajorVersion
+ #endif
+
++#ifndef HasGnuAr
++#define HasGnuAr YES
++#endif
++
+ XCOMM operating system: OSName
(OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
+ XCOMM libc:
(LinuxCLibMajorVersion./**/LinuxCLibMinorVersion./**/LinuxCLibTeenyVersion)
+ XCOMM binutils: (LinuxBinUtilsMajorVersion)
+Index: xutils-dev-7.7+6.2+hurd.1/xorg-cf-files/gnu.cf
+===================================================================
+--- xutils-dev-7.7+6.2+hurd.1.orig/xorg-cf-files/gnu.cf
++++ xutils-dev-7.7+6.2+hurd.1/xorg-cf-files/gnu.cf
+@@ -35,6 +35,9 @@ XCOMM $XdotOrg: xc/config/cf/gnu.cf,v 1.
+ #ifndef ManDirectoryRoot
+ # define ManDirectoryRoot /usr/share/man
+ #endif
++#ifndef HasGnuAr
++#define HasGnuAr YES
++#endif
+
+ XCOMM operating system: OSName
(OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
+ XCOMM libc:
(GnuCLibMajorVersion./**/GnuCLibMinorVersion./**/GnuCLibTeenyVersion)
=====================================
debian/patches/series
=====================================
@@ -3,3 +3,4 @@
05_xaw_without_xp.diff
06_font_path.diff
07_gnu_manpath.diff
+08_gnu_ar_cq.patch
View it on GitLab:
https://salsa.debian.org/xorg-team/app/xutils-dev/-/commit/62dd9ad9497f94267c9ff16748105d2ddbacb489
--
View it on GitLab:
https://salsa.debian.org/xorg-team/app/xutils-dev/-/commit/62dd9ad9497f94267c9ff16748105d2ddbacb489
You're receiving this email because of your account on salsa.debian.org.
