Prevent discarding of -g when compiling with clang
This commit is contained in:
Tom Stellard
parent
ac5c236f18
commit
53c8c93125
@ -1,18 +1,41 @@
|
|||||||
From 6710648c2b270c9ce68a7d9f1bba1222c7be8b58 Mon Sep 17 00:00:00 2001
|
From 3602ee9dcc74683f91fe4f9ca228aa17a6474403 Mon Sep 17 00:00:00 2001
|
||||||
From: Kamil Dudka <kdudka@redhat.com>
|
From: Kamil Dudka <kdudka@redhat.com>
|
||||||
Date: Wed, 31 Oct 2012 11:38:30 +0100
|
Date: Wed, 31 Oct 2012 11:38:30 +0100
|
||||||
Subject: [PATCH] prevent configure script from discarding -g in CFLAGS (#496778)
|
Subject: [PATCH] prevent configure script from discarding -g in CFLAGS
|
||||||
|
(#496778)
|
||||||
|
|
||||||
---
|
---
|
||||||
configure | 13 +++----------
|
configure | 26 ++++++--------------------
|
||||||
m4/curl-compilers.m4 | 13 +++----------
|
m4/curl-compilers.m4 | 26 ++++++--------------------
|
||||||
2 files changed, 6 insertions(+), 20 deletions(-)
|
2 files changed, 12 insertions(+), 40 deletions(-)
|
||||||
|
|
||||||
diff --git a/configure b/configure
|
diff --git a/configure b/configure
|
||||||
index 8f079a3..53b4774 100755
|
index d6d125f49..3eba7b15f 100755
|
||||||
--- a/configure
|
--- a/configure
|
||||||
+++ b/configure
|
+++ b/configure
|
||||||
@@ -16343,18 +16343,11 @@ $as_echo "yes" >&6; }
|
@@ -16269,18 +16269,11 @@ $as_echo "no" >&6; }
|
||||||
|
clangvhi=`echo $clangver | cut -d . -f1`
|
||||||
|
clangvlo=`echo $clangver | cut -d . -f2`
|
||||||
|
compiler_num=`(expr $clangvhi "*" 100 + $clangvlo) 2>/dev/null`
|
||||||
|
- flags_dbg_all="-g -g0 -g1 -g2 -g3"
|
||||||
|
- flags_dbg_all="$flags_dbg_all -ggdb"
|
||||||
|
- flags_dbg_all="$flags_dbg_all -gstabs"
|
||||||
|
- flags_dbg_all="$flags_dbg_all -gstabs+"
|
||||||
|
- flags_dbg_all="$flags_dbg_all -gcoff"
|
||||||
|
- flags_dbg_all="$flags_dbg_all -gxcoff"
|
||||||
|
- flags_dbg_all="$flags_dbg_all -gdwarf-2"
|
||||||
|
- flags_dbg_all="$flags_dbg_all -gvms"
|
||||||
|
+ flags_dbg_all=""
|
||||||
|
flags_dbg_yes="-g"
|
||||||
|
flags_dbg_off=""
|
||||||
|
- flags_opt_all="-O -O0 -O1 -O2 -Os -O3 -O4"
|
||||||
|
- flags_opt_yes="-Os"
|
||||||
|
+ flags_opt_all=""
|
||||||
|
+ flags_opt_yes=""
|
||||||
|
flags_opt_off="-O0"
|
||||||
|
else
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||||
|
@@ -16343,18 +16336,11 @@ $as_echo "yes" >&6; }
|
||||||
gccvhi=`echo $gccver | cut -d . -f1`
|
gccvhi=`echo $gccver | cut -d . -f1`
|
||||||
gccvlo=`echo $gccver | cut -d . -f2`
|
gccvlo=`echo $gccver | cut -d . -f2`
|
||||||
compiler_num=`(expr $gccvhi "*" 100 + $gccvlo) 2>/dev/null`
|
compiler_num=`(expr $gccvhi "*" 100 + $gccvlo) 2>/dev/null`
|
||||||
@ -35,10 +58,32 @@ index 8f079a3..53b4774 100755
|
|||||||
|
|
||||||
OLDCPPFLAGS=$CPPFLAGS
|
OLDCPPFLAGS=$CPPFLAGS
|
||||||
diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4
|
diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4
|
||||||
index 0cbba7a..9175b5b 100644
|
index c64db4bc6..d115a4aed 100644
|
||||||
--- a/m4/curl-compilers.m4
|
--- a/m4/curl-compilers.m4
|
||||||
+++ b/m4/curl-compilers.m4
|
+++ b/m4/curl-compilers.m4
|
||||||
@@ -166,18 +166,11 @@ AC_DEFUN([CURL_CHECK_COMPILER_GNU_C], [
|
@@ -106,18 +106,11 @@ AC_DEFUN([CURL_CHECK_COMPILER_CLANG], [
|
||||||
|
clangvhi=`echo $clangver | cut -d . -f1`
|
||||||
|
clangvlo=`echo $clangver | cut -d . -f2`
|
||||||
|
compiler_num=`(expr $clangvhi "*" 100 + $clangvlo) 2>/dev/null`
|
||||||
|
- flags_dbg_all="-g -g0 -g1 -g2 -g3"
|
||||||
|
- flags_dbg_all="$flags_dbg_all -ggdb"
|
||||||
|
- flags_dbg_all="$flags_dbg_all -gstabs"
|
||||||
|
- flags_dbg_all="$flags_dbg_all -gstabs+"
|
||||||
|
- flags_dbg_all="$flags_dbg_all -gcoff"
|
||||||
|
- flags_dbg_all="$flags_dbg_all -gxcoff"
|
||||||
|
- flags_dbg_all="$flags_dbg_all -gdwarf-2"
|
||||||
|
- flags_dbg_all="$flags_dbg_all -gvms"
|
||||||
|
+ flags_dbg_all=""
|
||||||
|
flags_dbg_yes="-g"
|
||||||
|
flags_dbg_off=""
|
||||||
|
- flags_opt_all="-O -O0 -O1 -O2 -Os -O3 -O4"
|
||||||
|
- flags_opt_yes="-Os"
|
||||||
|
+ flags_opt_all=""
|
||||||
|
+ flags_opt_yes=""
|
||||||
|
flags_opt_off="-O0"
|
||||||
|
else
|
||||||
|
AC_MSG_RESULT([no])
|
||||||
|
@@ -166,18 +159,11 @@ AC_DEFUN([CURL_CHECK_COMPILER_GNU_C], [
|
||||||
gccvhi=`echo $gccver | cut -d . -f1`
|
gccvhi=`echo $gccver | cut -d . -f1`
|
||||||
gccvlo=`echo $gccver | cut -d . -f2`
|
gccvlo=`echo $gccver | cut -d . -f2`
|
||||||
compiler_num=`(expr $gccvhi "*" 100 + $gccvlo) 2>/dev/null`
|
compiler_num=`(expr $gccvhi "*" 100 + $gccvlo) 2>/dev/null`
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
|
Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
|
||||||
Name: curl
|
Name: curl
|
||||||
Version: 7.69.1
|
Version: 7.69.1
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
License: MIT
|
License: MIT
|
||||||
Source: https://curl.haxx.se/download/%{name}-%{version}.tar.xz
|
Source: https://curl.haxx.se/download/%{name}-%{version}.tar.xz
|
||||||
|
|
||||||
@ -346,6 +346,9 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la
|
|||||||
%{_libdir}/libcurl.so.4.[0-9].[0-9].minimal
|
%{_libdir}/libcurl.so.4.[0-9].[0-9].minimal
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Apr 17 2020 Tom Stellard <tstellar@redhat.com> - 7.69.1-2
|
||||||
|
- Prevent discarding of -g when compiling with clang
|
||||||
|
|
||||||
* Wed Mar 11 2020 Kamil Dudka <kdudka@redhat.com> - 7.69.1-1
|
* Wed Mar 11 2020 Kamil Dudka <kdudka@redhat.com> - 7.69.1-1
|
||||||
- new upstream release
|
- new upstream release
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user