From 0efba164f8722dcc106ebe94ed13f5ccc1b6e002 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 28 Jun 2013 10:42:27 -0500 Subject: cygwin-libtool 2.4.2 --- cygwin-libtool.spec | 153 ++++++++++++++++++++++++++++------------- libtool-2.4-pass-ldflags.patch | 2 +- sources | 2 +- 3 files changed, 106 insertions(+), 51 deletions(-) diff --git a/cygwin-libtool.spec b/cygwin-libtool.spec index 5138667..58ed235 100644 --- a/cygwin-libtool.spec +++ b/cygwin-libtool.spec @@ -1,16 +1,13 @@ -# must be rebuilt with each new version of cygwin-gcc -%define gcc_version 4.5.3 - -%global __strip %{_cygwin_strip} -%global __objdump %{_cygwin_objdump} -%global _use_internal_dependency_generator 0 -%global __find_requires %{_cygwin_findrequires} -%global __find_provides %{_cygwin_findprovides} +# must be rebuilt with each new version of cygwin*-gcc +%define gcc_version 4.7.3 +%define gcc64_version 4.8.1 + +%{?cygwin_package_header} %global debug_package %{nil} Name: cygwin-libtool -Version: 2.4 -Release: 2%{?dist} +Version: 2.4.2 +Release: 1%{?dist} Summary: Libtool for Cygwin toolchain Group: Development/Tools @@ -22,85 +19,143 @@ Source0: http://ftp.gnu.org/gnu/libtool/libtool-%{version}.tar.xz Patch0: libtool-2.4-pass-ldflags.patch BuildRequires: autoconf automake -BuildRequires: cygwin-filesystem -BuildRequires: cygwin-binutils -BuildRequires: cygwin-gcc -BuildRequires: cygwin-gcc-c++ -BuildRequires: cygwin-gcc-gfortran -BuildRequires: cygwin-gcc-java -BuildRequires: cygwin - -Requires: autoconf automake sed -Requires: cygwin-gcc = %{gcc_version} -Requires: cygwin-libltdl = %{version}-%{release} +BuildRequires: cygwin32-filesystem +BuildRequires: cygwin32-binutils +BuildRequires: cygwin32-gcc +BuildRequires: cygwin32-gcc-c++ +BuildRequires: cygwin32-gcc-gfortran +BuildRequires: cygwin32-gcc-java +BuildRequires: cygwin32 + +BuildRequires: cygwin64-filesystem +BuildRequires: cygwin64-binutils +BuildRequires: cygwin64-gcc +BuildRequires: cygwin64-gcc-c++ +BuildRequires: cygwin64-gcc-gfortran +#BuildRequires: cygwin64-gcc-java +BuildRequires: cygwin64 %description Libtool for Cygwin toolchain +%package -n cygwin32-libtool +Summary: Libtool for Cygwin32 toolchain +Requires: autoconf automake sed +Requires: cygwin32-gcc = %{gcc_version} +Requires: cygwin32-libltdl = %{version}-%{release} +Provides: cygwin-libtool = %{version}-%{release} +Obsoletes: cygwin-libtool < %{version}-%{release} + +%description -n cygwin32-libtool +Libtool scripts for Cygwin i686 toolchain + +%package -n cygwin64-libtool +Summary: Libtool for Cygwin64 toolchain +Requires: autoconf automake sed +Requires: cygwin64-gcc = %{gcc64_version} +Requires: cygwin64-libltdl = %{version}-%{release} + +%description -n cygwin64-libtool +Libtool scripts for Cygwin x86_64 toolchain + +%package -n cygwin32-libltdl +Summary: Libtool Dynamic Module Loader library for Cygwin32 toolchain +Group: Development/Libraries +License: LGPLv2+ +BuildArch: noarch +Provides: cygwin-libltdl = %{version}-%{release} +Obsoletes: cygwin-libltdl < %{version}-%{release} + +%description -n cygwin32-libltdl +Libtool dynamic module loader library for Cygwin i686 toolchain -%package -n cygwin-libltdl -Summary: Libtool Dynamic Module Loader library for Cygwin toolchain +%package -n cygwin64-libltdl +Summary: Libtool Dynamic Module Loader library for Cygwin64 toolchain Group: Development/Libraries License: LGPLv2+ BuildArch: noarch -%description -n cygwin-libltdl -Libtool dynamic module loader library for Cygwin toolchain +%description -n cygwin64-libltdl +Libtool dynamic module loader library for Cygwin x86_64 toolchain %prep %setup -q -n libtool-%{version} %patch0 -p1 +./bootstrap %build -./bootstrap -%{_cygwin_configure} --enable-shared --disable-static +%cygwin_configure --enable-shared --disable-static # build not smp safe -make +%cygwin_make %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +%cygwin_make install DESTDIR=$RPM_BUILD_ROOT -# We intentionally don't ship *.la files -rm -f $RPM_BUILD_ROOT%{_cygwin_libdir}/*.la +# Drop all .la files +find $RPM_BUILD_ROOT -name '*.la' -delete # Documentation already provided by Fedora native package -rm -fr $RPM_BUILD_ROOT%{_cygwin_docdir}/ -rm -fr $RPM_BUILD_ROOT%{_cygwin_infodir}/ -rm -fr $RPM_BUILD_ROOT%{_cygwin_mandir}/ +rm -fr $RPM_BUILD_ROOT%{cygwin32_docdir}/ +rm -fr $RPM_BUILD_ROOT%{cygwin32_infodir}/ +rm -fr $RPM_BUILD_ROOT%{cygwin32_mandir}/ + +rm -fr $RPM_BUILD_ROOT%{cygwin64_docdir}/ +rm -fr $RPM_BUILD_ROOT%{cygwin64_infodir}/ +rm -fr $RPM_BUILD_ROOT%{cygwin64_mandir}/ # Some packages (e.g. ncurses) build with the installed libtool -install -D -m0755 libtool $RPM_BUILD_ROOT%{_bindir}/%{_cygwin_target}-libtool +install -D -m0755 $RPM_BUILD_ROOT%{cygwin32_bindir}/libtool \ + $RPM_BUILD_ROOT%{_bindir}/%{cygwin32_target}-libtool +install -D -m0755 $RPM_BUILD_ROOT%{cygwin64_bindir}/libtool \ + $RPM_BUILD_ROOT%{_bindir}/%{cygwin64_target}-libtool %clean rm -rf $RPM_BUILD_ROOT -%files -%defattr(-,root,root,-) +%files -n cygwin32-libtool +%doc AUTHORS COPYING NEWS README THANKS TODO ChangeLog* +%{_bindir}/%{cygwin32_target}-libtool +%{cygwin32_bindir}/libtool +%{cygwin32_bindir}/libtoolize +%{cygwin32_datadir}/aclocal/* +%{cygwin32_datadir}/libtool/ + +%files -n cygwin64-libtool %doc AUTHORS COPYING NEWS README THANKS TODO ChangeLog* -%{_bindir}/%{_cygwin_target}-libtool -%{_cygwin_bindir}/libtool -%{_cygwin_bindir}/libtoolize -%{_cygwin_datadir}/aclocal/ -%{_cygwin_datadir}/libtool/ - -%files -n cygwin-libltdl -%defattr(-,root,root,-) +%{_bindir}/%{cygwin64_target}-libtool +%{cygwin64_bindir}/libtool +%{cygwin64_bindir}/libtoolize +%{cygwin64_datadir}/aclocal/* +%{cygwin64_datadir}/libtool/ + +%files -n cygwin32-libltdl +%doc libltdl/COPYING.LIB libltdl/README +%{cygwin32_bindir}/cygltdl-7.dll +%{cygwin32_includedir}/libltdl/ +%{cygwin32_includedir}/ltdl.h +%{cygwin32_libdir}/libltdl.dll.a + +%files -n cygwin64-libltdl %doc libltdl/COPYING.LIB libltdl/README -%{_cygwin_bindir}/cygltdl-7.dll -%{_cygwin_includedir}/libltdl -%{_cygwin_includedir}/ltdl.h -%{_cygwin_libdir}/libltdl.dll.a +%{cygwin64_bindir}/cygltdl-7.dll +%{cygwin64_includedir}/libltdl/ +%{cygwin64_includedir}/ltdl.h +%{cygwin64_libdir}/libltdl.dll.a %changelog +* Fri Jun 28 2013 Yaakov Selkowitz - 2.4.2-1 +- Version bump. +- Update for new Cygwin packaging scheme. + * Thu Mar 22 2012 Yaakov Selkowitz - 2.4-2 - Remove noarch tag, as arch-specific gcc libdir is embedded in libtool script. - Create separate libltdl noarch package. diff --git a/libtool-2.4-pass-ldflags.patch b/libtool-2.4-pass-ldflags.patch index 6d59afe..cd08a54 100644 --- a/libtool-2.4-pass-ldflags.patch +++ b/libtool-2.4-pass-ldflags.patch @@ -7,7 +7,7 @@ index 0418007..91276c2 100644 -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-flto*|-fwhopr*|-fuse-linker-plugin) -+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*| \ ++ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-fgnu-tm| \ + -shared-libgcc|-static-libgcc|-static-libgfortran|-static-libstdc++) func_quote_for_eval "$arg" arg="$func_quote_for_eval_result" diff --git a/sources b/sources index a347ca7..095ac67 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4e6144439d95d7332dc50ace6dd24c55 libtool-2.4.tar.xz +2ec8997e0c07249eb4cbd072417d70fe libtool-2.4.2.tar.xz -- cgit