diff --git a/gcc-5.2.0-libjava-disable-multilib.patch b/gcc-5.2.0-libjava-disable-multilib.patch new file mode 100644 index 0000000..a050e35 --- /dev/null +++ b/gcc-5.2.0-libjava-disable-multilib.patch @@ -0,0 +1,11 @@ +--- gcc-5.2.0/Makefile.in.orig 2015-08-16 18:06:23.099725324 +0200 ++++ gcc-5.2.0/Makefile.in 2015-08-16 18:06:33.553684921 +0200 +@@ -43118,7 +43118,7 @@ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ +- --target=${target_alias} $(EXTRA_CONFIGARGS_LIBJAVA) \ ++ --target=${target_alias} $(EXTRA_CONFIGARGS_LIBJAVA) --disable-multilib \ + || exit 1 + @endif target-libjava + diff --git a/gcc.spec b/gcc.spec index 703dd30..66c2b82 100644 --- a/gcc.spec +++ b/gcc.spec @@ -27,6 +27,7 @@ %define disable_cpp 1 %define disable_doc 1 %define disable_java 1 + %define disable_go 1 %endif #% if "%{?stage2}" == "1" @@ -37,10 +38,11 @@ %define libgcj_name libgcj4 %define java_home %{_jvmdir}/java-1.5.0-gcj-1.5.0.0/jre +%define MAJver %(echo %version | cut -d. -f 1) %define majver %(echo %version | cut -d. -f 1-2) Name: gcc -Version: 4.9.2 +Version: 5.2.0 Release: 2mamba Summary: GNU Compiler Collection (C, C++, Fortran, Java, Ada) Group: Applications/Development @@ -66,7 +68,8 @@ Patch12: %{name}-4.5.2-arm_define_ARM_PCS_and_ARM_PCS_VFP.patch Patch13: %{name}-4.5.3-avr-new-devices.patch Patch14: gcc-4.8.0-libffi-texinfo.patch Patch15: gcc-4.9.0-upstream-fixes-1.patch -Patch16: gcc-4.9.2-arm-lra-bootstrap.patch +Patch16: gcc-4.9.2-arm-lra-bootstrap.patch +Patch17: gcc-5.2.0-libjava-disable-multilib.patch License: GPL ## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-END @@ -116,6 +119,7 @@ BuildRequires: antlr %endif BuildRequires: libcairo-devel >= 1.4.10 BuildRequires: libxcb-util-devel >= 0.2 +BuildRequires: libisl-devel = 0.14 #% endif #% else # BuildRequires: cross-%{target_cpu}-glibc%{?glibc_require_append} >= 2.5 @@ -211,6 +215,21 @@ Requires: %{libstdcxx_name} = %{version}-%{release} This is the GNU implementation of the standard C++ libraries. This package includes the files used by gdb for debugging. +%package -n libcc1 +Summary: GNU cc1 plugin for GDB +Group: System/Libraries + +%description -n libcc1 +GCC cc1 plugin for GDB. + +%package -n libcc1-devel +Summary: GNU cc1 plugin for GDB development files +Group: Development/Libraries +Requires: libcc1 = %{version}-%{release} + +%description -n libcc1-devel +GCC cc1 plugin for GDB development files. + # # Java Compiler # @@ -260,6 +279,33 @@ Obsoletes: gcc-g77, gcc-gfortran %description fortran This package adds support for compiling Fortran 95 programs with the GNU compiler. +# +# Go compiler +# +%package go +Summary: The GNU compiler for the Go programming language +Group: System/Libraries +Requires: libgo = %{version}-%{release} +Requires: libgo-devel = %{version}-%{release} + +%description go +The GNU compiler for the Go programming language. + +%package -n libgo +Summary: Library for the Go programmi language +Group: System/Libraries + +%description -n libgo +Library for the Go programmi language. + +%package -n libgo-devel +Summary: Development headers and static library for libgo +Group: Development/Libraries +Requires: libgo = %{version}-%{release} + +%description -n libgo-devel +Development files for the library for the Go programmi language. + # # Fortran 95 Libraries # @@ -500,7 +546,8 @@ sed -i -e 's/libjawt/libgcjawt/g' libjava/Makefile.{am,in} #%patch13 -p1 #%patch14 -p1 #%patch15 -p1 -%patch16 -p1 +#%patch16 -p1 +%patch17 -p1 %build #:<< ____EOF @@ -510,7 +557,7 @@ mkdir -p ../%{name}-build && cd ../%{name}-build -slibdir=/%{_lib} +slibdir=%{_libdir} # BUILD_LANGUAGES is only used in final (not staged) build BUILD_LANGUAGES=c,objc,lto @@ -529,6 +576,9 @@ BUILD_LANGUAGES="${BUILD_LANGUAGES},fortran" # Java depends on gdk BUILD_LANGUAGES="${BUILD_LANGUAGES},java" %endif +%if "%{disable_go}" != "1" +BUILD_LANGUAGES="${BUILD_LANGUAGES},go" +%endif case %{_target_platform} in i386-*|i486-*|i586-*|i686-*|athlon-*) @@ -553,9 +603,9 @@ case %{_target_platform} in ;; x86_64-*) %if "%{_target_platform}" != "%{_host}" - ADDITIONAL_OPTS="--with-slibdir=/usr/%{_target_platform}/lib64 --disable-multilib" + ADDITIONAL_OPTS="--disable-libjava-multilib --with-slibdir=/usr/%{_target_platform}/lib64 --disable-multilib" %else - ADDITIONAL_OPTS="--with-slibdir=/lib64" + ADDITIONAL_OPTS="--with-slibdir=$slibdir" %endif ;; *) @@ -612,9 +662,11 @@ CROSS_SYSTEM_HEADER_DIR=/usr/%{_target_platform}/include \ --enable-clocale=gnu \ --x-includes=%{_includedir} \ --x-libraries=%{_libdir} \ +%if "%{disable_java}" != "1" --enable-java-awt=gtk \ --with-java-home=%{java_home} \ --enable-libgcj-multifile \ +%endif --with-system-zlib \ %if "%{?disable_jack}" == "1" --disable-dssi \ @@ -634,7 +686,11 @@ CROSS_SYSTEM_HEADER_DIR=/usr/%{_target_platform}/include \ %if "%{_target_platform}" != "%{_build}" make %{?_smp_mflags} CFLAGS='' LIBCFLAGS='-g -O2' \ - LIBCXXFLAGS='-g -O2 -fno-implicit-templates' all + LIBCXXFLAGS='-g -O2 -fno-implicit-templates' all \ +%ifarch x86_64 + CXXCPP=%{_libdir}/cpp +%endif + %else make %{?_smp_mflags} CFLAGS='-O -I/usr/include/freetype2' LIBCFLAGS='-g -O2' \ LIBCXXFLAGS='-g -O2 -fno-implicit-templates' bootstrap @@ -664,10 +720,10 @@ for p in gcc gcc-ar gcc-nm gcc-ranlib cc gcov c++ g++ gcj gfortran; do done # create symlinks - mkdir -p %{buildroot}/%{_lib} - ln -s ../usr/bin/cpp %{buildroot}/%{_lib}/cpp - ln -s ../bin/cpp %{buildroot}%{_libdir} - ln -s gcc %{buildroot}/usr/bin/cc +# mkdir -p %{buildroot}/%{_lib} +# ln -s ../usr/bin/cpp %{buildroot}/%{_lib}/cpp +ln -s ../bin/cpp %{buildroot}%{_libdir} +ln -s gcc %{buildroot}/usr/bin/cc # # Documentation @@ -725,7 +781,7 @@ mv %{buildroot}%{_prefix}/lib/libstdc++.so.*-gdb.py %{buildroot}%{_datadir}/gdb/ #done) # fix permissions -chmod 755 %{buildroot}/%{_lib}/libgcc_s.so.1 +#chmod 755 %{buildroot}/%{_lib}/libgcc_s.so.1 #cp gcc/doc/*.pdf ../gcc-%{version}%{?gcc_extraver}/gcc/doc/ %else # target_platform != host @@ -733,6 +789,8 @@ chmod 755 %{buildroot}/%{_lib}/libgcc_s.so.1 rm -rf %{buildroot}%{_mandir}/man7/{fsf-funding.*,gfdl.*,gpl.*} rm -rf %{buildroot}%{_datadir}/locale/* rm -rf %{buildroot}%{_datadir}/gcc-%{version}/python/libstdcxx/* + # FIXME: since 5.2.0 + rm -rf %{buildroot}%{_libdir}/libcc1.* %endif # remove ffi provided by external package rm -f %{buildroot}%{_libdir}/libffi* @@ -808,6 +866,7 @@ find %{buildroot}%{_libdir}/gcc -name lib*.a -exec chmod -w {} \; %{_bindir}/gcc-nm %{_bindir}/gcc-ranlib %{_bindir}/gcov +%{_bindir}/gcov-tool %{_bindir}/%{_target_platform}-cc %{_bindir}/%{_target_platform}-gcc-%{version} %{_bindir}/%{_target_platform}-gcc @@ -845,14 +904,14 @@ find %{buildroot}%{_libdir}/gcc -name lib*.a -exec chmod -w {} \; %files -n libgcc %defattr(-,root,root) -/%{_lib}/libgcc* +%{_libdir}/libgcc* %ifarch ppc -/%{_lib}/nof/libgcc* +%{_libdir}/nof/libgcc* %endif %files cpp -f cpplib.lang %defattr(-,root,root) -/%{_lib}/cpp +%{_libdir}/cpp %{_bindir}/cpp %{_mandir}/man1/cpp.1* %if "%{_target_platform}" == "%{_build}" @@ -868,6 +927,15 @@ find %{buildroot}%{_libdir}/gcc -name lib*.a -exec chmod -w {} \; #%{_libdir}/nof/libiberty.a #%{_prefix}/%{_target_platform}/%{_lib}/nof/libiberty.a +%files -n libcc1 +%defattr(-,root,root) +%{_libdir}/libcc1.so.* + +%files -n libcc1-devel +%defattr(-,root,root) +%{_libdir}/libcc1.la +%{_libdir}/libcc1.so + %files -n libitm %defattr(-,root,root) %{_libdir}/libitm.so.* @@ -883,6 +951,7 @@ find %{buildroot}%{_libdir}/gcc -name lib*.a -exec chmod -w {} \; %files -n libgomp %defattr(-,root,root) %{_libdir}/libgomp.so.* +%{_libdir}/libgomp-plugin-host_nonshm.so.* %ifarch ppc %{_libdir}/nof/libgomp.so.* %endif @@ -892,6 +961,8 @@ find %{buildroot}%{_libdir}/gcc -name lib*.a -exec chmod -w {} \; %{_libdir}/libgomp.a %{_libdir}/libgomp.la %{_libdir}/libgomp.so +%{_libdir}/libgomp-plugin-host_nonshm.la +%{_libdir}/libgomp-plugin-host_nonshm.so %{_libdir}/libgomp.spec %ifarch ppc %{_libdir}/nof/libgomp.a @@ -1032,6 +1103,7 @@ find %{buildroot}%{_libdir}/gcc -name lib*.a -exec chmod -w {} \; %{_bindir}/g++ %{_bindir}/%{_target_platform}-c++ %{_bindir}/%{_target_platform}-g++ +%{_datadir}/gcc-5.2.0/python/libstdcxx/v6/xmethods.py %{_mandir}/man1/g++.1.* %doc gcc/cp/ChangeLog* @@ -1204,7 +1276,7 @@ find %{buildroot}%{_libdir}/gcc -name lib*.a -exec chmod -w {} \; #%{_libdir}/lib-gnu-java-awt-peer-gtk.la #%{_libdir}/lib-gnu-java-awt-peer-gtk.so %{_datadir}/java/src-%{version}.zip -%{_libdir}/pkgconfig/libgcj-%{majver}.pc +%{_libdir}/pkgconfig/libgcj-%{MAJver}.pc %{_mandir}/man1/jv-convert.1.* #%doc rpm.doc/boehm-gc/* #%doc rpm.doc/libjava/* @@ -1263,6 +1335,35 @@ find %{buildroot}%{_libdir}/gcc -name lib*.a -exec chmod -w {} \; %{_libdir}/libquadmath.so %endif +# +# go language +# +%files go +%defattr(-,root,root) +%{_bindir}/gccgo +%{_bindir}/go +%{_bindir}/gofmt +%{_bindir}/%{_target_platform}-gccgo +%{_infodir}/gccgo.info* +%{_mandir}/man1/gccgo.1* +%{_mandir}/man1/go.1* +%{_mandir}/man1/gofmt.1* + +%files -n libgo +%defattr(-,root,root) +%{_libdir}/libgo.so.* +%dir %{_libdir}/go/%{version}/%{_target_platform} +%{_libdir}/go/%{version}/%{_target_platform}/* + +%files -n libgo-devel +%defattr(-,root,root) +%{_libdir}/libgo.a +%{_libdir}/libgo.la +%{_libdir}/libgo.so +%{_libdir}/libgobegin.a +%{_libdir}/libgolibbegin.a +%{_libdir}/libnetgo.a + %if "%{disable_doc}" != "1" %files doc %defattr(-,root,root) @@ -1287,13 +1388,16 @@ find %{buildroot}%{_libdir}/gcc -name lib*.a -exec chmod -w {} \; %doc gcc/doc/gccint.pdf %endif # "%{disable_doc}" != "1" +# +# Multilib +# %ifarch x86_64 %files -n gcc-multilib %defattr(-,root,root) %dir %{_libdir}/gcc/%{_target_platform}/%{version}/32 %{_libdir}/gcc/%{_target_platform}/%{version}/32/* -/lib/libgcc_s.so -/lib/libgcc_s.so.1 +%{_prefix}/lib/libgcc_s.so +%{_prefix}/lib/libgcc_s.so.1 # %{_prefix}/lib/libstdc++.a %{_prefix}/lib/libstdc++.la @@ -1310,32 +1414,52 @@ find %{buildroot}%{_libdir}/gcc -name lib*.a -exec chmod -w {} \; %{_prefix}/lib/libatomic.so %{_prefix}/lib/libatomic.so.* # -%{_prefix}/lib/gcj-*/* -%{_prefix}/lib/libgcj-tools.la -%{_prefix}/lib/libgcj-tools.so -%{_prefix}/lib/libgcj-tools.so.* -%{_prefix}/lib/libgcj.la -%{_prefix}/lib/libgcj.so -%{_prefix}/lib/libgcj.so.* -%{_prefix}/lib/libgcj_bc.so -%{_prefix}/lib/libgcj_bc.so.* -%{_prefix}/lib/libgij.la -%{_prefix}/lib/libgij.so -%{_prefix}/lib/libgij.so.* -%{_prefix}/lib/logging.properties -%{_prefix}/lib/security/classpath.security -%{_prefix}/lib/pkgconfig/libgcj-*.pc +#%{_prefix}/lib/gcj-*/* +#%{_prefix}/lib/libgcj-tools.la +#%{_prefix}/lib/libgcj-tools.so +#%{_prefix}/lib/libgcj-tools.so.* +#%{_prefix}/lib/libgcj.la +#%{_prefix}/lib/libgcj.so +#%{_prefix}/lib/libgcj.so.* +#%{_prefix}/lib/libgcj_bc.so +#%{_prefix}/lib/libgcj_bc.so.* +#%{_prefix}/lib/libgij.la +#%{_prefix}/lib/libgij.so +#%{_prefix}/lib/libgij.so.* +#%{_prefix}/lib/logging.properties +#%{_prefix}/lib/security/classpath.security +#%{_prefix}/lib/pkgconfig/libgcj-*.pc # %{_prefix}/lib/libgfortran.a %{_prefix}/lib/libgfortran.la %{_prefix}/lib/libgfortran.so %{_prefix}/lib/libgfortran.so.* %{_prefix}/lib/libgfortran.spec -/usr/lib/libgomp.a -/usr/lib/libgomp.la -/usr/lib/libgomp.so -/usr/lib/libgomp.so.* -/usr/lib/libgomp.spec +# +# go +# +%dir %{_prefix}/lib/go +%dir %{_prefix}/lib/go/%{version} +%dir %{_prefix}/lib/go/%{version}/%{_target_platform} +%{_prefix}/lib/go/%{version}/%{_target_platform}/* +%{_prefix}/lib/libgo.a +%{_prefix}/lib/libgo.la +%{_prefix}/lib/libgo.so +%{_prefix}/lib/libgo.so.* +%{_prefix}/lib/libgobegin.a +%{_prefix}/lib/libgolibbegin.a +%{_prefix}/lib/libnetgo.a +# +# +# +%{_prefix}/lib/libgomp.a +%{_prefix}/lib/libgomp.la +%{_prefix}/lib/libgomp.so +%{_prefix}/lib/libgomp.so.* +%{_prefix}/lib/libgomp.spec +%{_prefix}/lib/libgomp-plugin-host_nonshm.la +%{_prefix}/lib/libgomp-plugin-host_nonshm.so +%{_prefix}/lib/libgomp-plugin-host_nonshm.so.* /usr/lib/libitm.a /usr/lib/libitm.la /usr/lib/libitm.so @@ -1411,6 +1535,13 @@ find %{buildroot}%{_libdir}/gcc -name lib*.a -exec chmod -w {} \; %endif # cross-platform %changelog +* Sat Nov 21 2015 Silvan Calarco 5.2.0-2mamba +- rebuilt with go +- move to %{_libdir} files formerly installed in /%{_lib} + +* Sun Aug 16 2015 Automatic Build System 5.2.0-1mamba +- automatic version update by autodist + * Thu Apr 09 2015 Silvan Calarco 4.9.2-2mamba - new target: arm-openmamba-linux-gnueabihf