Changeset 370 for spec/trunk/SPECS/gcc4.spec

Timestamp:

Feb 24, 2014, 11:54:06 AM (11 years ago)

Author:

Yuri Dario

Message:

spec: gcc4, renamed stdc++, update to 4.7.3.

File:

• spec/trunk/SPECS/gcc4.spec (modified) (12 diffs)

spec/trunk/SPECS/gcc4.spec

@@ -1 @@
-%global gcc_version 4.4.6
+%define ver_major   4
+%define ver_minor   7
+%define ver_patch   3
+
+%define os2_release 1
+
+%define rpm_release 1
+
+%global gcc_version %{ver_major}.%{ver_minor}.%{ver_patch}
 %global gcc_target_platform %{_target_cpu}
 
@@ -13 +21 @@
 Summary: Various compilers (C, C++, Objective-C, Java, ...)
 Name: gcc
-Version: %{gcc_version}.17
-Release: 1%{?dist}
+Version: %{gcc_version}.%{os2_release}
+Release: %{rpm_release}%{?dist}
 
 # libgcc, libgfortran, libmudflap, libgomp, libstdc++ and crtstuff have
@@ -22 +30 @@
 URL: http://gcc.gnu.org
 
-Source0: gcc-os2-b41a22fed042051d238a596cdf40d6a5aa991391.tar.bz2
+Source0: gcc-gcc-4_7-branch-os2.zip
 Patch0: gcc-os2.diff
 
@@ -30 +38 @@
 BuildRequires: os2-base-fhs
 BuildRequires: ash gcc gcc-wlink gcc-wrc grep gettext-devel diffutils gawk flex sed
-BuildRequires: gmp-devel >= 4.1.2-8, mpfr-devel >= 2.2.1
-
-Requires: libgcc446 = %{version}-%{release}
+BuildRequires: gmp-devel >= 4.1.2-8, mpfr-devel >= 2.2.1, mpc-devel
+
+Requires: libgcc%{ver_major}%{ver_minor}%{ver_patch} = %{version}-%{release}
 Requires: libssp = %{version}-%{release}
-Requires: libstdc++ = %{version}-%{release}
-Requires: libsupc++ = %{version}-%{release}
+Requires: libstdc++6 = %{version}-%{release}
+Requires: libsupc++6 = %{version}-%{release}
 Requires: libc-devel >= 0.6.3
 Requires: binutils
 
 %description
-The gcc package contains the GNU Compiler Collection version 4.4.
+The gcc package contains the GNU Compiler Collection version %{ver_major}.%{ver_minor}.
 You'll need this package in order to compile C code.
 
-%package -n libgcc446
-Summary: GCC version 4.4 shared support library
+%package -n libgcc%{ver_major}%{ver_minor}%{ver_patch}
+Summary: GCC version %{ver_major}.%{ver_minor} shared support library
 Group: System Environment/Libraries
 Autoreq: false
 
-%description -n libgcc446
+%description -n libgcc%{ver_major}%{ver_minor}%{ver_patch}
 This package contains GCC shared support library which is needed
 e.g. for exception handling support.
@@ -61 +69 @@
 for stack protector.
 
-%package -n libstdc++
+%package -n libstdc++6
 Summary: GNU Standard C++ Library v3
 Group: System Environment/Libraries
-Obsoletes: gcc-stdc++-shared-library
-
-%description -n libstdc++
+
+%description -n libstdc++6
 This package contains GNU Standard C++ Library v3 shared library.
 
-%package -n libsupc++
+%package -n libsupc++6
 Summary: GNU Standard C++ Library v3 subset
 Group: System Environment/Libraries
-Obsoletes: gcc-supc++-shared-library
-
-%description -n libsupc++
+
+%description -n libsupc++6
 This package contains GNU Standard C++ Library v3 subset shared library.
 
@@ -112 +118 @@
 export CXXFLAGS="$RPM_OPT_FLAGS -DEMX -DOS2"
 export LDFLAGS="-g -Zexe -Zomf -Zmap -Zargs-wild -Zhigh-mem"
-export LANG=C
+export LANG=en_US
+export GREP=grep
 
 ../configure --prefix=%{_prefix} \
@@ -122 +129 @@
     --disable-multilib \
     --disable-libstdcxx-pch \
-    --enable-threads \
-   "--cache-file=%{_topdir}/cache/%{name}-%{_target_cpu}.cache"
-
-make %{?_smp_mflags}
+    --enable-threads 
+
+make
+# %{?_smp_mflags}
+
 
 %install
@@ -140 +148 @@
 make DESTDIR=${RPM_BUILD_ROOT} install
 
+# copy runtime files
+emxomf -o i386-pc-os2-emx/libgcc/libgcc_so_d.lib i386-pc-os2-emx/libgcc/libgcc_so_d.a
+cp -p i386-pc-os2-emx/libgcc/libgcc_so_d.a %{buildroot}%{_libdir}
+cp -p i386-pc-os2-emx/libgcc/libgcc_so_d.lib %{buildroot}%{_libdir}
+cp -p i386-pc-os2-emx/libgcc/gcc%{ver_major}%{ver_minor}%{ver_patch}.dll %{buildroot}%{_libdir}
+
 #build dll
-dllar -o stdcpp.dll i386-pc-os2-emx/libstdc++-v3/src/.libs/libstdc++.a \
+dllar -o stdcpp6.dll i386-pc-os2-emx/libstdc++-v3/src/.libs/libstdc++.a \
         -d "GNU stdc++ %{gcc_version}" \
-        -nolxlite -flags "-Zmap -Zhigh-mem -Zomf -g" \
+        -nolxlite -flags "-Zmap -Zhigh-mem -Zomf -g -L%{buildroot}%{_libdir}" \
         -ex "___main ___do_global_* ___ctordtor* ___eh* ___pop* _DLL_InitTerm" \
         -libf "INITINSTANCE TERMINSTANCE" \
         -libd "DATA MULTIPLE"
-cp -p stdcpp.dll %{buildroot}%{_libdir}
-cp -p stdcpp.a %{buildroot}%{_libdir}/stdc++.a
-cp -p stdcpp.lib %{buildroot}%{_libdir}/stdc++.lib
-mv %{buildroot}%{_libdir}/stdc++.a %{buildroot}%{_libdir}/stdc++_s.a
+cp -p stdcpp6.dll %{buildroot}%{_libdir}
+cp -p stdcpp6.a %{buildroot}%{_libdir}/stdc++.a
+cp -p stdcpp6.lib %{buildroot}%{_libdir}/stdc++.lib
+mv %{buildroot}%{_libdir}/libstdc++.a %{buildroot}%{_libdir}/stdc++_s.a
 
 #build dll
-dllar -o supcpp.dll i386-pc-os2-emx/libstdc++-v3/libsupc++/.libs/libsupc++.a \
+dllar -o supcpp6.dll i386-pc-os2-emx/libstdc++-v3/libsupc++/.libs/libsupc++.a \
         -d "GNU supc++ %{gcc_version}" \
-        -nolxlite -flags "-Zmap -Zhigh-mem -Zomf -g" \
+        -nolxlite -flags "-Zmap -Zhigh-mem -Zomf -g -L%{buildroot}%{_libdir}" \
         -ex "___main ___do_global_* ___ctordtor* ___eh* ___pop* _DLL_InitTerm" \
         -libf "INITINSTANCE TERMINSTANCE" \
         -libd "DATA MULTIPLE"
-cp -p supcpp.dll %{buildroot}%{_libdir}
-cp -p supcpp.a %{buildroot}%{_libdir}/supc++.a
-cp -p supcpp.lib %{buildroot}%{_libdir}/supc++.lib
-mv %{buildroot}%{_libdir}/supc++.a %{buildroot}%{_libdir}/supc++_s.a
+cp -p supcpp6.dll %{buildroot}%{_libdir}
+cp -p supcpp6.a %{buildroot}%{_libdir}/supc++.a
+cp -p supcpp6.lib %{buildroot}%{_libdir}/supc++.lib
+mv %{buildroot}%{_libdir}/libsupc++.a %{buildroot}%{_libdir}/supc++_s.a
 
 #build dll
 dllar -o ssp.dll i386-pc-os2-emx/libssp/.libs/ssp.a \
         -d "GNU Stack Protector %{gcc_version}" \
-        -nolxlite -flags "-Zmap -Zhigh-mem -Zomf -g" \
+        -nolxlite -flags "-Zmap -Zhigh-mem -Zomf -g -L%{buildroot}%{_libdir}" \
         -ex "___main ___do_global_* ___ctordtor* ___eh* ___pop* _DLL_InitTerm" \
         -libf "INITINSTANCE TERMINSTANCE" \
@@ -184 +198 @@
 
 rm %{buildroot}%{_libdir}/*.la
+rm %{buildroot}%{_libdir}/*.py
 
 ln -s ./cc1.exe %{buildroot}%{_libexecdir}/gcc/i386-pc-os2-emx/%{gcc_version}/cc1
@@ -230 +245 @@
 %{_usr}/bin
 %{_usr}/include
-%{_usr}/info
 %{_libdir}/*.*a
 %{_libdir}/*.lib
-%{_libdir}/*.dll
 %exclude %{_libdir}/*.dll
 %{_libdir}/*.spec
 %{_libdir}/gcc/*
 %{_usr}/libexec
-%{_usr}/man
 %{_usr}/share
 %doc ChangeLog ChangeLog.*
@@ -249 +261 @@
 %{_libdir}/ssp.dll
 
-%files -n libstdc++
-%defattr(-,root,root,-)
-%{_libdir}/stdcpp.dll
-
-%files -n libsupc++
-%defattr(-,root,root,-)
-%{_libdir}/supcpp.dll
+%files -n libstdc++6
+%defattr(-,root,root,-)
+%{_libdir}/stdcp*.dll
+
+%files -n libsupc++6
+%defattr(-,root,root,-)
+%{_libdir}/supcp*.dll
 
 %files wlink
@@ -263 +275 @@
 %doc gcc-wrc.txt
 
-%files -n libgcc446
-%defattr(-,root,root,-)
-%{_libdir}/gcc446.dll
-#%doc %{_datadir}/doc/*
+%files -n libgcc%{ver_major}%{ver_minor}%{ver_patch}
+%defattr(-,root,root,-)
+%{_libdir}/gcc%{ver_major}%{ver_minor}%{ver_patch}.dll
+
 
 %changelog
+* Wed Nov 27 2013 yd
+- Rename the following packages to avoid ABI breaks (using gcc versioning policy):
+  + libstdc++ => libstdc++6
+  + libsupc++ => libsupc++6
+- updated source code to gcc 4.7.3.
 
 * Mon Jul 25 2013 Dmitriy Kuminov <coding@dmik.org> - 4.4.6.17-1