[glibc] 01/01: sparc, sparc64: force target to sparcv9-linux-gnu instead of patching configure
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch glibc-2.24
in repository glibc.
commit 093cae044629389daed3198c6b4912d769c08fb5
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Sun Aug 7 00:09:21 2016 +0200
sparc,sparc64: force target to sparcv9-linux-gnu instead of patching configure
* debian/sysdeps/{sparc,sparc64}.mk: force target to sparcv9-linux-gnu.
* debian/patches/sparc/local-sparcv9-target.diff: drop, obsolete.
---
debian/changelog | 2 ++
debian/patches/series | 1 -
debian/patches/sparc/local-sparcv9-target.diff | 39 --------------------------
debian/sysdeps/sparc.mk | 3 ++
debian/sysdeps/sparc64.mk | 2 +-
5 files changed, 6 insertions(+), 41 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index bc58e10..2362d69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ glibc (2.24-0experimental1) UNRELEASED; urgency=medium
#825865.
* debian/patches/testsuite-xfail-debian.mk: remove xfail-test-wcsncmp on
sparc.
+ * debian/sysdeps/{sparc,sparc64}.mk: force target to sparcv9-linux-gnu.
+ * debian/patches/sparc/local-sparcv9-target.diff: drop, obsolete.
-- Samuel Thibault <sthibault@debian.org> Thu, 04 Aug 2016 09:20:04 +0200
diff --git a/debian/patches/series b/debian/patches/series
index 1bc08b8..cabddb7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -163,7 +163,6 @@ powerpc/submitted-powerpc-ifunc-sel.diff
sh4/local-fpscr_values.diff
-sparc/local-sparcv9-target.diff
sparc/submitted-sparc64-socketcall.diff
sparc/submitted-sparc-fdim.diff
sparc/cvs-test-strncmp.diff
diff --git a/debian/patches/sparc/local-sparcv9-target.diff b/debian/patches/sparc/local-sparcv9-target.diff
deleted file mode 100644
index 807ff82..0000000
--- a/debian/patches/sparc/local-sparcv9-target.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-# DP: Description: Optimizes the build for sparcv9
-# DP: Author: Ben Collins, Aurelien Jarno
-# DP: Upstream status: Debian-Specific
-# DP: Status Details:
-# DP: Date: July 19, 2007
-
----
- configure | 5 +++++
- configure.in | 5 +++++
- 2 files changed, 10 insertions(+)
-
---- a/configure
-+++ b/configure
-@@ -3856,6 +3856,11 @@
-
- submachine=
-
-+# Force v9
-+if test "$machine" = sparc; then
-+ machine="sparcv9"
-+fi
-+
- # Check whether --with-cpu was given.
- if test "${with_cpu+set}" = set; then :
- withval=$with_cpu; case "$withval" in
---- a/configure.ac
-+++ b/configure.ac
-@@ -336,6 +336,11 @@
- base_os=''
-
- submachine=
-+# Force v9
-+if test "$machine" = sparc; then
-+ machine="sparcv9"
-+fi
-+
- AC_ARG_WITH([cpu],
- AS_HELP_STRING([--with-cpu=CPU], [select code for CPU variant]),
- [dnl
diff --git a/debian/sysdeps/sparc.mk b/debian/sysdeps/sparc.mk
index c2e0f42..f88747a 100644
--- a/debian/sysdeps/sparc.mk
+++ b/debian/sysdeps/sparc.mk
@@ -1,6 +1,9 @@
# configuration options for all flavours
extra_config_options = --disable-multi-arch
+# main library
+libc_configure_target=sparcv9-linux-gnu
+
# build 64-bit (sparc64) alternative library
GLIBC_MULTILIB_PASSES += sparc64
DEB_ARCH_MULTILIB_PACKAGES += libc6-sparc64 libc6-dev-sparc64
diff --git a/debian/sysdeps/sparc64.mk b/debian/sysdeps/sparc64.mk
index 0c71a5b..3af602f 100644
--- a/debian/sysdeps/sparc64.mk
+++ b/debian/sysdeps/sparc64.mk
@@ -9,7 +9,7 @@ libc_rtlddir = /lib64
GLIBC_MULTILIB_PASSES += sparc
DEB_ARCH_MULTILIB_PACKAGES += libc6-sparc libc6-dev-sparc
libc6-sparc_shlib_dep = libc6-sparc (>= $(shlib_dep_ver))
-sparc_configure_target=sparc-linux-gnu
+sparc_configure_target=sparcv9-linux-gnu
sparc_CC = $(CC) -m32
sparc_CXX = $(CXX) -m32
sparc_rtlddir = /lib
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: