From e6e3fc62e8ff82c8ef32f53763b5f20b5fa0331e Mon Sep 17 00:00:00 2001 From: Bogon Kim Date: Thu, 14 Nov 2013 12:07:09 +0900 Subject: [PATCH] change the sysroot and c++ include path to fix the bugs the application cannot find the libraries. This patch depends on the qemu-accel patch Change-Id: I332897ad912f09bc3d7d991bde97dbde03ae856a Signed-off-by: Bogon Kim --- packaging/cross-armv7hl-gcc48-icecream-backend.spec | 5 ++--- packaging/cross-armv7l-gcc48-icecream-backend.spec | 5 ++--- packaging/cross-i386-gcc48-icecream-backend.spec | 5 ++--- packaging/cross-x86_64-gcc48-icecream-backend.spec | 5 ++--- packaging/gcc.spec.in | 5 ++--- packaging/gcc48-testresults.spec | 5 ++--- packaging/gcc48.spec | 5 ++--- packaging/libffi48.spec | 5 ++--- packaging/libgcj48.spec | 5 ++--- 9 files changed, 18 insertions(+), 27 deletions(-) diff --git a/packaging/cross-armv7hl-gcc48-icecream-backend.spec b/packaging/cross-armv7hl-gcc48-icecream-backend.spec index e102a87..b79d1d0 100644 --- a/packaging/cross-armv7hl-gcc48-icecream-backend.spec +++ b/packaging/cross-armv7hl-gcc48-icecream-backend.spec @@ -311,9 +311,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} diff --git a/packaging/cross-armv7l-gcc48-icecream-backend.spec b/packaging/cross-armv7l-gcc48-icecream-backend.spec index 9644c10..4b21ce6 100644 --- a/packaging/cross-armv7l-gcc48-icecream-backend.spec +++ b/packaging/cross-armv7l-gcc48-icecream-backend.spec @@ -311,9 +311,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} diff --git a/packaging/cross-i386-gcc48-icecream-backend.spec b/packaging/cross-i386-gcc48-icecream-backend.spec index 8c1dc55..fb8b195 100644 --- a/packaging/cross-i386-gcc48-icecream-backend.spec +++ b/packaging/cross-i386-gcc48-icecream-backend.spec @@ -311,9 +311,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} diff --git a/packaging/cross-x86_64-gcc48-icecream-backend.spec b/packaging/cross-x86_64-gcc48-icecream-backend.spec index 632714a..3d2999a 100644 --- a/packaging/cross-x86_64-gcc48-icecream-backend.spec +++ b/packaging/cross-x86_64-gcc48-icecream-backend.spec @@ -311,9 +311,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} diff --git a/packaging/gcc.spec.in b/packaging/gcc.spec.in index f9e96b4..d417e66 100644 --- a/packaging/gcc.spec.in +++ b/packaging/gcc.spec.in @@ -1002,9 +1002,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} diff --git a/packaging/gcc48-testresults.spec b/packaging/gcc48-testresults.spec index 94a6d00..75a7165 100644 --- a/packaging/gcc48-testresults.spec +++ b/packaging/gcc48-testresults.spec @@ -506,9 +506,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} diff --git a/packaging/gcc48.spec b/packaging/gcc48.spec index 7ed87f9..d5ce04d 100644 --- a/packaging/gcc48.spec +++ b/packaging/gcc48.spec @@ -1423,9 +1423,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} diff --git a/packaging/libffi48.spec b/packaging/libffi48.spec index 965ceed..22e72a1 100644 --- a/packaging/libffi48.spec +++ b/packaging/libffi48.spec @@ -576,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} diff --git a/packaging/libgcj48.spec b/packaging/libgcj48.spec index 7cdc5c5..f84b00e 100644 --- a/packaging/libgcj48.spec +++ b/packaging/libgcj48.spec @@ -646,9 +646,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} -- 2.7.4