summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDongkyun Son <dongkyun.s@samsung.com>2020-01-20 21:18:22 +0900
committerDongkyun Son <dongkyun.s@samsung.com>2020-01-20 21:22:05 +0900
commit6180343701dbc278aebb35e48de667d76728cebd (patch)
tree85ef8bfae101fc8c5a50b1a1547380fc8d4e0e1e
parent1173d36d74e6a3f37e14eb74fe462b2fe21097b5 (diff)
downloadbinutils-6180343701dbc278aebb35e48de667d76728cebd.tar.gz
binutils-6180343701dbc278aebb35e48de667d76728cebd.tar.bz2
binutils-6180343701dbc278aebb35e48de667d76728cebd.zip
This reverts commit 1173d36d74e6a3f37e14eb74fe462b2fe21097b5. Change-Id: Ib806f5d5937aaca855c24389e18861870e26bf81
-rw-r--r--packaging/binutils-aarch64.spec46
-rw-r--r--packaging/binutils-armv7hl.spec46
-rw-r--r--packaging/binutils-armv7l.spec46
-rw-r--r--packaging/binutils.spec46
4 files changed, 24 insertions, 160 deletions
diff --git a/packaging/binutils-aarch64.spec b/packaging/binutils-aarch64.spec
index 4114cfe1688..1e0ad2dcc68 100644
--- a/packaging/binutils-aarch64.spec
+++ b/packaging/binutils-aarch64.spec
@@ -34,12 +34,12 @@ Name: binutils%{?cross:-%{cross}}
BuildRequires: makeinfo
BuildRequires: bison
BuildRequires: flex
-BuildRequires: expat-devel
BuildRequires: ncurses-devel
BuildRequires: zlib-devel
BuildRequires: gcc-c++
%if 0%{?binutils_run_tests}
BuildRequires: dejagnu
+BuildRequires: gdb
BuildRequires: glibc-devel-static
%endif
Version: 2.33.1
@@ -80,28 +80,6 @@ This package includes header files and static libraries necessary to
build programs which use the GNU BFD library, which is part of
binutils.
-%{!?cross:
-%package -n gdb
-Summary: A GNU source-level debugger for C, C++, Java and other languages
-License: GPL-3.0+
-Group: Development/Building
-Requires: python
-
-%description -n gdb
-GDB, the GNU debugger, allows you to debug programs written in C, C++,
-Java, and other languages, by executing them in a controlled fashion
-and printing their data.
-}
-%package -n gdb-server
-Summary: A standalone server for GDB (the GNU source-level debugger)
-
-%description -n gdb-server
-GDB, the GNU debugger, allows you to debug programs written in C, C++,
-Java, and other languages, by executing them in a controlled fashion
-and printing their data.
-
-This package provides a program that allows you to run GDB on a different machine than the one
-which is running the program being debugged.
%prep
%setup -q -n binutils-%{version}
@@ -119,7 +97,7 @@ cd build-dir
../configure \
--prefix=%{_prefix} --libdir=%{_libdir} \
--infodir=%{_infodir} --mandir=%{_mandir} \
- --with-bugurl=https://bugs.tizen.org/ \
+ --with-bugurl=http://bugs.tizen.org/ \
--with-sysroot=/ \
--disable-nls \
--with-separate-debug-dir=%{_prefix}/lib/debug \
@@ -138,12 +116,7 @@ cd build-dir
--enable-plugins \
--enable-gold \
--enable-shared \
- --enable-new-dtags \
- --with-gdb-datadir=%{_datadir}/gdb \
- --enable-gdb-build-warnings=,-Wno-unused \
- --with-separate-debug-dir=/usr/lib/debug \
- --disable-sim \
- --with-expat
+ --enable-new-dtags
make %{?_smp_mflags}
@@ -173,6 +146,9 @@ install -m 644 ../include/libiberty.h %{buildroot}%{_prefix}/include
# Remove unwanted files to shut up rpm
%{remove_docs}
+rm -rf %{buildroot}%{_bindir}/gcore
+rm -rf %{buildroot}%{_bindir}/gdb*
+rm -rf %{buildroot}%{_datadir}/gdb
rm -rf %{buildroot}%{_libdir}/lib{bfd,opcodes,inproctrace}.{so,la}
%{?cross:
rm -rf %{buildroot}%{_prefix}/%{target_arch}/lib/ldscripts
@@ -188,7 +164,6 @@ rm -rf %{buildroot}%{_datadir}
%{_bindir}/*
%{_prefix}/%{target_arch}/bin/*
%{!?cross:
-%exclude %{_bindir}/gdb*
%exclude %{_bindir}/ld.gold
%exclude %{_prefix}/%{target_arch}/bin/ld.gold
%{_libdir}/*.so
@@ -206,15 +181,6 @@ rm -rf %{buildroot}%{_datadir}
%defattr(-,root,root)
%{_bindir}/ld.gold
%{_prefix}/%{target_arch}/bin/ld.gold
-
-%files -n gdb
-%{_datadir}/gdb
-%{_bindir}/gcore
-%{_bindir}/gdb
-%{_bindir}/gdb-add-index
-
-%files -n gdb-server
-%{_bindir}/gdbserver
}
%changelog
diff --git a/packaging/binutils-armv7hl.spec b/packaging/binutils-armv7hl.spec
index bb9823c334d..84314439363 100644
--- a/packaging/binutils-armv7hl.spec
+++ b/packaging/binutils-armv7hl.spec
@@ -34,12 +34,12 @@ Name: binutils%{?cross:-%{cross}}
BuildRequires: makeinfo
BuildRequires: bison
BuildRequires: flex
-BuildRequires: expat-devel
BuildRequires: ncurses-devel
BuildRequires: zlib-devel
BuildRequires: gcc-c++
%if 0%{?binutils_run_tests}
BuildRequires: dejagnu
+BuildRequires: gdb
BuildRequires: glibc-devel-static
%endif
Version: 2.33.1
@@ -80,28 +80,6 @@ This package includes header files and static libraries necessary to
build programs which use the GNU BFD library, which is part of
binutils.
-%{!?cross:
-%package -n gdb
-Summary: A GNU source-level debugger for C, C++, Java and other languages
-License: GPL-3.0+
-Group: Development/Building
-Requires: python
-
-%description -n gdb
-GDB, the GNU debugger, allows you to debug programs written in C, C++,
-Java, and other languages, by executing them in a controlled fashion
-and printing their data.
-}
-%package -n gdb-server
-Summary: A standalone server for GDB (the GNU source-level debugger)
-
-%description -n gdb-server
-GDB, the GNU debugger, allows you to debug programs written in C, C++,
-Java, and other languages, by executing them in a controlled fashion
-and printing their data.
-
-This package provides a program that allows you to run GDB on a different machine than the one
-which is running the program being debugged.
%prep
%setup -q -n binutils-%{version}
@@ -119,7 +97,7 @@ cd build-dir
../configure \
--prefix=%{_prefix} --libdir=%{_libdir} \
--infodir=%{_infodir} --mandir=%{_mandir} \
- --with-bugurl=https://bugs.tizen.org/ \
+ --with-bugurl=http://bugs.tizen.org/ \
--with-sysroot=/ \
--disable-nls \
--with-separate-debug-dir=%{_prefix}/lib/debug \
@@ -138,12 +116,7 @@ cd build-dir
--enable-plugins \
--enable-gold \
--enable-shared \
- --enable-new-dtags \
- --with-gdb-datadir=%{_datadir}/gdb \
- --enable-gdb-build-warnings=,-Wno-unused \
- --with-separate-debug-dir=/usr/lib/debug \
- --disable-sim \
- --with-expat
+ --enable-new-dtags
make %{?_smp_mflags}
@@ -173,6 +146,9 @@ install -m 644 ../include/libiberty.h %{buildroot}%{_prefix}/include
# Remove unwanted files to shut up rpm
%{remove_docs}
+rm -rf %{buildroot}%{_bindir}/gcore
+rm -rf %{buildroot}%{_bindir}/gdb*
+rm -rf %{buildroot}%{_datadir}/gdb
rm -rf %{buildroot}%{_libdir}/lib{bfd,opcodes,inproctrace}.{so,la}
%{?cross:
rm -rf %{buildroot}%{_prefix}/%{target_arch}/lib/ldscripts
@@ -188,7 +164,6 @@ rm -rf %{buildroot}%{_datadir}
%{_bindir}/*
%{_prefix}/%{target_arch}/bin/*
%{!?cross:
-%exclude %{_bindir}/gdb*
%exclude %{_bindir}/ld.gold
%exclude %{_prefix}/%{target_arch}/bin/ld.gold
%{_libdir}/*.so
@@ -206,15 +181,6 @@ rm -rf %{buildroot}%{_datadir}
%defattr(-,root,root)
%{_bindir}/ld.gold
%{_prefix}/%{target_arch}/bin/ld.gold
-
-%files -n gdb
-%{_datadir}/gdb
-%{_bindir}/gcore
-%{_bindir}/gdb
-%{_bindir}/gdb-add-index
-
-%files -n gdb-server
-%{_bindir}/gdbserver
}
%changelog
diff --git a/packaging/binutils-armv7l.spec b/packaging/binutils-armv7l.spec
index 3d72059c8fb..fb0e2456df6 100644
--- a/packaging/binutils-armv7l.spec
+++ b/packaging/binutils-armv7l.spec
@@ -34,12 +34,12 @@ Name: binutils%{?cross:-%{cross}}
BuildRequires: makeinfo
BuildRequires: bison
BuildRequires: flex
-BuildRequires: expat-devel
BuildRequires: ncurses-devel
BuildRequires: zlib-devel
BuildRequires: gcc-c++
%if 0%{?binutils_run_tests}
BuildRequires: dejagnu
+BuildRequires: gdb
BuildRequires: glibc-devel-static
%endif
Version: 2.33.1
@@ -80,28 +80,6 @@ This package includes header files and static libraries necessary to
build programs which use the GNU BFD library, which is part of
binutils.
-%{!?cross:
-%package -n gdb
-Summary: A GNU source-level debugger for C, C++, Java and other languages
-License: GPL-3.0+
-Group: Development/Building
-Requires: python
-
-%description -n gdb
-GDB, the GNU debugger, allows you to debug programs written in C, C++,
-Java, and other languages, by executing them in a controlled fashion
-and printing their data.
-}
-%package -n gdb-server
-Summary: A standalone server for GDB (the GNU source-level debugger)
-
-%description -n gdb-server
-GDB, the GNU debugger, allows you to debug programs written in C, C++,
-Java, and other languages, by executing them in a controlled fashion
-and printing their data.
-
-This package provides a program that allows you to run GDB on a different machine than the one
-which is running the program being debugged.
%prep
%setup -q -n binutils-%{version}
@@ -119,7 +97,7 @@ cd build-dir
../configure \
--prefix=%{_prefix} --libdir=%{_libdir} \
--infodir=%{_infodir} --mandir=%{_mandir} \
- --with-bugurl=https://bugs.tizen.org/ \
+ --with-bugurl=http://bugs.tizen.org/ \
--with-sysroot=/ \
--disable-nls \
--with-separate-debug-dir=%{_prefix}/lib/debug \
@@ -138,12 +116,7 @@ cd build-dir
--enable-plugins \
--enable-gold \
--enable-shared \
- --enable-new-dtags \
- --with-gdb-datadir=%{_datadir}/gdb \
- --enable-gdb-build-warnings=,-Wno-unused \
- --with-separate-debug-dir=/usr/lib/debug \
- --disable-sim \
- --with-expat
+ --enable-new-dtags
make %{?_smp_mflags}
@@ -173,6 +146,9 @@ install -m 644 ../include/libiberty.h %{buildroot}%{_prefix}/include
# Remove unwanted files to shut up rpm
%{remove_docs}
+rm -rf %{buildroot}%{_bindir}/gcore
+rm -rf %{buildroot}%{_bindir}/gdb*
+rm -rf %{buildroot}%{_datadir}/gdb
rm -rf %{buildroot}%{_libdir}/lib{bfd,opcodes,inproctrace}.{so,la}
%{?cross:
rm -rf %{buildroot}%{_prefix}/%{target_arch}/lib/ldscripts
@@ -188,7 +164,6 @@ rm -rf %{buildroot}%{_datadir}
%{_bindir}/*
%{_prefix}/%{target_arch}/bin/*
%{!?cross:
-%exclude %{_bindir}/gdb*
%exclude %{_bindir}/ld.gold
%exclude %{_prefix}/%{target_arch}/bin/ld.gold
%{_libdir}/*.so
@@ -206,15 +181,6 @@ rm -rf %{buildroot}%{_datadir}
%defattr(-,root,root)
%{_bindir}/ld.gold
%{_prefix}/%{target_arch}/bin/ld.gold
-
-%files -n gdb
-%{_datadir}/gdb
-%{_bindir}/gcore
-%{_bindir}/gdb
-%{_bindir}/gdb-add-index
-
-%files -n gdb-server
-%{_bindir}/gdbserver
}
%changelog
diff --git a/packaging/binutils.spec b/packaging/binutils.spec
index 78051e2aeec..abaa2b57772 100644
--- a/packaging/binutils.spec
+++ b/packaging/binutils.spec
@@ -31,12 +31,12 @@ Name: binutils%{?cross:-%{cross}}
BuildRequires: makeinfo
BuildRequires: bison
BuildRequires: flex
-BuildRequires: expat-devel
BuildRequires: ncurses-devel
BuildRequires: zlib-devel
BuildRequires: gcc-c++
%if 0%{?binutils_run_tests}
BuildRequires: dejagnu
+BuildRequires: gdb
BuildRequires: glibc-devel-static
%endif
Version: 2.33.1
@@ -77,28 +77,6 @@ This package includes header files and static libraries necessary to
build programs which use the GNU BFD library, which is part of
binutils.
-%{!?cross:
-%package -n gdb
-Summary: A GNU source-level debugger for C, C++, Java and other languages
-License: GPL-3.0+
-Group: Development/Building
-Requires: python
-
-%description -n gdb
-GDB, the GNU debugger, allows you to debug programs written in C, C++,
-Java, and other languages, by executing them in a controlled fashion
-and printing their data.
-}
-%package -n gdb-server
-Summary: A standalone server for GDB (the GNU source-level debugger)
-
-%description -n gdb-server
-GDB, the GNU debugger, allows you to debug programs written in C, C++,
-Java, and other languages, by executing them in a controlled fashion
-and printing their data.
-
-This package provides a program that allows you to run GDB on a different machine than the one
-which is running the program being debugged.
%prep
%setup -q -n binutils-%{version}
@@ -116,7 +94,7 @@ cd build-dir
../configure \
--prefix=%{_prefix} --libdir=%{_libdir} \
--infodir=%{_infodir} --mandir=%{_mandir} \
- --with-bugurl=https://bugs.tizen.org/ \
+ --with-bugurl=http://bugs.tizen.org/ \
--with-sysroot=/ \
--disable-nls \
--with-separate-debug-dir=%{_prefix}/lib/debug \
@@ -135,12 +113,7 @@ cd build-dir
--enable-plugins \
--enable-gold \
--enable-shared \
- --enable-new-dtags \
- --with-gdb-datadir=%{_datadir}/gdb \
- --enable-gdb-build-warnings=,-Wno-unused \
- --with-separate-debug-dir=/usr/lib/debug \
- --disable-sim \
- --with-expat
+ --enable-new-dtags
make %{?_smp_mflags}
@@ -170,6 +143,9 @@ install -m 644 ../include/libiberty.h %{buildroot}%{_prefix}/include
# Remove unwanted files to shut up rpm
%{remove_docs}
+rm -rf %{buildroot}%{_bindir}/gcore
+rm -rf %{buildroot}%{_bindir}/gdb*
+rm -rf %{buildroot}%{_datadir}/gdb
rm -rf %{buildroot}%{_libdir}/lib{bfd,opcodes,inproctrace}.{so,la}
%{?cross:
rm -rf %{buildroot}%{_prefix}/%{target_arch}/lib/ldscripts
@@ -185,7 +161,6 @@ rm -rf %{buildroot}%{_datadir}
%{_bindir}/*
%{_prefix}/%{target_arch}/bin/*
%{!?cross:
-%exclude %{_bindir}/gdb*
%exclude %{_bindir}/ld.gold
%exclude %{_prefix}/%{target_arch}/bin/ld.gold
%{_libdir}/*.so
@@ -203,15 +178,6 @@ rm -rf %{buildroot}%{_datadir}
%defattr(-,root,root)
%{_bindir}/ld.gold
%{_prefix}/%{target_arch}/bin/ld.gold
-
-%files -n gdb
-%{_datadir}/gdb
-%{_bindir}/gcore
-%{_bindir}/gdb
-%{_bindir}/gdb-add-index
-
-%files -n gdb-server
-%{_bindir}/gdbserver
}
%changelog