X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Flibffi48.spec;h=37532ec9ee6dddb703e2ed32455cea06f081f106;hb=aa6579d95fca9234c35373dba9c5a8d2b1a23b6d;hp=72fa557290c276d62d6edf68719fbef1f1c46c37;hpb=b3ff8b9f3a293179ca604e49dc519bc5e885ba1a;p=platform%2Fupstream%2Fgcc48.git diff --git a/packaging/libffi48.spec b/packaging/libffi48.spec index 72fa557..37532ec 100644 --- a/packaging/libffi48.spec +++ b/packaging/libffi48.spec @@ -33,9 +33,9 @@ %define build_libjava 0 %define build_cp 1 -%define build_fortran !0%{?building_libjava:1}%{?building_libffi:1} -%define build_objc !0%{?building_libjava:1}%{?building_libffi:1} -%define build_objcp !0%{?building_libjava:1}%{?building_libffi:1} +%define build_fortran 0%{?building_libjava:1}%{?building_libffi:1} +%define build_objc 0%{?building_libjava:1}%{?building_libffi:1} +%define build_objcp 0%{?building_libjava:1}%{?building_libffi:1} %define build_with_mudflap 0 %if %{build_objcp} @@ -173,7 +173,7 @@ BuildRequires: gdb %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: http://gcc.gnu.org/ -Version: 4.8.1 +Version: 4.8.2 Release: 1 %define gcc_dir_version 4.8 %define binsuffix -4.8 @@ -551,6 +551,9 @@ TCFLAGS="$RPM_OPT_FLAGS" GCJFLAGS="$RPM_OPT_FLAGS $GCJ_EXTRA_FLAGS" \ --disable-plugin \ --with-bugurl="http://bugs.tizen.org/" \ --with-pkgversion="Tizen" \ +%if !%{build_fortran} + --disable-libquadmath \ +%endif %if !%{build_libjava} --disable-libgcj \ %else @@ -573,9 +576,8 @@ TCFLAGS="$RPM_OPT_FLAGS" GCJFLAGS="$RPM_OPT_FLAGS $GCJ_EXTRA_FLAGS" \ --enable-linker-build-id \ %if 0%{?gcc_target_arch:1} %if 0%{?gcc_icecream:1} - --with-build-sysroot=/ \ - --with-sysroot=%{_prefix}/%{gcc_target_arch}%{?canonical_target_abi:%canonical_target_abi} \ - --with-gxx-include-dir=%{_prefix}/%{gcc_target_arch}%{?canonical_target_abi:%canonical_target_abi}/usr/include/c++/%{gcc_dir_version} \ + --with-sysroot=/ \ + --with-gxx-include-dir=%{_prefix}/%{gcc_target_arch}%{?canonical_target_abi:%canonical_target_abi}/include/c++/%{gcc_dir_version} \ --enable-linux-futex \ %endif %if 0%{?canonical_target:1}