Attachment 11622 Details for Bug 26517 – we never ever ship glibc-debug in mga...

[patch] we never ever ship glibc-debug in mga...

0001-we-never-ever-ship-glibc-debug-in-mga.patch (text/plain), 3.33 KB, created by Thierry Vignaud on 2020-05-08 07:14:54 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Vignaud

Created: 2020-05-08 07:14:54 CEST

Size: 3.33 KB

patch

obsolete

>From 31b8a32b8d13bb2def73290e9b8602a93366419f Mon Sep 17 00:00:00 2001
>From: Thierry Vignaud <thierry.vignaud@gmail.com>
>Date: Fri, 8 May 2020 07:06:25 +0200
>Subject: [PATCH 1/2] we never ever ship glibc-debug in mga...
>
>---
> SPECS/glibc.spec | 55 ------------------------------------------------
> 1 file changed, 55 deletions(-)
>
>diff --git a/SPECS/glibc.spec b/SPECS/glibc.spec
>index 16e6c5a..f8242e5 100644
>--- a/SPECS/glibc.spec
>+++ b/SPECS/glibc.spec
>@@ -83,13 +83,6 @@
> %define build_biarch	1
> %endif
> 
>-# Define to build glibc-debug package
>-%define build_debug	1
>-%define _enable_debug_packages 1
>-%if "%{_enable_debug_packages}" == "1"
>-%define build_debug	0
>-%endif
>-
> # Define to bootstrap new glibc
> %define build_bootstrap	0
> %{expand: %{!?build_cross_bootstrap: %global build_cross_bootstrap 0}}
>@@ -107,7 +100,6 @@
> %define build_pdf_doc	0
> %define build_biarch	0
> %define build_check	0
>-%define build_debug	0
> %define build_nscd	0
> %define build_profile	0
> %define build_utils	0
>@@ -359,9 +351,6 @@ Obsoletes:	libc-debug, libc-headers, libc-devel, linuxthreads-devel, nptl-devel
> %ifarch x86_64
> Provides: devel(libm(64bit))
> %endif
>-%if !%{build_debug}
>-Obsoletes:	%{name}-debug < 6:2.3.2-15
>-%endif
> Requires:	%{name} = %{glibcepoch}:%{glibcversion}-%{glibcrelease}
> %if !%{build_cross}
> Requires:	linux-userspace-headers
>@@ -439,22 +428,6 @@ particularly hard.
> Install nscd if you need a name service lookup caching daemon, and
> you're not using a version 2.0 kernel.
> 
>-%if %{build_debug}
>-%package	debug
>-Summary:	Shared standard C libraries with debugging information
>-Group:		System/Libraries
>-Requires:	%{name} = %{glibcepoch}:%{glibcversion}-%{glibcrelease}
>-Autoreq:	false
>-
>-%description debug
>-The glibc-debug package contains shared standard C libraries with
>-debugging information. You need this only if you want to step into C
>-library routines during debugging.
>-
>-To use these libraries, you need to add %{_libdir}/debug to your
>-LD_LIBRARY_PATH variable prior to starting the debugger.
>-%endif
>-
> %package utils
> Summary:	Development utilities from GNU C library
> Group:		Development/Other
>@@ -938,20 +911,6 @@ chmod 644 $RPM_BUILD_ROOT%{_libdir}/gconv/gconv-modules.cache
> touch $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.cache
> %endif
> 
>-# Add libraries to debug sub-package
>-%if %{build_debug}
>-mkdir $RPM_BUILD_ROOT%{_libdir}/debug
>-#cp -a $RPM_BUILD_ROOT%{_libdir}/*.a $RPM_BUILD_ROOT%{_libdir}/debug/
>-#rm -f $RPM_BUILD_ROOT%{_libdir}/debug/*_p.a
>-cp -a $RPM_BUILD_ROOT%{_slibdir}/lib*.so* $RPM_BUILD_ROOT%{_libdir}/debug/
>-
>-pushd $RPM_BUILD_ROOT%{_libdir}/debug
>-for lib in *.so*; do
>-  [[ -f "$lib" ]] && DEBUG_LIBS="$DEBUG_LIBS %{_libdir}/debug/$lib"
>-done
>-popd
>-%endif
>-
> # Are we cross-compiling?
> Strip="strip"
> if [[ "%{_target_cpu}" != "%{target_cpu}" ]]; then
>@@ -1076,10 +1035,6 @@ export DONT_SYMLINK_LIBS=1
> export PATH=%{_bindir}:$PATH
> %endif
> 
>-%if %build_debug
>-export EXCLUDE_FROM_STRIP="$DEBUG_LIBS"
>-%endif
>-
> # This will make the '-g' argument to be passed to eu-strip for these
> # libraries, so that only debug symbols are stripped and gdb/valgrind continue
> # to work without needing glibc-debug package to be installed.
>@@ -1317,16 +1272,6 @@ fi
> %doc manual/libc.pdf
> %endif
> 
>-#
>-# glibc-debug
>-#
>-%if %{build_debug}
>-%files debug
>-%dir %{_libdir}/debug
>-%{_libdir}/debug/*.so
>-%{_libdir}/debug/*.so.*
>-%endif
>-
> #
> # glibc-profile
> #
>-- 
>2.26.2
>

From 31b8a32b8d13bb2def73290e9b8602a93366419f Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Fri, 8 May 2020 07:06:25 +0200
Subject: [PATCH 1/2] we never ever ship glibc-debug in mga...

---
 SPECS/glibc.spec | 55 ------------------------------------------------
 1 file changed, 55 deletions(-)

diff --git a/SPECS/glibc.spec b/SPECS/glibc.spec
index 16e6c5a..f8242e5 100644
--- a/SPECS/glibc.spec
+++ b/SPECS/glibc.spec
@@ -83,13 +83,6 @@
 %define build_biarch	1
 %endif
 
-# Define to build glibc-debug package
-%define build_debug	1
-%define _enable_debug_packages 1
-%if "%{_enable_debug_packages}" == "1"
-%define build_debug	0
-%endif
-
 # Define to bootstrap new glibc
 %define build_bootstrap	0
 %{expand: %{!?build_cross_bootstrap: %global build_cross_bootstrap 0}}
@@ -107,7 +100,6 @@
 %define build_pdf_doc	0
 %define build_biarch	0
 %define build_check	0
-%define build_debug	0
 %define build_nscd	0
 %define build_profile	0
 %define build_utils	0
@@ -359,9 +351,6 @@ Obsoletes:	libc-debug, libc-headers, libc-devel, linuxthreads-devel, nptl-devel
 %ifarch x86_64
 Provides: devel(libm(64bit))
 %endif
-%if !%{build_debug}
-Obsoletes:	%{name}-debug < 6:2.3.2-15
-%endif
 Requires:	%{name} = %{glibcepoch}:%{glibcversion}-%{glibcrelease}
 %if !%{build_cross}
 Requires:	linux-userspace-headers
@@ -439,22 +428,6 @@ particularly hard.
 Install nscd if you need a name service lookup caching daemon, and
 you're not using a version 2.0 kernel.
 
-%if %{build_debug}
-%package	debug
-Summary:	Shared standard C libraries with debugging information
-Group:		System/Libraries
-Requires:	%{name} = %{glibcepoch}:%{glibcversion}-%{glibcrelease}
-Autoreq:	false
-
-%description debug
-The glibc-debug package contains shared standard C libraries with
-debugging information. You need this only if you want to step into C
-library routines during debugging.
-
-To use these libraries, you need to add %{_libdir}/debug to your
-LD_LIBRARY_PATH variable prior to starting the debugger.
-%endif
-
 %package utils
 Summary:	Development utilities from GNU C library
 Group:		Development/Other
@@ -938,20 +911,6 @@ chmod 644 $RPM_BUILD_ROOT%{_libdir}/gconv/gconv-modules.cache
 touch $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.cache
 %endif
 
-# Add libraries to debug sub-package
-%if %{build_debug}
-mkdir $RPM_BUILD_ROOT%{_libdir}/debug
-#cp -a $RPM_BUILD_ROOT%{_libdir}/*.a $RPM_BUILD_ROOT%{_libdir}/debug/
-#rm -f $RPM_BUILD_ROOT%{_libdir}/debug/*_p.a
-cp -a $RPM_BUILD_ROOT%{_slibdir}/lib*.so* $RPM_BUILD_ROOT%{_libdir}/debug/
-
-pushd $RPM_BUILD_ROOT%{_libdir}/debug
-for lib in *.so*; do
-  [[ -f "$lib" ]] && DEBUG_LIBS="$DEBUG_LIBS %{_libdir}/debug/$lib"
-done
-popd
-%endif
-
 # Are we cross-compiling?
 Strip="strip"
 if [[ "%{_target_cpu}" != "%{target_cpu}" ]]; then
@@ -1076,10 +1035,6 @@ export DONT_SYMLINK_LIBS=1
 export PATH=%{_bindir}:$PATH
 %endif
 
-%if %build_debug
-export EXCLUDE_FROM_STRIP="$DEBUG_LIBS"
-%endif
-
 # This will make the '-g' argument to be passed to eu-strip for these
 # libraries, so that only debug symbols are stripped and gdb/valgrind continue
 # to work without needing glibc-debug package to be installed.
@@ -1317,16 +1272,6 @@ fi
 %doc manual/libc.pdf
 %endif
 
-#
-# glibc-debug
-#
-%if %{build_debug}
-%files debug
-%dir %{_libdir}/debug
-%{_libdir}/debug/*.so
-%{_libdir}/debug/*.so.*
-%endif
-
 #
 # glibc-profile
 #
-- 
2.26.2

Actions: View | Diff

Attachments on bug 26517: 11622 | 11623 | 11624 | 11625 | 11626 | 11627 | 11628 | 11629 | 11630 | 11631