diff options
| author | Yury Usishchev <y.usishchev@samsung.com> | 2015-06-01 17:06:36 +0300 |
|---|---|---|
| committer | Yury Usishchev <y.usishchev@samsung.com> | 2015-06-16 15:01:17 +0300 |
| commit | 822b1565f4c215e5ecbf269dfb33c28278fd01bc (patch) | |
| tree | a31e01b6a78734b94d1274b61297fef3c37e62de | |
| parent | a176191a018e7c07d8e6e46f3208312d20920d16 (diff) | |
| download | qemu-accel-accepted/tizen_3.0.2015.q2_common.tar.gz qemu-accel-accepted/tizen_3.0.2015.q2_common.tar.bz2 qemu-accel-accepted/tizen_3.0.2015.q2_common.zip | |
Fix update-alternatives call in baselibs.confsubmit/tizen_wearable/20150617.000000submit/tizen_tv/20150617.000000submit/tizen_mobile/20150617.000000submit/tizen_common/20150616.131936submit/tizen_3.0.2015.q2_common/20150616.131924submit/tizen/20150616.132010accepted/tizen/wearable/20150617.082247accepted/tizen/tv/20150617.082235accepted/tizen/mobile/20150617.082220accepted/tizen/common/20150616.134547accepted/tizen/3.0.2015.q2/common/20150616.134034tizen_3.0.2015.q2_commonaccepted/tizen_3.0.2015.q2_common
Change-Id: I4c61814eebc62fbfb7051bb2ef5a7c4eb84a067b
Signed-off-by: Yury Usishchev <y.usishchev@samsung.com>
| -rw-r--r-- | packaging/baselibs.conf | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packaging/baselibs.conf b/packaging/baselibs.conf index c7866f5..4668884 100644 --- a/packaging/baselibs.conf +++ b/packaging/baselibs.conf @@ -57,7 +57,7 @@ qemu-accel-armv7l post "builtin echo 0 >/proc/sys/vm/mmap_min_addr" post "" post "if [ -f /usr/bin/gcc ] ; then" - post " export GCCVER=$(LANG=C gcc --version | head -1 | sed -e "s/^.*gcc[^0-9]*\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*$/\1.\2/") " + post " export GCCVER=$(LANG=C gcc --version | head -1 | sed -e "s/^.*gcc[^0-9]*\(\([0-9]*\.\)\+[0-9]*\).*$/\1/") " post " # Create symlinks to files needed by native ld for the case if we want to use it instead of cross ld:" post " for f in crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o ; do" post " ln -s /usr/lib/gcc/armv7l-tizen-linux-gnueabi/${GCCVER}/$f /usr/armv7l-tizen-linux-gnueabi/bin/$f;" @@ -75,7 +75,7 @@ qemu-accel-armv7l post "" postun "HOST_ARCH=`echo -n %{_host_cpu} | sed -e 's/i.86/i586/'`" postun "ACCEL_DIR=/emul/$HOST_ARCH-for-arm" - postun "GCCVER=$(LANG=C gcc --version | head -1 | sed -e "s/^.*gcc[^0-9]*\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*$/\1.\2/") " + postun "GCCVER=$(LANG=C gcc --version | head -1 | sed -e "s/^.*gcc[^0-9]*\(\([0-9]*\.\)\+[0-9]*\).*$/\1/") " postun "%_sbindir/update-alternatives --remove \" postun " liblto_plugin_%{_arch}.so \" postun " $ACCEL_DIR/usr/lib/gcc/armv7l-tizen-linux-gnueabi/${GCCVER}/liblto_plugin.so" @@ -140,7 +140,7 @@ qemu-accel-aarch64 post "echo 0 >/proc/sys/vm/mmap_min_addr" post "" post "if [ -f /usr/bin/gcc ] ; then" - post " export GCCVER=$(LANG=C gcc --version | head -1 | sed -e "s/^.*gcc[^0-9]*\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*$/\1.\2/") " + post " export GCCVER=$(LANG=C gcc --version | head -1 | sed -e "s/^.*gcc[^0-9]*\(\([0-9]*\.\)\+[0-9]*\).*$/\1/") " post " # Create symlinks to files needed by native ld for the case if we want to use it instead of cross ld:" post " for f in crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o ; do" post " ln -s /usr/lib64/gcc/aarch64-tizen-linux/${GCCVER}/$f /usr/lib/$f;" @@ -158,7 +158,7 @@ qemu-accel-aarch64 post "" postun "HOST_ARCH=`echo -n %{_host_cpu} | sed -e 's/i.86/i586/'`" postun "ACCEL_DIR=/emul/$HOST_ARCH-for-aarch64" - postun "GCCVER=$(LANG=C gcc --version | head -1 | sed -e "s/^.*gcc[^0-9]*\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*$/\1.\2/") " + postun "GCCVER=$(LANG=C gcc --version | head -1 | sed -e "s/^.*gcc[^0-9]*\(\([0-9]*\.\)\+[0-9]*\).*$/\1/") " postun "%_sbindir/update-alternatives --remove \" postun " liblto_plugin_%{_arch}.so \" postun " $ACCEL_DIR/usr/lib/gcc/aarch64-tizen-linux/${GCCVER}/liblto_plugin.so" |