Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
5475679ed4
!15 update license from GFDL to GFDL-1.3-or-later
From: @renxichen 
Reviewed-by: @licihua 
Signed-off-by: @licihua
2022-04-22 11:12:14 +00:00
rwx403335
00d89759b2 update license from GFDL to GFDL-1.3-or-later 2022-04-22 14:14:21 +08:00
openeuler-ci-bot
65657cecef !7 fix F77 language support, Fortran language support, Libtool stress test fail on standard_x86_64
From: @tong_1001
Reviewed-by: @xiezhipeng1
Signed-off-by: @xiezhipeng1
2021-05-29 16:44:11 +08:00
xia_qirong
5fb6bd943f fix F77 language support, Fortran language support, Libtool stress test fail on standard_x86_64 2021-05-29 13:00:17 +08:00
openeuler-ci-bot
1fe607a71b !4 add necessary BuildRequires
Merge pull request !4 from chengquan/developer
2020-03-20 15:25:20 +08:00
chengquan
a8dfb8aee5 add necessary BuildRequires 2020-03-19 19:41:20 +08:00
openeuler-ci-bot
131d600191 !3 Fixbug in wrong dependency of kernel-devel
Merge pull request !3 from chengquan/developer
2020-01-20 16:23:38 +08:00
chengquan
046f71870c Fixbug in wrong dependency of kernel-devel 2020-01-20 15:41:03 +08:00
openeuler-ci-bot
2f36db2075 !2 format patches
Merge pull request !2 from lvying6/dev
2020-01-11 16:07:38 +08:00
lvying6
a968d20286 format patches 2020-01-11 15:32:35 +08:00
5 changed files with 45 additions and 80 deletions

View File

@ -1,14 +0,0 @@
diff --git a/Makefile.am b/Makefile.am
index 13dfc63..5c5603a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -311,6 +311,9 @@ libtool: $(ltmain_sh) $(config_status) $(dotversion)
include libltdl/ltdl.mk
+libltdl_libltdl_la_CPPFLAGS += $(CUSTOM_LTDL_CFLAGS)
+libltdl_libltdl_la_LDFLAGS += $(CUSTOM_LTDL_LDFLAGS)
+
lt_aclocal_m4 = $(srcdir)/$(ltdl_dir)/aclocal.m4
lt_config_h_in = $(srcdir)/$(ltdl_dir)/config-h.in
lt_configure = $(srcdir)/$(ltdl_dir)/configure

View File

@ -10,14 +10,12 @@ shell code.
func_fatal_error call. func_fatal_error call.
Copyright-paperwork-exempt: Yes Copyright-paperwork-exempt: Yes
Upstream: 350082b6aa89f9ef603fcebbb4cf33f15a743f2f
--- ---
build-aux/ltmain.in | 2 +- build-aux/ltmain.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
index 0ad021db..c3058f21 100644 index 0ad021d..c3058f2 100644
--- a/build-aux/ltmain.in --- a/build-aux/ltmain.in
+++ b/build-aux/ltmain.in +++ b/build-aux/ltmain.in
@@ -212,7 +212,7 @@ fi @@ -212,7 +212,7 @@ fi
@ -30,5 +28,4 @@ index 0ad021db..c3058f21 100644
"Fatal configuration error." "Fatal configuration error."
} }
-- --
2.17.1 1.8.3.1

View File

@ -1,7 +1,7 @@
From 702a97fbb09bd7088a50f2b239016d1e32843c24 Mon Sep 17 00:00:00 2001 From 702a97fbb09bd7088a50f2b239016d1e32843c24 Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com> From: Pavel Raiskup <praiskup@redhat.com>
Date: Fri, 18 Sep 2015 10:36:43 +0200 Date: Fri, 18 Sep 2015 10:36:43 +0200
Subject: libtool: fix GCC linking with -specs=* Subject: [PATCH] libtool: fix GCC linking with -specs=*
References: References:
https://bugzilla.redhat.com/show_bug.cgi?id=985592 https://bugzilla.redhat.com/show_bug.cgi?id=985592
@ -33,5 +33,4 @@ index d5cf07a..0c40da0 100644
arg=$func_quote_for_eval_result arg=$func_quote_for_eval_result
func_append compile_command " $arg" func_append compile_command " $arg"
-- --
cgit v1.0-41-gc330 1.8.3.1

View File

@ -1,40 +0,0 @@
diff -up libtool-2.4.6/Makefile.in.nodocs libtool-2.4.6/Makefile.in
--- libtool-2.4.6/Makefile.in.nodocs 2017-04-21 12:46:20.704300023 +0200
+++ libtool-2.4.6/Makefile.in 2017-04-21 12:46:42.696840234 +0200
@@ -313,12 +313,11 @@ MAKEINFOHTML = $(MAKEINFO) --html
AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS)
DVIPS = dvips
RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
- ctags-recursive dvi-recursive html-recursive info-recursive \
- install-data-recursive install-dvi-recursive \
- install-exec-recursive install-html-recursive \
- install-info-recursive install-pdf-recursive \
- install-ps-recursive install-recursive installcheck-recursive \
- installdirs-recursive pdf-recursive ps-recursive \
+ ctags-recursive \
+ install-data-recursive \
+ install-exec-recursive \
+ install-recursive installcheck-recursive \
+ installdirs-recursive \
tags-recursive uninstall-recursive
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
@@ -361,8 +360,7 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
-am__DIST_COMMON = $(dist_man1_MANS) $(doc_libtool_TEXINFOS) \
- $(srcdir)/Makefile.in $(srcdir)/config-h.in \
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config-h.in \
$(srcdir)/libltdl/ltdl.mk $(top_srcdir)/build-aux/compile \
$(top_srcdir)/build-aux/config.guess \
$(top_srcdir)/build-aux/config.sub \
@@ -1973,7 +1971,7 @@ info: info-recursive
info-am: $(INFO_DEPS)
install-data-am: install-data-local install-includeHEADERS \
- install-info-am install-ltdlincludeHEADERS install-man
+ install-ltdlincludeHEADERS
install-dvi: install-dvi-recursive

View File

@ -3,41 +3,43 @@
Name: libtool Name: libtool
Version: 2.4.6 Version: 2.4.6
Release: 29 Release: 34
License: GPLv2+ and LGPLv2+ and GFDL License: GPLv2+ and LGPLv2+ and GFDL-1.3-or-later
Summary: The GNU Portable Library Tool Summary: The GNU Portable Library Tool
URL: http://www.gnu.org/software/libtool/ URL: http://www.gnu.org/software/libtool/
Source0: http://ftp.gnu.org/gnu/libtool/libtool-%{version}.tar.xz Source0: http://ftp.gnu.org/gnu/libtool/libtool-%{version}.tar.xz
Patch0: libtool-2.4.5-rpath.patch Patch0: libtool-2.4.5-rpath.patch
Patch1: libtool-2.4.6-am-1.16-test.patch Patch1: libtool-2.4.6-am-1.16-test.patch
Patch2: libtool-2.4.6-specs.patch Patch6000: libtool-exit-verbosely-for-fatal-configure-problems.patch
Patch3: libtool-2.4.6-hardening.patch Patch6001: libtool-fix-GCC-linking-with-specs.patch
Patch4: libtool-2.4.6-fatal-handler.patch
Patch5: libtool-nodocs.patch
Requires: gcc(major),autoconf, automake, sed, tar, findutils Requires: gcc(major),autoconf, automake, sed, tar, findutils
BuildRequires: texinfo,autoconf, automake,help2man BuildRequires: texinfo autoconf automake help2man gdb
BuildRequires: libstdc++-devel, gcc-gfortran,gcc, gcc-c++ BuildRequires: libstdc++-devel gcc-gfortran gcc gcc-c++
Provides: %{name}-ltdl
Obsoletes: %{name}-ltdl
%description %description
GNU libtool is a generic library support script. GNU libtool is a generic library support script.
Libtool hides the complexity of using shared libraries behind a consistent, portable interface. Libtool hides the complexity of using shared libraries behind a consistent, portable interface.
%package ltdl
Summary: Runtime libraries for GNU Libtool Dynamic Module Loader
Provides: %{name}-libs = %{version}-%{release}
%description ltdl
The libtool-ltdl package contains the GNU Libtool Dynamic Module Loader, a
library that provides a consistent, portable interface which simplifies the
process of using dynamic modules.
%package devel %package devel
Summary: Tools needed for development using the GNU Libtool Dynamic Module Loader Summary: Tools needed for development using the GNU Libtool Dynamic Module Loader
License: LGPLv2+ License: LGPLv2+
Requires: automake Requires: automake
Requires: %{name} = %{version}-%{release} Requires: %{name}-ltdl = %{version}-%{release}
Provides: %{name}-ltdl-devel Provides: %{name}-ltdl-devel
Obsoletes: %{name}-ltdl-devel Obsoletes: %{name}-ltdl-devel
%description devel %description devel
Static libraries and header files for development with ltdl. Static libraries and header files for development with ltdl.
@ -55,6 +57,10 @@ export F77=gfortran
export CFLAGS="$RPM_OPT_FLAGS -fPIC" export CFLAGS="$RPM_OPT_FLAGS -fPIC"
export FFLAGS=$(echo "$RPM_OPT_FLAGS -I/usr/lib64/gfortran/modules"| sed 's/-fstack-protector-strong/ /g') export FFLAGS=$(echo "$RPM_OPT_FLAGS -I/usr/lib64/gfortran/modules"| sed 's/-fstack-protector-strong/ /g')
export FCFLAGS=$(echo "$RPM_OPT_FLAGS -I/usr/lib64/gfortran/modules"| sed 's/-fstack-protector-strong/ /g') export FCFLAGS=$(echo "$RPM_OPT_FLAGS -I/usr/lib64/gfortran/modules"| sed 's/-fstack-protector-strong/ /g')
%ifarch x86_64
export FFLAGS="$RPM_OPT_FLAGS -fPIE"
export FCFLAGS="$RPM_OPT_FLAGS -fPIE"
%endif
%configure %configure
@ -70,15 +76,17 @@ rm -f %{buildroot}%{_libdir}/libltdl.{a,la}
%files %files
%license COPYING %license COPYING
%license libltdl/COPYING.LIB
%doc AUTHORS NEWS THANKS TODO ChangeLog* %doc AUTHORS NEWS THANKS TODO ChangeLog*
%{_bindir}/libtool %{_bindir}/libtool
%{_bindir}/libtoolize %{_bindir}/libtoolize
%{_libdir}/libltdl.so.*
%{_datadir}/aclocal/*.m4 %{_datadir}/aclocal/*.m4
%dir %{_datadir}/libtool %dir %{_datadir}/libtool
%{_datadir}/libtool/build-aux %{_datadir}/libtool/build-aux
%files ltdl
%license libltdl/COPYING.LIB
%{_libdir}/libltdl.so.*
%files devel %files devel
%license libltdl/COPYING.LIB %license libltdl/COPYING.LIB
%doc libltdl/README %doc libltdl/README
@ -96,6 +104,21 @@ rm -f %{buildroot}%{_libdir}/libltdl.{a,la}
%changelog %changelog
* Fri Apr 22 2022 renhongxun <renhongxun@h-partners.com> - 2.4.6-34
- update license from GFDL to GFDL-1.3-or-later
* Sat May 29 2021 shixuantong <shixuantong@huawei.com> - 2.4.6-33
- fix F77 language support, Fortran language support, Libtool stress test fail on standard_x86_64
* Thu Mar 19 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.4.6-32
- add necessary BuildRequires
* Mon Jan 20 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.4.6-31
- fixbug in wrong dependency of kernel-devel
* Wed Jan 8 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.4.6-30
- format patches
* Thu Sep 5 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.4.6-29 * Thu Sep 5 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.4.6-29
- Package init - Package init